Mercurial > public > mercurial-scm > hg-stable

diff mercurial/changegroup.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 e2806b8613ca
line wrap: on
line diff
--- a/mercurial/changegroup.py	Wed Aug 06 01:54:19 2014 -0700
+++ b/mercurial/changegroup.py	Tue Aug 05 23:52:21 2014 -0700
@@ -706,12 +706,12 @@
                 # phases are going to be pushed alongside. Therefor
                 # `targetphase` is ignored.
                 phases.advanceboundary(repo, tr, phases.draft, srccontent)
-                phases.retractboundary(repo, phases.draft, added)
+                phases.retractboundary(repo, tr, phases.draft, added)
         elif srctype != 'strip':
             # publishing only alter behavior during push
             #
             # strip should not touch boundary at all
-            phases.retractboundary(repo, targetphase, added)
+            phases.retractboundary(repo, tr, targetphase, added)
 
         # make changelog see real files again
         cl.finalize(trp)