This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8885

merge: use ACTION_* constants instead of values in _filternarrowactions()
ClosedPublic

Authored by pulkit on Aug 5 2020, 4:53 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe3826f1dab60: merge: use ACTION_* constants instead of values in _filternarrowactions()
Summary

It makes easier to check what noconflicttypes are and which are not included.
I hope we can have a state where we always use ACTION_* constants instead of
these values which are very hard to understand.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (14 lines)

Diff 22343

mercurial/merge.py

def _filternarrowactions(narrowmatch, branchmerge, mresult): def _filternarrowactions(narrowmatch, branchmerge, mresult):
""" """
Filters out actions that can ignored because the repo is narrowed. Filters out actions that can ignored because the repo is narrowed.
Raise an exception if the merge cannot be completed because the repo is Raise an exception if the merge cannot be completed because the repo is
narrowed. narrowed.
""" """
nooptypes = {b'k'} # TODO: handle with nonconflicttypes # TODO: handle with nonconflicttypes
nonconflicttypes = set(b'a am c cm f g gs r e'.split()) nooptypes = {mergestatemod.ACTION_KEEP}
nonconflicttypes = {
mergestatemod.ACTION_ADD,
mergestatemod.ACTION_ADD_MODIFIED,
mergestatemod.ACTION_CREATED,
mergestatemod.ACTION_CREATED_MERGE,
mergestatemod.ACTION_FORGET,
mergestatemod.ACTION_GET,
mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_EXEC,
}
# We mutate the items in the dict during iteration, so iterate # We mutate the items in the dict during iteration, so iterate
# over a copy. # over a copy.
for f, action in list(mresult.actions.items()): for f, action in list(mresult.actions.items()):
if narrowmatch(f): if narrowmatch(f):
pass pass
elif not branchmerge: elif not branchmerge:
mresult.removefile(f) # just updating, ignore changes outside clone mresult.removefile(f) # just updating, ignore changes outside clone
elif action[0] in nooptypes: elif action[0] in nooptypes: