Rev 2003: Try to defer finding revision id as long as possible. in file:///data/jelmer/bzr-svn/0.5/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.5/

------------------------------------------------------------
revno: 2003
revision-id: jelmer at samba.org-20081117162927-h3w9lhx33cr4cqad
parent: jelmer at samba.org-20081117160146-jih1cr33zwsgrv0x
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-11-17 17:29:27 +0100
message:
  Try to defer finding revision id as long as possible.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-11-17 15:57:23 +0000
+++ b/fetch.py	2008-11-17 16:29:27 +0000
@@ -593,7 +593,7 @@
         needed = list(graph.iter_topo_order(missing))
         return [(meta_map[revid], mapping) for revid in needed]
 
-    def _find_until(self, revision_id, find_ghosts=False, pb=None,
+    def _find_until(self, foreign_revid, mapping, find_ghosts=False, pb=None,
                     checked=None, project=None):
         """Find all missing revisions until revision_id
 
@@ -604,41 +604,41 @@
         """
         if checked is None:
             checked = set()
-        if revision_id in checked:
+        if (foreign_revid, mapping) in checked:
             return []
         extra = list()
-        def check_revid(revision_id, project=None):
+        def check_revid((uuid, branch_path, revnum), mapping, project=None):
             revmetas = []
-            try:
-                (branch_path, revnum, mapping) = \
-                    self.source.lookup_revision_id(revision_id, project=project)
-            except NoSuchRevision:
-                return [] # Ghost
             for revmeta in self.source._revmeta_provider.iter_reverse_branch_changes(
                 branch_path, revnum, to_revnum=0, mapping=mapping):
                 if pb:
                     pb.update("determining revisions to fetch", 
                               revnum-revmeta.revnum, revnum)
+                if (revmeta.get_foreign_revid(), mapping) in checked:
+                    # This revision (and its ancestry) has already been checked
+                    break
                 if revmeta.is_hidden(mapping):
                     continue
-                revid = revmeta.get_revision_id(mapping)
-                if revid in checked:
-                    # This revision (and its ancestry) has already been checked
-                    break
-                if not self.target.has_revision(revid):
+                if not self.target.has_revision(revmeta.get_revision_id(mapping)):
                     revmetas.append(revmeta)
-                    extra.extend([(p, project) for p in revmeta.get_rhs_parents(mapping)])
+                    for p in revmeta.get_rhs_parents(mapping):
+                        try:
+                            (branch_path, revnum, mapping) = self.source.lookup_revision_id(p, project=project)
+                        except NoSuchRevision:
+                            pass # Ghost
+                        else:
+                            extra.append(((uuid, branch_path, revnum), project, mapping))
                 elif not find_ghosts:
                     break
-                checked.add(revid)
+                checked.add((revmeta.get_foreign_revid(), mapping))
             return [(revmeta, mapping) for revmeta in reversed(revmetas)]
 
-        needed = check_revid(revision_id, project)
+        needed = check_revid(foreign_revid, mapping, project)
 
         while len(extra) > 0:
-            revid, project = extra.pop()
-            if revid not in checked:
-                needed += check_revid(revid, project)
+            foreign_revid, project, mapping = extra.pop()
+            if (foreign_revid, mapping) not in checked:
+                needed += check_revid(foreign_revid, mapping, project)
 
         return needed
 
@@ -773,7 +773,8 @@
                 elif revision_id is None:
                     needed = self._find_all(self.source.get_mapping(), pb=nested_pb)
                 else:
-                    needed = self._find_until(revision_id, find_ghosts, pb=nested_pb)
+                    (branch_path, revnum, mapping) = self.source.lookup_revision_id(revision_id)
+                    needed = self._find_until((self.source.uuid, branch_path, revnum), mapping, find_ghosts, pb=nested_pb)
             finally:
                 nested_pb.finished()