This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8824

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

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG00e9c5edcd58: merge: pass mergeresult obj instead of actions dict in _resolvetrivial()

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

Diff 22207

mercurial/merge.py

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
def _resolvetrivial(repo, wctx, mctx, ancestor, actions): def _resolvetrivial(repo, wctx, mctx, ancestor, mresult):
"""Resolves false conflicts where the nodeid changed but the content """Resolves false conflicts where the nodeid changed but the content
remained the same.""" remained the same."""
# We force a copy of actions.items() because we're going to mutate # We force a copy of actions.items() because we're going to mutate
# actions as we resolve trivial conflicts. # actions as we resolve trivial conflicts.
for f, (m, args, msg) in list(actions.items()): for f, (m, args, msg) in list(mresult.actions.items()):
if ( if (
m == mergestatemod.ACTION_CHANGED_DELETED m == mergestatemod.ACTION_CHANGED_DELETED
and f in ancestor and f in ancestor
and not wctx[f].cmp(ancestor[f]) and not wctx[f].cmp(ancestor[f])
): ):
# local did change but ended up with same content # local did change but ended up with same content
actions[f] = mergestatemod.ACTION_REMOVE, None, b'prompt same' mresult.addfile(
f, mergestatemod.ACTION_REMOVE, None, b'prompt same'
)
elif ( elif (
m == mergestatemod.ACTION_DELETED_CHANGED m == mergestatemod.ACTION_DELETED_CHANGED
and f in ancestor and f in ancestor
and not mctx[f].cmp(ancestor[f]) and not mctx[f].cmp(ancestor[f])
): ):
# remote did change but ended up with same content # remote did change but ended up with same content
del actions[f] # don't get = keep local deleted mresult.removefile(f) # don't get = keep local deleted
def calculateupdates( def calculateupdates(
repo, repo,
wctx, wctx,
mctx, mctx,
ancestors, ancestors,
branchmerge, branchmerge,
if wctx.rev() is None: if wctx.rev() is None:
fractions = _forgetremoved(wctx, mctx, branchmerge) fractions = _forgetremoved(wctx, mctx, branchmerge)
mresult.actions.update(fractions) mresult.actions.update(fractions)
prunedactions = sparse.filterupdatesactions( prunedactions = sparse.filterupdatesactions(
repo, wctx, mctx, branchmerge, mresult.actions repo, wctx, mctx, branchmerge, mresult.actions
) )
_resolvetrivial(repo, wctx, mctx, ancestors[0], mresult.actions) _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
mresult.setactions(prunedactions) mresult.setactions(prunedactions)
return mresult return mresult
def _getcwd(): def _getcwd():
try: try:
return encoding.getcwd() return encoding.getcwd()