Rev 2788: Remove some arbitrary differences from bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2788
revision-id: robertc at robertcollins.net-20071003084403-e8j4dft472ww2ucv
parent: robertc at robertcollins.net-20071003063701-goxzcxccmwdukl6w
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2007-10-03 18:44:03 +1000
message:
  Remove some arbitrary differences from bzr.dev.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'NEWS'
--- a/NEWS	2007-10-03 06:37:01 +0000
+++ b/NEWS	2007-10-03 08:44:03 +0000
@@ -482,21 +482,12 @@
      incremental addition of data to a file without requiring that all the
      data be buffered in memory. (Robert Collins)
 
-   * New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
-     tuple containing the key information about a path for commit processing
-     to complete. (Robert Collins)
-
    * New methods on ``bzrlib.knit.KnitVersionedFile``:
      ``get_data_stream(versions)``, ``insert_data_stream(stream)`` and
      ``get_format_signature()``.  These provide some infrastructure for
      efficiently streaming the knit data for a set of versions over the smart
      protocol.
 
-   * New parameter on ``bzrlib.transport.Transport.readv``
-     ``adjust_for_latency`` which changes readv from returning strictly the
-     requested data to inserted return larger ranges and in forward read order
-     to reduce the effect of network latency. (Robert Collins)
-
    * Knits with no annotation cache still produce correct annotations.
      (Aaron Bentley)
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-10-03 06:37:01 +0000
+++ b/bzrlib/builtins.py	2007-10-03 08:44:03 +0000
@@ -40,8 +40,6 @@
     merge_directive,
     osutils,
     reconfigure,
-    registry,
-    repository,
     revision as _mod_revision,
     symbol_versioning,
     transport,

=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2007-10-03 06:37:01 +0000
+++ b/bzrlib/commit.py	2007-10-03 08:44:03 +0000
@@ -326,8 +326,6 @@
                     entries_title="Directory")
             self.builder = self.branch.get_commit_builder(self.parents,
                 self.config, timestamp, timezone, committer, revprops, rev_id)
-            # tell the builder about the chosen recursive behaviour
-            self.builder.recursive = recursive
             
             try:
                 # find the location being committed to

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2007-10-03 06:37:01 +0000
+++ b/bzrlib/remote.py	2007-10-03 08:44:03 +0000
@@ -339,7 +339,8 @@
         return response[0] == 'yes'
 
     def has_same_location(self, other):
-        return (self.base == other.base)
+        return (self.__class__ == other.__class__ and
+                self.bzrdir.transport.base == other.bzrdir.transport.base)
         
     def get_graph(self, other_repository=None):
         """Return the graph for this repository format"""

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-10-03 06:37:01 +0000
+++ b/bzrlib/repository.py	2007-10-03 08:44:03 +0000
@@ -643,9 +643,10 @@
         This might return False even when two repository objects are accessing
         the same physical repository via different URLs.
         """
-        ## if self.__class__ is not other.__class__:
-        ##     return False
-        return (self.base == other.base)
+        if self.__class__ is not other.__class__:
+            return False
+        return (self.control_files._transport.base ==
+                other.control_files._transport.base)
 
     def is_in_write_group(self):
         """Return True if there is an open write group.