This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5391

cleanupnodes: trust caller when "moves" is not None
ClosedPublic

Authored by martinvonz on Dec 6 2018, 12:12 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb7823bd59b07: cleanupnodes: trust caller when "moves" is not None
Summary

If "moves" (indicating how to move bookmarks) is None, we fill it out
based on "replacements" (indicating which obsmarkers to add). If
"moves" is not None, we would still add items based on
"replacements". This makes it impossible to pass "moves={}" and not
move bookmarks, which surprised me. The only caller that currently
passes a value for "moves" was the rebase extension and there we were
already adding bookmark moves corresponding to obsmarker additions, so
it should not be impacted.

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.Dec 6 2018, 12:12 AM
Closed by commit rHGb7823bd59b07: cleanupnodes: trust caller when "moves" is not None (authored by martinvonz). · Explain WhyDec 6 2018, 7:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (45 lines)

Diff 12751

mercurial/scmutil.py

# upgrading non tuple "source" to tuple ones for BC # upgrading non tuple "source" to tuple ones for BC
repls = {} repls = {}
for key, value in replacements.items(): for key, value in replacements.items():
if not isinstance(key, tuple): if not isinstance(key, tuple):
key = (key,) key = (key,)
repls[key] = value repls[key] = value
replacements = repls replacements = repls
# Unfiltered repo is needed since nodes in replacements might be hidden.
unfi = repo.unfiltered()
# Calculate bookmark movements # Calculate bookmark movements
if moves is None: if moves is None:
moves = {} moves = {}
# Unfiltered repo is needed since nodes in replacements might be hidden.
unfi = repo.unfiltered()
for oldnodes, newnodes in replacements.items(): for oldnodes, newnodes in replacements.items():
for oldnode in oldnodes: for oldnode in oldnodes:
if oldnode in moves: if oldnode in moves:
continue continue
if len(newnodes) > 1: if len(newnodes) > 1:
# usually a split, take the one with biggest rev number # usually a split, take the one with biggest rev number
newnode = next(unfi.set('max(%ln)', newnodes)).node() newnode = next(unfi.set('max(%ln)', newnodes)).node()
elif len(newnodes) == 0: elif len(newnodes) == 0:
# move bookmark backwards # move bookmark backwards
allreplaced = [] allreplaced = []
for rep in replacements: for rep in replacements:
allreplaced.extend(rep) allreplaced.extend(rep)
roots = list(unfi.set('max((::%n) - %ln)', oldnode, roots = list(unfi.set('max((::%n) - %ln)', oldnode,
allreplaced)) allreplaced))
if roots: if roots:
newnode = roots[0].node() newnode = roots[0].node()
else: else:
newnode = nullid newnode = nullid
else: else:
newnode = newnodes[0] newnode = newnodes[0]
moves[oldnode] = newnode moves[oldnode] = newnode
allnewnodes = [n for ns in replacements.values() for n in ns] allnewnodes = [n for ns in replacements.values() for n in ns]
toretract = {} toretract = {}
toadvance = {} toadvance = {}
if fixphase: if fixphase:
precursors = {} precursors = {}
for oldnodes, newnodes in replacements.items(): for oldnodes, newnodes in replacements.items():
for oldnode in oldnodes: for oldnode in oldnodes: