comparison mercurial/scmutil.py @ 38432:05b7dd11918e

cleanupnodes: preserve phase of parents of new nodes

As Yuya noted in the review of D3818, passing in
targetphase=phases.draft would result in advancing the phase boundary
of a secret-phase parent. We never pass targetphase=phases.draft so
far, but it's a bug waiting to happen.

I tried to refactor it so max(parentphase, X) happened in one place,
but I couldn't come up with good variables names and I ended up with a
"newphase = max(newphase, parentphase)" line, which made the whole
block not look any better to me.

Differential Revision: https://phab.mercurial-scm.org/D3824

38431:d6686f864a70

        newphases = {}
        def phase(ctx):
            return newphases.get(ctx.node(), ctx.phase())
        for newnode in allnewnodes:
            ctx = unfi[newnode]
            if targetphase is None:
                oldphase = max(unfi[oldnode].phase()
                               for oldnode in precursors[newnode])
                parentphase = max(phase(p) for p in ctx.parents())
                newphase = max(oldphase, parentphase)
            else:
                newphase = targetphase
            newphases[newnode] = newphase
            if newphase > ctx.phase():
                toretract.setdefault(newphase, []).append(newnode)
            elif newphase < ctx.phase():
                toadvance.setdefault(newphase, []).append(newnode)

38432:05b7dd11918e

        newphases = {}
        def phase(ctx):
            return newphases.get(ctx.node(), ctx.phase())
        for newnode in allnewnodes:
            ctx = unfi[newnode]
            parentphase = max(phase(p) for p in ctx.parents())
            if targetphase is None:
                oldphase = max(unfi[oldnode].phase()
                               for oldnode in precursors[newnode])
                newphase = max(oldphase, parentphase)
            else:
                newphase = max(targetphase, parentphase)
            newphases[newnode] = newphase
            if newphase > ctx.phase():
                toretract.setdefault(newphase, []).append(newnode)
            elif newphase < ctx.phase():
                toadvance.setdefault(newphase, []).append(newnode)