phases: add retractboundary function to move boundary backward
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Fri, 11 Nov 2011 00:16:53 +0100
changeset 15482 a667c89e49b3
parent 15481 0b7ce2f739fb
child 15483 9ae766f2f452
phases: add retractboundary function to move boundary backward The advanceboundary documentation is updated to highlight the difference.
mercurial/phases.py
--- a/mercurial/phases.py	Thu Nov 10 01:09:15 2011 +0100
+++ b/mercurial/phases.py	Fri Nov 11 00:16:53 2011 +0100
@@ -61,9 +61,10 @@
 def advanceboundary(repo, targetphase, nodes):
     """Add nodes to a phase changing other nodes phases if necessary.
 
-    Simplify boundary to contains phase roots only."""
+    This function move boundary *forward* this means that all nodes are set
+    in the target phase or kept in a *lower* phase.
 
-    # move roots of lower states
+    Simplify boundary to contains phase roots only."""
     for phase in xrange(targetphase + 1, len(allphases)):
         # filter nodes that are not in a compatible phase already
         # XXX rev phase cache might have been invalidated by a previous loop
@@ -81,3 +82,21 @@
             if '_phaserev' in vars(repo):
                 del repo._phaserev
             repo._dirtyphases = True
+
+def retractboundary(repo, targetphase, nodes):
+    """Set nodes back to a phase changing other nodes phases if necessary.
+
+    This function move boundary *backward* this means that all nodes are set
+    in the target phase or kept in a *higher* phase.
+
+    Simplify boundary to contains phase roots only."""
+    currentroots = repo._phaseroots[targetphase]
+    newroots = [n for n in nodes if repo[n].phase() < targetphase]
+    if newroots:
+        currentroots.update(newroots)
+        ctxs = repo.set('roots(%ln::)', currentroots)
+        currentroots.intersection_update(ctx.node() for ctx in ctxs)
+        if '_phaserev' in vars(repo):
+            del repo._phaserev
+        repo._dirtyphases = True
+