Merge lp:~jelmer/bzr-builddeb/no-more-revhistory into lp:bzr-builddeb

[Jelmer Vernooij]

Avoid Branch.revision_history() in a couple of places - it's deprecated.

Unmerged revisions

640. By Jelmer Vernooij on 2011-10-24

Avoid Branch.revision_history() in a few places.

=== modified file 'tests/blackbox/test_import_dsc.py'
--- tests/blackbox/test_import_dsc.py	2011-07-19 15:05:54 +0000
+++ tests/blackbox/test_import_dsc.py	2011-10-29 08:26:23 +0000
@@ -113,7 +113,7 @@
                 self.check_inventory_shape(tree.inventory, expected_shape)
         finally:
             tree.unlock()
-        self.assertEqual(len(tree.branch.revision_history()), 3)
+        self.assertEqual(tree.branch.revno(), 3)
 
     def test_import_dsc(self):
         self.requireFeature(PristineTarFeature)
@@ -130,7 +130,7 @@
                 self.check_inventory_shape(tree.inventory, expected_shape)
         finally:
             tree.unlock()
-        self.assertEqual(len(tree.branch.revision_history()), 2)
+        self.assertEqual(tree.branch.revno(), 2)
 
     def test_import_no_files(self):
         self.make_branch_and_tree('.')

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2011-10-13 18:05:08 +0000
+++ tests/test_import_dsc.py	2011-10-29 08:26:23 +0000
@@ -965,8 +965,8 @@
         builder.new_version(version2)
         builder.build()
         self.db2.import_package(builder.dsc_name())
-        self.assertEqual(len(self.up_tree2.branch.revision_history()), 2)
-        self.assertEqual(len(self.tree2.branch.revision_history()), 3)
+        self.assertEqual(self.up_tree2.branch.revno(), 2)
+        self.assertEqual(self.tree2.branch.revno(), 3)
 
     def test_import_package_init_upstream_from_other(self):
         self.requireFeature(PristineTarFeature)
@@ -980,8 +980,8 @@
         builder.new_version(version2)
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        self.assertEqual(len(self.up_tree1.branch.revision_history()), 1)
-        self.assertEqual(len(self.tree1.branch.revision_history()), 3)
+        self.assertEqual(self.up_tree1.branch.revno(), 1)
+        self.assertEqual(self.tree1.branch.revno(), 3)
 
     def import_package_single(self):
         version1 = Version("0.1-1")
@@ -990,8 +990,8 @@
         builder.add_default_control()
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        self.assertEqual(len(self.up_tree1.branch.revision_history()), 1)
-        self.assertEqual(len(self.tree1.branch.revision_history()), 2)
+        self.assertEqual(self.up_tree1.branch.revno(), 1)
+        self.assertEqual(self.tree1.branch.revno(), 2)
 
     def test_import_package_double(self):
         self.requireFeature(PristineTarFeature)
@@ -1161,10 +1161,10 @@
         builder.build()
         self.db1.import_package(builder.dsc_name())
         self.db2.import_package(builder.dsc_name())
-        self.assertEqual(3, len(self.tree1.branch.revision_history()))
-        self.assertEqual(2, len(self.up_tree1.branch.revision_history()))
-        self.assertEqual(3, len(self.tree2.branch.revision_history()))
-        self.assertEqual(2, len(self.up_tree2.branch.revision_history()))
+        self.assertEqual(3, self.tree1.branch.revno())
+        self.assertEqual(2, self.up_tree1.branch.revno())
+        self.assertEqual(3, self.tree2.branch.revno())
+        self.assertEqual(2, self.up_tree2.branch.revno())
         self.assertEqual(self.tree1.last_revision(),
                 self.tree2.last_revision())
         self.assertEqual(self.up_tree1.last_revision(),
@@ -1188,14 +1188,14 @@
         builder.add_default_control()
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
-        self.assertEqual(len(rh1), 1)
-        self.assertEqual(len(up_rh1), 0)
+        (rh1_revno, rh1_revid) = self.tree1.branch.last_revision_info()
+        up_rh1_revno = self.up_tree1.branch.revno()
+        self.assertEqual(rh1_revno, 1)
+        self.assertEqual(up_rh1_revno, 0)
         self.tree1.lock_read()
         self.addCleanup(self.tree1.unlock)
         self.assertTrue(self.db1.is_version_native(version))
-        revtree = self.tree1.branch.repository.revision_tree(rh1[0])
+        revtree = self.tree1.branch.repository.revision_tree(rh1_revid)
         config_fileid, current_config = self.db1._default_config_for_tree(revtree)
         self.assertTrue(self.db1._is_tree_native(current_config))
 
@@ -1215,9 +1215,9 @@
         builder.build()
         self.db1.import_package(builder.dsc_name())
         rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        up_rh1_revno = self.up_tree1.branch.revno()
         self.assertEqual(len(rh1), 2)
-        self.assertEqual(len(up_rh1), 0)
+        self.assertEqual(up_rh1_revno, 0)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[0])
         rev_tree2 = self.tree1.branch.repository.revision_tree(rh1[1])
         self.assertEqual(rev_tree1.get_parent_ids(), [])
@@ -1246,9 +1246,9 @@
         builder.build()
         self.db1.import_package(builder.dsc_name())
         rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        up_rh1_revno = self.up_tree1.branch.revno()
         self.assertEqual(len(rh1), 2)
-        self.assertEqual(len(up_rh1), 0)
+        self.assertEqual(up_rh1_revno, 0)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[0])
         rev_tree2 = self.tree1.branch.repository.revision_tree(rh1[1])
         self.assertEqual(rev_tree1.get_parent_ids(), [])
@@ -1281,9 +1281,9 @@
         builder.build()
         self.db1.import_package(builder.dsc_name())
         rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        up_rh1_revno = self.up_tree1.branch.revno()
         self.assertEqual(len(rh1), 3)
-        self.assertEqual(len(up_rh1), 1)
+        self.assertEqual(up_rh1_revno, 1)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[1])
         rev_tree2 = self.tree1.branch.repository.revision_tree(rh1[2])
         self.assertEqual(rev_tree1.get_parent_ids(), [rh1[0]])
@@ -1370,13 +1370,13 @@
         builder.build()
         self.db1.import_package(builder.dsc_name())
         rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        up_rh1_revno, up_rh1_revid = self.up_tree1.branch.last_revision_info()
         self.assertEqual(len(rh1), 4)
-        self.assertEqual(len(up_rh1), 1)
+        self.assertEqual(up_rh1_revno, 1)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[1])
         rev_tree2 = self.tree1.branch.repository.revision_tree(rh1[2])
         rev_tree3 = self.tree1.branch.repository.revision_tree(rh1[3])
-        self.assertEqual(rev_tree1.get_parent_ids(), [up_rh1[0]])
+        self.assertEqual(rev_tree1.get_parent_ids(), [up_rh1_revid])
         self.assertEqual(rev_tree2.get_parent_ids(), [rh1[1]])
         self.assertEqual(rev_tree3.get_parent_ids(), [rh1[2]])
         self.assertEqual(self.db1.revid_of_version(version1), rh1[1])
@@ -1385,7 +1385,7 @@
         self.assertEqual(
             self.db1.pristine_upstream_source.version_as_revisions(
                 "package", version1.upstream_version),
-            {None: up_rh1[0]})
+            {None: up_rh1_revid})
         self.tree1.lock_read()
         self.addCleanup(self.tree1.unlock)
         self.assertFalse(self.db1.is_version_native(version1))

=== modified file 'tests/test_merge_package.py'
--- tests/test_merge_package.py	2011-06-26 21:18:23 +0000
+++ tests/test_merge_package.py	2011-10-29 08:26:23 +0000
@@ -126,11 +126,11 @@
         self.assertEqual(db1.pristine_upstream_source.has_version("package", v4), False)
 
         # The ubuntu upstream branch tip.
-        ubuu_tip = ubuu.branch.revision_history()[-1]
+        ubuu_tip = ubuu.branch.last_revision()
         # The debian upstream branch tip.
-        debu_tip = debu.branch.revision_history()[-1]
+        debu_tip = debu.branch.last_revision()
         # The ubuntu packaging branch tip.
-        ubup_tip_pre_fix = ubup.branch.revision_history()[-1]
+        ubup_tip_pre_fix = ubup.branch.last_revision()
 
         # The first conflict is resolved by calling fix_ancestry_as_needed().
         upstreams_diverged, t_upstream_reverted = MP.fix_ancestry_as_needed(ubup, debp.branch)
@@ -150,7 +150,7 @@
         self.assertEqual(db2.pristine_upstream_source.has_version("package", v4), True)
 
         # Now let's take a look at the fixed ubuntu packaging branch.
-        ubup_tip_post_fix = ubup.branch.revision_history()[-1]
+        ubup_tip_post_fix = ubup.branch.last_revision()
         ubup_parents_post_fix = ubup.branch.repository.revision_tree(ubup_tip_post_fix).get_parent_ids()
 
         # The tip of the fixed ubuntu packaging branch has 2 parents.