Merge lp:~jelmer/pqm/avoid-rev-history into lp:pqm

[Jelmer Vernooij]

Avoid using Branch.revision_history() and Branch.set_revision_history().

Use Branch.set_last_revision_info / Branch.last_revision_info rather than Branch.set_revision_history / Branch.revision_history, which are deprecated.

[Martin Pool (mbp)]

  vote approve

review: Approve

[Jelmer Vernooij (jelmer)]

Thanks!

[Jelmer Vernooij (jelmer)]

Can somebody merge this for me?

[Robert Collins (lifeless)]

I get test failures with this applied :(.

FTW I get test failures without it applied as well. So I'm going to
merge it, but it could be bust.

=== modified file 'docs/design.txt'
--- docs/design.txt	2007-11-04 18:04:49 +0000
+++ docs/design.txt	2011-10-18 11:39:26 +0000
@@ -31,7 +31,8 @@
   # the pqm will be such that the most recent commit will not be visible to
   # other users until publication, so as to prevent race conditions with the
   # uncommit facility.
-  parent.set_revision_history(parent.revision_history()[:-1])
+  (last_revno, last_revid) = branch.last_revision_info()
+  branch.set_last_revision_info(old_last_revno, old_last_revid)
   # Merge two branches:
   other = bzrlib.branch.Branch.open(SOURCE)
   conflicts = tree.merge_from_branch(other)
 
=== modified file 'pqm/__init__.py'
--- pqm/__init__.py	2010-06-10 00:45:07 +0000
+++ pqm/__init__.py	2011-10-18 11:39:26 +0000
@@ -403,6 +403,7 @@
         # this equality tests for 'not a checkout'
         if tree.bzrdir.root_transport.base == branch.bzrdir.root_transport.base:
             parent_branch = Branch.open(parent_branch)
+            (old_revno, old_revid) = parent_branch.last_revision_info()
             branch.push(parent_branch)
             logger.info("commited '%s' to '%s'", branch, parent_branch)
             output.append("commited '%s' to '%s'" % (branch, parent_branch))
@@ -416,8 +417,7 @@
             except (bzrlib.errors.BzrError, bzrlib.errors.BzrNewError), e:
                 # Discard the successfully committed item from the 'master'
                 # branch.
-                parent_branch.set_revision_history(
-                    parent_branch.revision_history()[:-1])
+                parent_branch.set_last_revision_info(old_revno, old_revid)
                 raise PQMTlaFailure(sender, [str(e).split('\n')])
         return output
 
@@ -465,10 +465,9 @@
             raise PQMTlaFailure(sender, [])
         _merge_tags_if_possible(merger.other_branch, tree.branch)
         output_obj.add_stdout("Merge successful.")
-        
+
     def make_local_dir(self, sender, branch_spec, output_dir):
-        from bzrlib.branch import Branch, BranchReferenceFormat
-        import bzrlib.bzrdir as bzrdir
+        from bzrlib.branch import Branch
         os.mkdir(output_dir)
         branch = Branch.open(branch_spec)
         branch.create_checkout(output_dir, lightweight=True)