Rev 3205: Fix bug #187162: Use has_same_location rather than doing the check directly. in http://bzr.arbash-meinel.com/branches/bzr/1.2-dev/has_same_location_187162

John Arbash Meinel john at arbash-meinel.com
Tue Jan 29 22:53:15 GMT 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.2-dev/has_same_location_187162

------------------------------------------------------------
revno: 3205
revision-id:john at arbash-meinel.com-20080129225300-n8llup8a2g0j7h7x
parent: pqm at pqm.ubuntu.com-20080129045844-u41ywp910i6jv8bz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: has_same_location_187162
timestamp: Tue 2008-01-29 16:53:00 -0600
message:
  Fix bug #187162: Use has_same_location rather than doing the check directly.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
-------------- next part --------------
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-01-29 03:22:52 +0000
+++ b/bzrlib/repository.py	2008-01-29 22:53:00 +0000
@@ -1777,9 +1777,8 @@
     def get_graph(self, other_repository=None):
         """Return the graph walker for this repository format"""
         parents_provider = self._make_parents_provider()
-        if (other_repository is not None and
-            other_repository.bzrdir.transport.base !=
-            self.bzrdir.transport.base):
+        if (other_repository is not None
+            and not self.has_same_location(other_repository)):
             parents_provider = graph._StackedParentsProvider(
                 [parents_provider, other_repository._make_parents_provider()])
         return graph.Graph(parents_provider)



More information about the bazaar-commits mailing list