Rev 3214: Use convenience function to check whether two repository handles are in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3214
revision-id:pqm at pqm.ubuntu.com-20080205140329-aw3rmrn6hk967kyc
parent: pqm at pqm.ubuntu.com-20080205071430-7b9vl83ebnsd6i0g
parent: jelmer at samba.org-20080204220114-bozpo9xjnpuldn22
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-02-05 14:03:29 +0000
message:
  Use convenience function to check whether two repository handles are
  	referring to the same repository.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 3211.3.1
    revision-id:jelmer at samba.org-20080204220114-bozpo9xjnpuldn22
    parent: pqm at pqm.ubuntu.com-20080201053934-q32y2nk5vvo13c6v
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Mon 2008-02-04 23:01:14 +0100
    message:
      Use convenience function to check whether two repository handles are referring to the same repository.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'NEWS'
--- a/NEWS	2008-02-05 07:14:30 +0000
+++ b/NEWS	2008-02-05 14:03:29 +0000
@@ -118,6 +118,10 @@
       ``SearchResult`` can be used to recreate the search later, which will
       be useful in reducing network traffic. (Robert Collins)
 
+    * Use convenience function to check whether two repository handles 
+      are referring to the same repository in ``Repository.get_graph``. 
+      (Jelmer Vernooij, #187162)
+
     * Fetching now passes the find_ghosts flag through to the 
       ``InterRepository.missing_revision_ids`` call consistently for all
       repository types. This will enable faster missing revision discovery with

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-01-29 06:56:51 +0000
+++ b/bzrlib/repository.py	2008-02-04 22:01:14 +0000
@@ -1778,8 +1778,7 @@
         """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):
+            not self.has_same_location(other_repository)):
             parents_provider = graph._StackedParentsProvider(
                 [parents_provider, other_repository._make_parents_provider()])
         return graph.Graph(parents_provider)