Rev 95: Use tuples more consistently. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 95
revision-id: jelmer at samba.org-20080623020400-92fg1tikfzn0jph5
parent: jelmer at samba.org-20080621165225-wfvc67ed61lxbbij
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-06-23 04:04:00 +0200
message:
  Use tuples more consistently.
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:57:15 +0000
+++ b/rebase.py	2008-06-23 02:04:00 +0000
@@ -110,7 +110,7 @@
             # Skip empty lines
             continue
         pts = l.split(" ")
-        replace_map[pts[0]] = (pts[1], pts[2:])
+        replace_map[pts[0]] = (pts[1], tuple(pts[2:]))
     return (last_revision_info, replace_map)
 
 

=== modified file 'test_rebase.py'
--- a/test_rebase.py	2008-06-11 18:29:08 +0000
+++ b/test_rebase.py	2008-06-23 02:04:00 +0000
@@ -41,11 +41,11 @@
 1 bla
 oldrev newrev newparent1 newparent2
 """, marshall_rebase_plan((1, "bla"), 
-                          {"oldrev": ("newrev", ["newparent1", "newparent2"])}))
+                          {"oldrev": ("newrev", ("newparent1", "newparent2"))}))
 
     def test_simple_unmarshall_rebase_plan(self):
         self.assertEquals(((1, "bla"), 
-                          {"oldrev": ("newrev", ["newparent1", "newparent2"])}),
+                          {"oldrev": ("newrev", ("newparent1", "newparent2"))}),
                          unmarshall_rebase_plan("""# Bazaar rebase plan 1
 1 bla
 oldrev newrev newparent1 newparent2
@@ -293,7 +293,7 @@
 oldrev newrev newparent1 newparent2
 """)
         self.assertEquals(((1, "bla"), 
-            {"oldrev": ("newrev", ["newparent1", "newparent2"])}),
+            {"oldrev": ("newrev", ("newparent1", "newparent2"))}),
             read_rebase_plan(wt))