This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8696

phases: updatephases should not skip internal phase
ClosedPublic

Authored by joerg.sonnenberger on Jul 7 2020, 6:38 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG361a7444bc41: phases: updatephases should not skip internal phase
Summary

Historically, updatephases used to skip the secret phase, but wasn't
updated when archived and internal were added.

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

joerg.sonnenberger added a commit: rHG361a7444bc41: phases: updatephases should not skip internal phase.Jul 15 2020, 12:14 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG361a7444bc41: phases: updatephases should not skip internal phase (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21917

mercurial/phases.py

for phase in allphases[:secret]: for phase in allphases[:secret]:
revset = b"heads(%%ln & %s())" % phasenames[phase] revset = b"heads(%%ln & %s())" % phasenames[phase]
headsbyphase[phase] = [cl.node(r) for r in repo.revs(revset, subset)] headsbyphase[phase] = [cl.node(r) for r in repo.revs(revset, subset)]
return headsbyphase return headsbyphase
def updatephases(repo, trgetter, headsbyphase): def updatephases(repo, trgetter, headsbyphase):
"""Updates the repo with the given phase heads""" """Updates the repo with the given phase heads"""
# Now advance phase boundaries of all but secret phase # Now advance phase boundaries of all phases
# #
# run the update (and fetch transaction) only if there are actually things # run the update (and fetch transaction) only if there are actually things
# to update. This avoid creating empty transaction during no-op operation. # to update. This avoid creating empty transaction during no-op operation.
for phase in allphases[:-1]: for phase in allphases:
revset = b'%ln - _phase(%s)' revset = b'%ln - _phase(%s)'
heads = [c.node() for c in repo.set(revset, headsbyphase[phase], phase)] heads = [c.node() for c in repo.set(revset, headsbyphase[phase], phase)]
if heads: if heads:
advanceboundary(repo, trgetter(), phase, heads) advanceboundary(repo, trgetter(), phase, heads)
def analyzeremotephases(repo, subset, roots): def analyzeremotephases(repo, subset, roots):
"""Compute phases heads and root in a subset of node from root dict """Compute phases heads and root in a subset of node from root dict