Rev 123: Cope with revision ids not changing. in file:///home/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 123
revision-id: jelmer at samba.org-20090202210512-j9e98qmy30z8s0fg
parent: jelmer at samba.org-20090201025407-19m96v2jo4c7q7rn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2009-02-02 22:05:12 +0100
message:
  Cope with revision ids not changing.
modified:
  rebase.py                      rebase.py-20070626221123-ellanmf93nw8z9r1-1
=== modified file 'rebase.py'
--- a/rebase.py	2009-02-01 02:50:43 +0000
+++ b/rebase.py	2009-02-02 21:05:12 +0000
@@ -237,6 +237,7 @@
     try:
         while len(todo) > 0:
             r = todo.pop()
+            processed.add(r)
             i += 1
             pb.update('determining dependencies', i, total)
             # Add entry for them in replace_map
@@ -255,10 +256,10 @@
                     parents[parents.index(r)] = replace_map[r][0]
                     parents = tuple(parents)
                 replace_map[c] = (generate_revid(c), tuple(parents))
-                assert replace_map[c][0] != c, "Invalid value in replace map %r" % c
-            processed.add(r)
-            # Add them to todo[]
-            todo.extend(filter(lambda x: not x in processed, children[r]))
+                if replace_map[c][0] == c:
+                    del replace_map[c][0]
+                elif c not in processed:
+                    todo.append(c)
     finally:
         pb.finished()