Rev 2703: Switch commit and and merge to use has_same_location in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2703
revision-id: pqm at pqm.ubuntu.com-20070815125647-dx6if7e1osu5fnze
parent: pqm at pqm.ubuntu.com-20070815055603-t0fwzxv6if6sr7c6
parent: aaron.bentley at utoronto.ca-20070815112406-lyv23omlm0wgsu42
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-15 13:56:47 +0100
message:
  Switch commit and and merge to use has_same_location
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
    ------------------------------------------------------------
    revno: 2665.5.5
    merged: aaron.bentley at utoronto.ca-20070815112406-lyv23omlm0wgsu42
    parent: aaron.bentley at utoronto.ca-20070807235924-u6a2as6t2h2qwlck
    parent: pqm at pqm.ubuntu.com-20070815055603-t0fwzxv6if6sr7c6
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab2
    timestamp: Wed 2007-08-15 07:24:06 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    revno: 2665.5.4
    merged: aaron.bentley at utoronto.ca-20070807235924-u6a2as6t2h2qwlck
    parent: aaron.bentley at utoronto.ca-20070807235823-mxa8u0qe0almm4q5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab2
    timestamp: Tue 2007-08-07 19:59:24 -0400
    message:
      Remove my implementation of has_same_location
    ------------------------------------------------------------
    revno: 2665.5.3
    merged: aaron.bentley at utoronto.ca-20070807235823-mxa8u0qe0almm4q5
    parent: aaron.bentley at utoronto.ca-20070803014621-igt3i5fwv3rigvd0
    parent: pqm at pqm.ubuntu.com-20070807225230-7gb6fot3mnsxp7zs
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab2
    timestamp: Tue 2007-08-07 19:58:23 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    revno: 2665.5.2
    merged: aaron.bentley at utoronto.ca-20070803014621-igt3i5fwv3rigvd0
    parent: aaron.bentley at utoronto.ca-20070801145908-oyt3q066ndot1bgt
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab2
    timestamp: Thu 2007-08-02 21:46:21 -0400
    message:
      Switch commit and merge to Repository.has_same_location
    ------------------------------------------------------------
    revno: 2665.5.1
    merged: aaron.bentley at utoronto.ca-20070801145908-oyt3q066ndot1bgt
    parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab2
    timestamp: Wed 2007-08-01 10:59:08 -0400
    message:
      Implement has_same_location
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2007-08-07 22:59:45 +0000
+++ b/bzrlib/commit.py	2007-08-15 11:24:06 +0000
@@ -690,9 +690,8 @@
         # it fails; a better way of approaching this is to 
         # finally implement the explicit-caches approach design
         # a while back - RBC 20070306.
-        if (sub_tree.branch.repository.bzrdir.root_transport.base
-            ==
-            self.work_tree.branch.repository.bzrdir.root_transport.base):
+        if sub_tree.branch.repository.has_same_location(
+            self.work_tree.branch.repository):
             sub_tree.branch.repository = \
                 self.work_tree.branch.repository
         try:

=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2007-07-31 11:20:50 +0000
+++ b/bzrlib/merge.py	2007-08-03 01:46:21 +0000
@@ -304,8 +304,7 @@
                                                   self.this_branch)
 
     def _maybe_fetch(self, source, target, revision_id):
-        if (source.repository.bzrdir.root_transport.base !=
-            target.repository.bzrdir.root_transport.base):
+        if not source.repository.has_same_location(target.repository):
             target.fetch(source, revision_id)
 
     def find_base(self):