Merge lp:~jameinel/bzr-builddeb/no_revision_history into lp:bzr-builddeb

[John A Meinel]

Don't use Branch.revision_history() in the test suite. It is deprecated in bzr-2.5

This fixes bug #885690. We deprecated 'Branch.revision_history' in bzr-2.5 and that causes *lots* of test stipple for bzr-builddeb.

I tried to fix as many of them as possible to use branch.last_revision/last_revision_info/revno, as most of them just needed the tip, or were asserting the length of the history, etc.

For some of them, I did go ahead and use the test_fetch approach, copying the 'revision_history(branch)' helper and translating the calls as appropriate.

This should be mostly mechanical, but you may want to read some of it closely to make sure I didn't change the meaning of any tests.

[Jelmer Vernooij (jelmer)]

I also had a branch which fixed some of these but that I hadn't proposed for merging yet...

Anyway, yours is more thorough so let's merge that.

review: Approve

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/03/2011 03:25 PM, Jelmer Vernooij wrote:
> Review: Approve
>
> I also had a branch which fixed some of these but that I hadn't
> proposed for merging yet...
>
> Anyway, yours is more thorough so let's merge that.

I can't commit directly. Can you land it?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6ysTcACgkQJdeBCYSNAAPQ+gCfaNz8bYQS5XyGTp/Wc+Hvxh9p
nQ0AoLwqGqttkV08vx+Yx2NK6Sf6kCs3
=vVoL
-----END PGP SIGNATURE-----

=== 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-11-03 14:13:25 +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(3, tree.branch.revno())
 
     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(2, tree.branch.revno())
 
     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-11-03 14:13:25 +0000
@@ -32,6 +32,7 @@
     from debian_bundle import deb822
 
 from bzrlib import (
+    revision as _mod_revision,
     tests,
     )
 try:
@@ -45,6 +46,19 @@
         SymlinkFeature,
         )
 
+## Copied from bzrlib.tests.test_fetch from bzr-2.5
+def revision_history(branch):
+    branch.lock_read()
+    try:
+        graph = branch.repository.get_graph()
+        history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
+            [_mod_revision.NULL_REVISION]))
+    finally:
+        branch.unlock()
+    history.reverse()
+    return history
+
+
 from bzrlib.plugins.builddeb.import_dsc import (
         DistributionBranch,
         DistributionBranchSet,
@@ -794,11 +808,11 @@
         version = self.import_a_tree()
         tree = self.up_tree1
         branch = tree.branch
-        rh = branch.revision_history()
-        self.assertEqual(len(rh), 1)
+        revno, rev_id = branch.last_revision_info()
+        self.assertEqual(revno, 1)
         self.assertEqual(self.db1.pristine_upstream_source.version_as_revisions(
-            "package", version.upstream_version), {None: rh[0]})
-        rev = branch.repository.get_revision(rh[0])
+            "package", version.upstream_version), {None: rev_id})
+        rev = branch.repository.get_revision(rev_id)
         self.assertEqual(rev.message,
                 "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties.get('deb-md5'), None)
@@ -832,18 +846,18 @@
                 { None: [self.up_tree1.branch.last_revision()] }, [(None, None, None)])
         tree = self.up_tree1
         branch = tree.branch
-        rh = branch.revision_history()
-        self.assertEqual(len(rh), 2)
+        revno, rev_id = branch.last_revision_info()
+        self.assertEqual(revno, 2)
         self.assertEqual(
             self.db1.pristine_upstream_source.version_as_revisions(
                 "package", version2.upstream_version),
-            {None: rh[1]})
-        rev = branch.repository.get_revision(rh[1])
+            {None: rev_id})
+        rev = branch.repository.get_revision(rev_id)
         self.assertEqual(rev.message,
                 "Import upstream version %s" % str(version2.upstream_version))
         self.assertIs(rev.properties.get('deb-md5'), None)
-        rev_tree1 = branch.repository.revision_tree(rh[0])
-        rev_tree2 = branch.repository.revision_tree(rh[1])
+        rev_tree1 = branch.repository.revision_tree(rev.parent_ids[0])
+        rev_tree2 = branch.repository.revision_tree(rev_id)
         changes = rev_tree2.changes_from(rev_tree1)
         self.check_changes(changes, added=["NEWS"], removed=["COPYING"],
                 modified=["README"])
@@ -866,11 +880,11 @@
                 upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
         tree = self.up_tree1
         branch = tree.branch
-        rh = branch.revision_history()
-        self.assertEqual(len(rh), 1)
+        revno, rev_id = branch.last_revision_info()
+        self.assertEqual(revno, 1)
         self.assertEqual(self.db1.pristine_upstream_source.version_as_revisions(
-            "package", version.upstream_version), {None: rh[0]})
-        rev = branch.repository.get_revision(rh[0])
+            "package", version.upstream_version), {None: rev_id})
+        rev = branch.repository.get_revision(rev_id)
         self.assertEqual(rev.message,
                 "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
@@ -894,11 +908,11 @@
             {}, upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
         tree = self.up_tree1
         branch = tree.branch
-        rh = branch.revision_history()
-        self.assertEqual(len(rh), 1)
+        revno, rev_id = branch.last_revision_info()
+        self.assertEqual(revno, 1)
         self.assertEqual(self.db1.pristine_upstream_source.version_as_revisions(
-            "package", version.upstream_version), {None: rh[0]})
-        rev = branch.repository.get_revision(rh[0])
+            "package", version.upstream_version), {None: rev_id})
+        rev = branch.repository.get_revision(rev_id)
         self.assertEqual(rev.message,
                 "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
@@ -943,11 +957,11 @@
             {}, upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
         tree = self.up_tree1
         branch = tree.branch
-        rh = branch.revision_history()
-        self.assertEqual(len(rh), 1)
+        revno, rev_id = branch.last_revision_info()
+        self.assertEqual(revno, 1)
         self.assertEqual(self.db1.pristine_upstream_source.version_as_revisions(
-            "package", version.upstream_version), {None: rh[0]})
-        rev = branch.repository.get_revision(rh[0])
+            "package", version.upstream_version), {None: rev_id})
+        rev = branch.repository.get_revision(rev_id)
         self.assertEqual(rev.message,
                 "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
@@ -965,8 +979,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 +994,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 +1004,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)
@@ -1016,8 +1030,8 @@
         builder.remove_debian_file("COPYING")
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh = self.tree1.branch.revision_history()
-        up_rh = self.up_tree1.branch.revision_history()
+        rh = revision_history(self.tree1.branch)
+        up_rh = revision_history(self.up_tree1.branch)
         self.assertEqual(len(up_rh), 2)
         self.assertEqual(len(rh), 3)
         self.assertEqual(rh[0], up_rh[0])
@@ -1069,10 +1083,10 @@
         builder.add_default_control()
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        rh2 = self.tree2.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
-        up_rh2 = self.up_tree2.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        rh2 = revision_history(self.tree2.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
+        up_rh2 = revision_history(self.up_tree2.branch)
         self.assertEqual(len(rh1), 2)
         self.assertEqual(len(rh2), 2)
         self.assertEqual(len(up_rh1), 1)
@@ -1118,10 +1132,10 @@
         builder.build()
         self.db1.import_package(builder.dsc_name())
         self.db2.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        rh2 = self.tree2.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
-        up_rh2 = self.up_tree2.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        rh2 = revision_history(self.tree2.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
+        up_rh2 = revision_history(self.up_tree2.branch)
         self.assertEqual(len(rh1), 3)
         self.assertEqual(len(rh2), 4)
         self.assertEqual(len(up_rh1), 2)
@@ -1161,10 +1175,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 +1202,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)
+        revno1, rev_id1 = self.tree1.branch.last_revision_info()
+        up_revno1, up_rev_id1 = self.up_tree1.branch.last_revision_info()
+        self.assertEqual(revno1, 1)
+        self.assertEqual(up_revno1, 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(rev_id1)
         config_fileid, current_config = self.db1._default_config_for_tree(revtree)
         self.assertTrue(self.db1._is_tree_native(current_config))
 
@@ -1214,8 +1228,8 @@
         builder.add_debian_file("NEWS")
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
         self.assertEqual(len(rh1), 2)
         self.assertEqual(len(up_rh1), 0)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[0])
@@ -1245,8 +1259,8 @@
         builder.add_upstream_file("README", "bar")
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
         self.assertEqual(len(rh1), 2)
         self.assertEqual(len(up_rh1), 0)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[0])
@@ -1280,8 +1294,8 @@
         builder.add_upstream_file("NEWS")
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
         self.assertEqual(len(rh1), 3)
         self.assertEqual(len(up_rh1), 1)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[1])
@@ -1316,8 +1330,8 @@
         builder.add_upstream_file("NEWS")
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
         self.assertEqual(len(rh1), 2)
         self.assertEqual(len(up_rh1), 2)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[0])
@@ -1369,8 +1383,8 @@
         builder.new_version(version3)
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
         self.assertEqual(len(rh1), 4)
         self.assertEqual(len(up_rh1), 1)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[1])
@@ -1418,8 +1432,8 @@
         builder.new_version(version3)
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
         self.assertEqual(len(rh1), 4)
         self.assertEqual(len(up_rh1), 2)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[1])
@@ -1475,8 +1489,8 @@
         builder.new_version(version3)
         builder.build()
         self.db1.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
         self.assertEqual(len(rh1), 4)
         self.assertEqual(len(up_rh1), 2)
         rev_tree1 = self.tree1.branch.repository.revision_tree(rh1[1])
@@ -1528,10 +1542,10 @@
         builder.build()
         self.db1.import_package(builder.dsc_name())
         self.db2.import_package(builder.dsc_name())
-        rh1 = self.tree1.branch.revision_history()
-        up_rh1 = self.up_tree1.branch.revision_history()
-        rh2 = self.tree2.branch.revision_history()
-        up_rh2 = self.up_tree2.branch.revision_history()
+        rh1 = revision_history(self.tree1.branch)
+        up_rh1 = revision_history(self.up_tree1.branch)
+        rh2 = revision_history(self.tree2.branch)
+        up_rh2 = revision_history(self.up_tree2.branch)
         self.assertEqual(3, len(rh1))
         self.assertEqual(2, len(up_rh1))
         self.assertEqual(4, len(rh2))
@@ -1694,8 +1708,8 @@
             version1.upstream_version,
             upstream_branch=upstream_tree.branch,
             upstream_revisions={None: upstream_rev})
-        rh1 = tree.branch.revision_history()
-        self.assertEqual(2, len(rh1))
+        revno1, rev_id1 = tree.branch.last_revision_info()
+        self.assertEqual(2, revno1)
         packaging_upstream_tip = tree.get_parent_ids()[1]
         # We added the extra parent for the upstream branch
         revtree = tree.branch.repository.revision_tree(packaging_upstream_tip)
 
=== 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-11-03 14:13:25 +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.