This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6245

merge: remove workaround for issue5020
ClosedPublic

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbeec7fc6adec: merge: remove workaround for issue5020
Summary

As I explained in the previous commit, I think the filtering added
there is a better fix for the issue, so the workaround from
41f6af50c0d8 (merge: fix crash on criss cross merge with dir move and
delete (issue5020), 2017-01-31) should no longer be needed.

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.Apr 16 2019, 1:16 PM
Closed by commit rHGbeec7fc6adec: merge: remove workaround for issue5020 (authored by martinvonz). · Explain WhyApr 17 2019, 7:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (14 lines)

Diff 14828

mercurial/merge.py

else: else:
d[m] = [a] d[m] = [a]
else: else:
fbids[f] = {m: [a]} fbids[f] = {m: [a]}
# Pick the best bid for each file # Pick the best bid for each file
repo.ui.note(_('\nauction for merging merge bids\n')) repo.ui.note(_('\nauction for merging merge bids\n'))
actions = {} actions = {}
dms = [] # filenames that have dm actions
for f, bids in sorted(fbids.items()): for f, bids in sorted(fbids.items()):
# bids is a mapping from action method to list af actions # bids is a mapping from action method to list af actions
# Consensus? # Consensus?
if len(bids) == 1: # all bids are the same kind of method if len(bids) == 1: # all bids are the same kind of method
m, l = list(bids.items())[0] m, l = list(bids.items())[0]
if all(a == l[0] for a in l[1:]): # len(bids) is > 1 if all(a == l[0] for a in l[1:]): # len(bids) is > 1
repo.ui.note(_(" %s: consensus for %s\n") % (f, m)) repo.ui.note(_(" %s: consensus for %s\n") % (f, m))
actions[f] = l[0] actions[f] = l[0]
if m == ACTION_DIR_RENAME_MOVE_LOCAL:
dms.append(f)
continue continue
# If keep is an option, just do it. # If keep is an option, just do it.
if ACTION_KEEP in bids: if ACTION_KEEP in bids:
repo.ui.note(_(" %s: picking 'keep' action\n") % f) repo.ui.note(_(" %s: picking 'keep' action\n") % f)
actions[f] = bids[ACTION_KEEP][0] actions[f] = bids[ACTION_KEEP][0]
continue continue
# If there are gets and they all agree [how could they not?], do it. # If there are gets and they all agree [how could they not?], do it.
if ACTION_GET in bids: if ACTION_GET in bids:
ga0 = bids[ACTION_GET][0] ga0 = bids[ACTION_GET][0]
if all(a == ga0 for a in bids[ACTION_GET][1:]): if all(a == ga0 for a in bids[ACTION_GET][1:]):
repo.ui.note(_(" %s: picking 'get' action\n") % f) repo.ui.note(_(" %s: picking 'get' action\n") % f)
actions[f] = ga0 actions[f] = ga0
continue continue
# TODO: Consider other simple actions such as mode changes # TODO: Consider other simple actions such as mode changes
# Handle inefficient democrazy. # Handle inefficient democrazy.
repo.ui.note(_(' %s: multiple bids for merge action:\n') % f) repo.ui.note(_(' %s: multiple bids for merge action:\n') % f)
for m, l in sorted(bids.items()): for m, l in sorted(bids.items()):
for _f, args, msg in l: for _f, args, msg in l:
repo.ui.note(' %s -> %s\n' % (msg, m)) repo.ui.note(' %s -> %s\n' % (msg, m))
# Pick random action. TODO: Instead, prompt user when resolving # Pick random action. TODO: Instead, prompt user when resolving
m, l = list(bids.items())[0] m, l = list(bids.items())[0]
repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') % repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') %
(f, m)) (f, m))
actions[f] = l[0] actions[f] = l[0]
if m == ACTION_DIR_RENAME_MOVE_LOCAL:
dms.append(f)
continue continue
# Work around 'dm' that can cause multiple actions for the same file
for f in dms:
dm, (f0, flags), msg = actions[f]
assert dm == ACTION_DIR_RENAME_MOVE_LOCAL, dm
if f0 in actions and actions[f0][0] == ACTION_REMOVE:
# We have one bid for removing a file and another for moving it.
# These two could be merged as first move and then delete ...
# but instead drop moving and just delete.
del actions[f]
repo.ui.note(_('end of auction\n\n')) repo.ui.note(_('end of auction\n\n'))
if wctx.rev() is None: if wctx.rev() is None:
fractions = _forgetremoved(wctx, mctx, branchmerge) fractions = _forgetremoved(wctx, mctx, branchmerge)
actions.update(fractions) actions.update(fractions)
prunedactions = sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, prunedactions = sparse.filterupdatesactions(repo, wctx, mctx, branchmerge,
actions) actions)