Rev 2791: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

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

------------------------------------------------------------
revno: 2791
revision-id: robertc at robertcollins.net-20071004225129-3mepy333rgxgoal3
parent: robertc at robertcollins.net-20071004222429-xbnfwymz8ak3u60g
parent: pqm at pqm.ubuntu.com-20071004223314-qpih4e2os3o2627a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-10-05 08:51:29 +1000
message:
  Merge bzr.dev.
modified:
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18
    revision-id: pqm at pqm.ubuntu.com-20071004223314-qpih4e2os3o2627a
    parent: pqm at pqm.ubuntu.com-20071004215001-549ul8av89cwpnjp
    parent: robertc at robertcollins.net-20071004012406-20bfylx7ngky01r5
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-10-04 23:33:14 +0100
    message:
      (robertc) Move same-repo fetch checking logic to the repository class user visible function for more reuse. (Robert Collins)
    modified:
      bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
        ------------------------------------------------------------
        revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.10.4.1
        revision-id: robertc at robertcollins.net-20071004012406-20bfylx7ngky01r5
        parent: pqm at pqm.ubuntu.com-20071003232450-c831pepea3skddct
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: fetch
        timestamp: Thu 2007-10-04 11:24:06 +1000
        message:
          Move responsibility for detecting same-repo fetching from the
          per-repository fetch logic to the wrapper function that is the official
          API. (Robert Collins)
        modified:
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.17
    revision-id: pqm at pqm.ubuntu.com-20071004215001-549ul8av89cwpnjp
    parent: pqm at pqm.ubuntu.com-20071004174812-z1zg35r1vssltydl
    parent: robertc at robertcollins.net-20071004025027-fcm3w3r4pu3mh0ry
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-10-04 22:50:01 +0100
    message:
      (robertc) Add -Devil information on some Branch methods, plus comment and docstring corrections. (Robert Collins)
    modified:
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.10.3.1
    revision-id: robertc at robertcollins.net-20071004025027-fcm3w3r4pu3mh0ry
    parent: pqm at pqm.ubuntu.com-20071003232450-c831pepea3skddct
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch
    timestamp: Thu 2007-10-04 12:50:27 +1000
    message:
      (robertc) Add -Devil information on some Branch methods, plus comment and docstring corrections. (Robert Collins)
    modified:
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2007-10-04 22:00:07 +0000
+++ b/bzrlib/remote.py	2007-10-04 22:51:29 +0000
@@ -607,7 +607,12 @@
         return False
 
     def fetch(self, source, revision_id=None, pb=None):
-        if self.has_same_location(source) or source.has_same_location(self):
+        if self.has_same_location(source):
+            # check that last_revision is in 'from' and then return a
+            # no-operation.
+            if (revision_id is not None and
+                not _mod_revision.is_null(revision_id)):
+                self.get_revision(revision_id)
             return 0, []
         self._ensure_real()
         return self._real_repository.fetch(