Rev 125: Use single call to find present revisions. in file:///home/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-rebase/trunk/

------------------------------------------------------------
revno: 125
revision-id: jelmer at samba.org-20090213032837-biqhpc7ghfo96hn6
parent: jelmer at samba.org-20090202211502-77bmj02gwgx3az7v
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2009-02-13 04:28:37 +0100
message:
  Use single call to find present revisions.
modified:
  rebase.py                      rebase.py-20070626221123-ellanmf93nw8z9r1-1
=== modified file 'rebase.py'
--- a/rebase.py	2009-02-02 21:15:02 +0000
+++ b/rebase.py	2009-02-13 03:28:37 +0000
@@ -302,9 +302,10 @@
                 dependencies[p] = []
             dependencies[p].append(revid)
 
-    pb = ui.ui_factory.nested_progress_bar()
+    import pdb; pdb.set_trace()
     total = len(todo)
     i = 0
+    pb = ui.ui_factory.nested_progress_bar()
     try:
         while len(todo) > 0:
             pb.update('rebase revisions', i, total)
@@ -312,7 +313,7 @@
             revid = todo.pop()
             (newrevid, newparents) = replace_map[revid]
             assert isinstance(newparents, tuple), "Expected tuple for %r" % newparents
-            if filter(repository.has_revision, newparents) != newparents:
+            if repository.has_revisions(newparents) != set(newparents):
                 # Not all parents present yet, avoid for now
                 continue
             if repository.has_revision(newrevid):