This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8817

merge: move conversion of file-key dict to action-key dict in mergeresult
ClosedPublic

Authored by pulkit on Jul 25 2020, 5:59 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf4a2b329717b: merge: move conversion of file-key dict to action-key dict in mergeresult
Summary

Initially the actions dict which we get has file has keys, but later we want a
dict which has actions as keys. This patch moves code computing that to
mergeresult class as that's where it should be anyway.

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

pulkit created this revision.Jul 25 2020, 5:59 AM
indygreg accepted this revision.Aug 2 2020, 12:56 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/merge.py
590

Nit: a more concise way of writing this is actions.setdefault(m, []).append((f, args, msg))

1824

Thank you for removing this alias.

This revision is now accepted and ready to land.Aug 2 2020, 12:56 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (35 lines)

Diff 22200

mercurial/merge.py

@property @property
def renamedelete(self): def renamedelete(self):
return self._renamedelete return self._renamedelete
@property @property
def commitinfo(self): def commitinfo(self):
return self._commitinfo return self._commitinfo
@property
def actionsdict(self):
""" returns a dictionary of actions to be perfomed with action as key
and a list of files and related arguments as values """
# Convert to dictionary-of-lists format
actions = emptyactions()
for f, (m, args, msg) in pycompat.iteritems(self._actions):
if m not in actions:
actions[m] = []
actions[m].append((f, args, msg))
indygregUnsubmitted
Not Done

Nit: a more concise way of writing this is actions.setdefault(m, []).append((f, args, msg))

indygreg: Nit: a more concise way of writing this is `actions.setdefault(m, []).append((f, args, msg))`
return actions
def setactions(self, actions): def setactions(self, actions):
self._actions = actions self._actions = actions
def hasconflicts(self): def hasconflicts(self):
""" tells whether this merge resulted in some actions which can """ tells whether this merge resulted in some actions which can
result in conflicts or not """ result in conflicts or not """
for _f, (m, _unused, _unused) in pycompat.iteritems(self._actions): for _f, (m, _unused, _unused) in pycompat.iteritems(self._actions):
if m not in ( if m not in (
branchmerge, branchmerge,
force, force,
mergeancestor, mergeancestor,
followcopies, followcopies,
matcher=matcher, matcher=matcher,
mergeforce=mergeforce, mergeforce=mergeforce,
) )
actionbyfile = mresult.actions
indygregUnsubmitted
Not Done

Thank you for removing this alias.

indygreg: Thank you for removing this alias.
if updatecheck == UPDATECHECK_NO_CONFLICT: if updatecheck == UPDATECHECK_NO_CONFLICT:
if mresult.hasconflicts(): if mresult.hasconflicts():
msg = _(b"conflicting changes") msg = _(b"conflicting changes")
hint = _(b"commit or update --clean to discard changes") hint = _(b"commit or update --clean to discard changes")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
# Prompt and create actions. Most of this is in the resolve phase # Prompt and create actions. Most of this is in the resolve phase
# already, but we can't handle .hgsubstate in filemerge or # already, but we can't handle .hgsubstate in filemerge or
# subrepoutil.submerge yet so we have to keep prompting for it. # subrepoutil.submerge yet so we have to keep prompting for it.
if b'.hgsubstate' in actionbyfile: if b'.hgsubstate' in mresult.actions:
f = b'.hgsubstate' f = b'.hgsubstate'
m, args, msg = actionbyfile[f] m, args, msg = mresult.actions[f]
prompts = filemerge.partextras(labels) prompts = filemerge.partextras(labels)
prompts[b'f'] = f prompts[b'f'] = f
if m == mergestatemod.ACTION_CHANGED_DELETED: if m == mergestatemod.ACTION_CHANGED_DELETED:
if repo.ui.promptchoice( if repo.ui.promptchoice(
_( _(
b"local%(l)s changed %(f)s which other%(o)s deleted\n" b"local%(l)s changed %(f)s which other%(o)s deleted\n"
b"use (c)hanged version or (d)elete?" b"use (c)hanged version or (d)elete?"
b"$$ &Changed $$ &Delete" b"$$ &Changed $$ &Delete"
) )
% prompts, % prompts,
0, 0,
): ):
actionbyfile[f] = ( mresult.actions[f] = (
mergestatemod.ACTION_REMOVE, mergestatemod.ACTION_REMOVE,
None, None,
b'prompt delete', b'prompt delete',
) )
elif f in p1: elif f in p1:
actionbyfile[f] = ( mresult.actions[f] = (
mergestatemod.ACTION_ADD_MODIFIED, mergestatemod.ACTION_ADD_MODIFIED,
None, None,
b'prompt keep', b'prompt keep',
) )
else: else:
actionbyfile[f] = ( mresult.actions[f] = (
mergestatemod.ACTION_ADD, mergestatemod.ACTION_ADD,
None, None,
b'prompt keep', b'prompt keep',
) )
elif m == mergestatemod.ACTION_DELETED_CHANGED: elif m == mergestatemod.ACTION_DELETED_CHANGED:
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
flags = p2[f2].flags() flags = p2[f2].flags()
if ( if (
repo.ui.promptchoice( repo.ui.promptchoice(
_( _(
b"other%(o)s changed %(f)s which local%(l)s deleted\n" b"other%(o)s changed %(f)s which local%(l)s deleted\n"
b"use (c)hanged version or leave (d)eleted?" b"use (c)hanged version or leave (d)eleted?"
b"$$ &Changed $$ &Deleted" b"$$ &Changed $$ &Deleted"
) )
% prompts, % prompts,
0, 0,
) )
== 0 == 0
): ):
actionbyfile[f] = ( mresult.actions[f] = (
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
(flags, False), (flags, False),
b'prompt recreating', b'prompt recreating',
) )
else: else:
del actionbyfile[f] del mresult.actions[f]
# Convert to dictionary-of-lists format # Convert to dictionary-of-lists format
actions = emptyactions() actions = mresult.actionsdict
for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
if m not in actions:
actions[m] = []
actions[m].append((f, args, msg))
if not util.fscasesensitive(repo.path): if not util.fscasesensitive(repo.path):
# check collision between files only in p2 for clean update # check collision between files only in p2 for clean update
if not branchmerge and ( if not branchmerge and (
force or not wc.dirty(missing=True, branch=False) force or not wc.dirty(missing=True, branch=False)
): ):
_checkcollision(repo, p2.manifest(), None) _checkcollision(repo, p2.manifest(), None)
else: else: