( )⚙ D8823 merge: pass mergeresult obj instead of actions in _filternarrowactions()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8823

merge: pass mergeresult obj instead of actions in _filternarrowactions()
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:00 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe7196f1da2b1: merge: pass mergeresult obj instead of actions in _filternarrowactions()
Summary

We want to use rich mergeresult object and it's APIs instead of handling a
dictionary.

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 (10 lines)

Diff 22206

mercurial/merge.py

break break
if invalidconflicts: if invalidconflicts:
for p in invalidconflicts: for p in invalidconflicts:
repo.ui.warn(_(b"%s: is both a file and a directory\n") % p) repo.ui.warn(_(b"%s: is both a file and a directory\n") % p)
raise error.Abort(_(b"destination manifest contains path conflicts")) raise error.Abort(_(b"destination manifest contains path conflicts"))
def _filternarrowactions(narrowmatch, branchmerge, actions): 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 nooptypes = {b'k'} # TODO: handle with nonconflicttypes
nonconflicttypes = set(b'a am c cm f g gs r e'.split()) nonconflicttypes = set(b'a am c cm f g gs r e'.split())
# 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(actions.items()): for f, action in list(mresult.actions.items()):
if narrowmatch(f): if narrowmatch(f):
pass pass
elif not branchmerge: elif not branchmerge:
del actions[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:
del actions[f] # merge does not affect file mresult.removefile(f) # merge does not affect file
elif action[0] in nonconflicttypes: elif action[0] in nonconflicttypes:
raise error.Abort( raise error.Abort(
_( _(
b'merge affects file \'%s\' outside narrow, ' b'merge affects file \'%s\' outside narrow, '
b'which is not yet supported' b'which is not yet supported'
) )
% f, % f,
hint=_(b'merging in the other direction may work'), hint=_(b'merging in the other direction may work'),
if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'):
# If we are merging, look for path conflicts. # If we are merging, look for path conflicts.
checkpathconflicts(repo, wctx, p2, mresult) checkpathconflicts(repo, wctx, p2, mresult)
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
if not narrowmatch.always(): if not narrowmatch.always():
# Updates "actions" in place # Updates "actions" in place
_filternarrowactions(narrowmatch, branchmerge, mresult.actions) _filternarrowactions(narrowmatch, branchmerge, mresult)
renamedelete = branch_copies1.renamedelete renamedelete = branch_copies1.renamedelete
renamedelete.update(branch_copies2.renamedelete) renamedelete.update(branch_copies2.renamedelete)
mresult.updatevalues(diverge, renamedelete, commitinfo) mresult.updatevalues(diverge, renamedelete, commitinfo)
return mresult return mresult