Rev 90: Deal with parents being a tuple. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 90
revision-id: jelmer at samba.org-20080529143424-qp3mpdu9sknfugy7
parent: jelmer at samba.org-20080529142315-w6cpjsiz2287414h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-29 16:34:24 +0200
message:
  Deal with parents being a tuple.
modified:
  rebase.py                      rebase.py-20070626221123-ellanmf93nw8z9r1-1
  test_rebase.py                 test_rebase.py-20070626221123-ellanmf93nw8z9r1-2
=== modified file 'rebase.py'
--- a/rebase.py	2008-05-29 14:23:15 +0000
+++ b/rebase.py	2008-05-29 14:34:24 +0000
@@ -225,7 +225,9 @@
                         "Expected tuple of parents, got: %r" % parents
                 # replace r in parents with replace_map[r][0]
                 if not replace_map[r][0] in parents:
-                    parents[list(parents).index(r)] = replace_map[r][0]
+                    parents = list(parents)
+                    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
             processed.add(r)

=== modified file 'test_rebase.py'
--- a/test_rebase.py	2008-05-29 14:23:15 +0000
+++ b/test_rebase.py	2008-05-29 14:34:24 +0000
@@ -158,14 +158,14 @@
         b.repository.lock_read()
         graph = b.repository.get_graph()
         self.assertEquals({
-            'blie': ('newblie', ['lala'])},
+            'blie': ('newblie', ('lala',))},
             generate_transpose_plan(graph.iter_ancestry(["blie"]), 
             {"bla": "lala"}, graph, lambda y: "new"+y))
         self.assertEquals({
-            'bla2': ('newbla2', ['lala']),
-            'bla3': ('newbla3', ['newbla2']),
-            'blie': ('newblie', ['lala']),
-            'bloe': ('newbloe', ['lala'])},
+            'bla2': ('newbla2', ('lala',)),
+            'bla3': ('newbla3', ('newbla2',)),
+            'blie': ('newblie', ('lala',)),
+            'bloe': ('newbloe', ('lala',))},
             generate_transpose_plan(graph.iter_ancestry(b.repository._all_revision_ids()), 
             {"bla": "lala"}, 
             graph, lambda y: "new"+y))
@@ -173,7 +173,7 @@
 
     def test_generate_transpose_plan_one(self):
         graph = Graph(DictParentsProvider({"bla": ("bloe",), "bloe": (), "lala": ()}))
-        self.assertEquals({"bla": ("newbla", ["lala"])},
+        self.assertEquals({"bla": ("newbla", ("lala",))},
                 generate_transpose_plan(graph.iter_ancestry(["bla", "bloe"]),
                     {"bloe": "lala"}, graph, lambda y: "new"+y))