Mercurial > public > mercurial-scm > hg-stable

diff mercurial/phases.py @ 22070:c1ca47204590

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phase: add a transaction argument to retractboundary We now pass a transaction option to this phase movement function. The object is currently not used by the function, but it will be in the future. All call sites have been updated. Most call sites were already enclosed in a transaction for a long time. The handful of others have been recently updated in previous commit.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 23:52:21 -0700
parents 616a455b02ca
children 5dcc58649b1a
line wrap: on
line diff
--- a/mercurial/phases.py	Wed Aug 06 01:54:19 2014 -0700
+++ b/mercurial/phases.py	Tue Aug 05 23:52:21 2014 -0700
@@ -229,10 +229,10 @@
                 delroots.extend(olds - roots)
             # declare deleted root in the target phase
             if targetphase != 0:
-                self.retractboundary(repo, targetphase, delroots)
+                self.retractboundary(repo, tr, targetphase, delroots)
         repo.invalidatevolatilesets()
 
-    def retractboundary(self, repo, targetphase, nodes):
+    def retractboundary(self, repo, tr, targetphase, nodes):
         # Be careful to preserve shallow-copied values: do not update
         # phaseroots values, replace them.
 
@@ -289,7 +289,7 @@
     phcache.advanceboundary(repo, tr, targetphase, nodes)
     repo._phasecache.replace(phcache)
 
-def retractboundary(repo, targetphase, nodes):
+def retractboundary(repo, tr, targetphase, nodes):
     """Set nodes back to a phase changing other nodes phases if
     necessary.
 
@@ -298,7 +298,7 @@
 
     Simplify boundary to contains phase roots only."""
     phcache = repo._phasecache.copy()
-    phcache.retractboundary(repo, targetphase, nodes)
+    phcache.retractboundary(repo, tr, targetphase, nodes)
     repo._phasecache.replace(phcache)
 
 def listphases(repo):