Changeset 03362fbd in mainline for contrib/bazaar/mbprotect/__init__.py

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• contrib/bazaar/mbprotect/__init__.py (modified) (3 diffs)

contrib/bazaar/mbprotect/__init__.py

@@ -44 +44 @@
 import bzrlib.branch
 from bzrlib.errors import TipChangeRejected
+from bzrlib import revision as _mod_revision
+
+def iter_reverse_revision_history(repository, revision_id):
+        """Iterate backwards through revision ids in the lefthand history"""
+        
+        graph = repository.get_graph()
+        stop_revisions = (None, _mod_revision.NULL_REVISION)
+        return graph.iter_lefthand_ancestry(revision_id, stop_revisions)
 
 def pre_change_branch_tip(params):
@@ -54 +62 @@
         # First permitted case is appending changesets to main branch.Look for
         # old tip in new main branch.
-        for revision_id in repo.iter_reverse_revision_history(params.new_revid):
+        for revision_id in iter_reverse_revision_history(repo, params.new_revid):
                 if revision_id == params.old_revid:
                         return  # Found old tip
@@ -60 +68 @@
         # Another permitted case is backing out changesets. Look for new tip
         # in old branch.
-        for revision_id in repo.iter_reverse_revision_history(params.old_revid):
+        for revision_id in iter_reverse_revision_history(repo, params.old_revid):
                 if revision_id == params.new_revid:
                         return  # Found new tip