Changeset 0b9ac3c in mainline for contrib/bazaar/mbprotect/__init__.py

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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.

File:

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

contrib/bazaar/mbprotect/__init__.py

@@ -33 +33 @@
 # branch (a.k.a. linear history) of bzr repositories from unwanted change,
 # effectively making the main branch append-only.
-# 
+#
 # Specifically we verify that the new main branch contains the old tip.
 # This prevents a branch from inadvertently aquiring the tip of another branch.
@@ -46 +46 @@
 
 def pre_change_branch_tip(params):
-    repo = params.branch.repository
-
-    # Check if the old repository was empty.
-    if params.old_revid == 'null:':
-        return
-
-    # 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):
-        if revision_id == params.old_revid:
-            return      # Found old tip
-
-    # 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):
-        if revision_id == params.new_revid:
-            return      # Found new tip
-
-    # Trying to do something else. Reject the change.
-    raise TipChangeRejected('Bad tip. Read http://trac.helenos.org/trac.fcgi/' +
-        'wiki/BazaarWorkflow')
+        repo = params.branch.repository
+        
+        # Check if the old repository was empty.
+        if params.old_revid == 'null:':
+                return
+        
+        # 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):
+                if revision_id == params.old_revid:
+                        return  # Found old tip
+        
+        # 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):
+                if revision_id == params.new_revid:
+                        return  # Found new tip
+        
+        # Trying to do something else. Reject the change.
+        raise TipChangeRejected('Bad tip. Read http://trac.helenos.org/wiki/BazaarWorkflow')
 
 # Install hook.
 bzrlib.branch.Branch.hooks.install_named_hook('pre_change_branch_tip',
-    pre_change_branch_tip, 'MB-Protect tip check')
+        pre_change_branch_tip, 'MB-Protect tip check')