Patchwork [1,of,4] changegroup: stop treating strip as special when dealing with phases

login
register
mail settings
Submitter Boris Feld
Date July 12, 2017, 3:39 p.m.
Message ID <e46f9cabad79aa5429c2.1499873943@FB>
Download mbox | patch
Permalink /patch/22263/
State Accepted
Headers show

Comments

Boris Feld - July 12, 2017, 3:39 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1499741576 -7200
#      Tue Jul 11 04:52:56 2017 +0200
# Node ID e46f9cabad79aa5429c2e8d80d5c60e42e42abb1
# Parent  4672db164c986da4442bd864cd044512d975c3f2
# EXP-Topic tr.changes.phases
changegroup: stop treating strip as special when dealing with phases

Since 8e3021fd1a44, the strip bundle includes the phases of the stripping
node. Hence we don't need this special case anymore.

Dropping it will helps make the phase behavior more consistent across all
exchanges medium.

Patch

diff -r 4672db164c98 -r e46f9cabad79 mercurial/changegroup.py
--- a/mercurial/changegroup.py	Sat Jun 24 15:29:42 2017 -0700
+++ b/mercurial/changegroup.py	Tue Jul 11 04:52:56 2017 +0200
@@ -372,10 +372,7 @@ 
                     # ignored.
                     phases.advanceboundary(repo, tr, phases.draft, cgnodes)
                     phases.retractboundary(repo, tr, phases.draft, added)
-            elif srctype != 'strip':
-                # publishing only alter behavior during push
-                #
-                # strip should not touch boundary at all
+            else:
                 phases.retractboundary(repo, tr, targetphase, added)
 
             if changesets > 0: