This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3824

cleanupnodes: preserve phase of parents of new nodes
ClosedPublic

Authored by martinvonz on Jun 21 2018, 11:56 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG05b7dd11918e: cleanupnodes: preserve phase of parents of new nodes
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 21 2018, 11:56 AM
Closed by commit rHG05b7dd11918e: cleanupnodes: preserve phase of parents of new nodes (authored by martinvonz). · Explain WhyJun 22 2018, 7:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (4 lines)

Diff 9255

mercurial/scmutil.py

precursors.setdefault(newnode, []).append(oldnode) precursors.setdefault(newnode, []).append(oldnode)
allnewnodes.sort(key=lambda n: unfi[n].rev()) allnewnodes.sort(key=lambda n: unfi[n].rev())
newphases = {} newphases = {}
def phase(ctx): def phase(ctx):
return newphases.get(ctx.node(), ctx.phase()) return newphases.get(ctx.node(), ctx.phase())
for newnode in allnewnodes: for newnode in allnewnodes:
ctx = unfi[newnode] ctx = unfi[newnode]
parentphase = max(phase(p) for p in ctx.parents())
if targetphase is None: if targetphase is None:
oldphase = max(unfi[oldnode].phase() oldphase = max(unfi[oldnode].phase()
for oldnode in precursors[newnode]) for oldnode in precursors[newnode])
parentphase = max(phase(p) for p in ctx.parents())
newphase = max(oldphase, parentphase) newphase = max(oldphase, parentphase)
else: else:
newphase = targetphase newphase = max(targetphase, parentphase)
newphases[newnode] = newphase newphases[newnode] = newphase
if newphase > ctx.phase(): if newphase > ctx.phase():
toretract.setdefault(newphase, []).append(newnode) toretract.setdefault(newphase, []).append(newnode)
elif newphase < ctx.phase(): elif newphase < ctx.phase():
toadvance.setdefault(newphase, []).append(newnode) toadvance.setdefault(newphase, []).append(newnode)
with repo.transaction('cleanup') as tr: with repo.transaction('cleanup') as tr:
# Move bookmarks # Move bookmarks