Rev 80: Avoid using deprecated revision_parents() function. in file:///data/jelmer/bzr-rebase/trunk/

Jelmer Vernooij jelmer at samba.org
Sun May 11 15:23:59 BST 2008


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

------------------------------------------------------------
revno: 80
revision-id: jelmer at samba.org-20080511142346-wr3s86h46jx80e1h
parent: jelmer at samba.org-20080330191611-l870nc03hu152mdg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-11 16:23:46 +0200
message:
  Avoid using deprecated revision_parents() function.
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-01-11 23:29:36 +0000
+++ b/rebase.py	2008-05-11 14:23:46 +0000
@@ -283,9 +283,9 @@
                 continue
             replay_fn(repository, revid, newrevid, newparents)
             assert repository.has_revision(newrevid)
-            assert list(repository.revision_parents(newrevid)) == newparents, \
+            assert list(repository.get_parent_map([newrevid])[newrevid]) == newparents, \
                    "expected parents %r, got %r" % (newparents, 
-                           repository.revision_parents(newrevid))
+                           repository.get_parent_map([newrevid])[newrevid])
             if dependencies.has_key(newrevid):
                 todo.extend(dependencies[newrevid])
                 del dependencies[newrevid]

=== modified file 'test_rebase.py'
--- a/test_rebase.py	2008-03-30 19:16:11 +0000
+++ b/test_rebase.py	2008-05-11 14:23:46 +0000
@@ -78,8 +78,8 @@
                 ["bloe"], {"bla": "bloe"})
         self.assertEqual("bla4", newrev)
         self.assertTrue(wt.branch.repository.has_revision(newrev))
-        self.assertEqual(["bloe"], 
-                wt.branch.repository.revision_parents(newrev))
+        self.assertEqual(("bloe",), 
+                wt.branch.repository.get_parent_map([newrev])[newrev])
         self.assertEqual("bla2", 
             wt.branch.repository.get_revision(newrev).properties["rebase-of"])
         wt.branch.repository.unlock()




More information about the bazaar-commits mailing list