diff -r d017f1d37378 -r e44d54260c32 mercurial/phases.py --- a/mercurial/phases.py Mon Jul 10 22:18:41 2017 +0200 +++ b/mercurial/phases.py Tue Jul 11 02:39:52 2017 +0200 @@ -154,6 +154,18 @@ dirty = True return roots, dirty +def _trackphasechange(data, rev, old, new): + """add a phase move the dictionnary + + If data is None, nothing happens. + """ + if data is None: + return + existing = data.get(rev) + if existing is not None: + old = existing[0] + data[rev] = (old, new) + class phasecache(object): def __init__(self, repo, phasedefaults, _load=True): if _load: @@ -289,8 +301,13 @@ """ # Be careful to preserve shallow-copied values: do not update # phaseroots values, replace them. + if tr is None: + phasetracking = None + else: + phasetracking = tr.changes.get('phases') repo = repo.unfiltered() + delroots = [] # set of root deleted by this path for phase in xrange(targetphase + 1, len(allphases)): # filter nodes that are not in a compatible phase already @@ -300,7 +317,11 @@ break # no roots to move anymore olds = self.phaseroots[phase] + affected = repo.revs('%ln::%ln', olds, nodes) + for r in affected: + _trackphasechange(phasetracking, r, self.phase(repo, r), + targetphase) roots = set(ctx.node() for ctx in repo.set( 'roots((%ln::) - %ld)', olds, affected))