This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8826

merge: introduce mergeresult.updateactions() and use it
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3f5ac87ae10f: merge: introduce mergeresult.updateactions() and use it
Summary

We don't want direct editing and access of mergeresult._actions because soon we
will like to maintain data in other structures also.

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, 6:01 AM
indygreg accepted this revision.Aug 2 2020, 1:04 PM
This revision is now accepted and ready to land.Aug 2 2020, 1:04 PM
pulkit added a commit: rHG3f5ac87ae10f: merge: introduce mergeresult.updateactions() and use it.Aug 2 2020, 1:45 PM
Closed by commit rHG3f5ac87ae10f: merge: introduce mergeresult.updateactions() and use it (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)

Diff 22209

mercurial/merge.py

actions[m] = [] actions[m] = []
actions[m].append((f, args, msg)) actions[m].append((f, args, msg))
return actions return actions
def setactions(self, actions): def setactions(self, actions):
self._actions = actions self._actions = actions
def updateactions(self, updates):
self._actions.update(updates)
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 (
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
mergestatemod.ACTION_KEEP, mergestatemod.ACTION_KEEP,
mergestatemod.ACTION_EXEC, mergestatemod.ACTION_EXEC,
mresult.addfile(f, *l[0]) mresult.addfile(f, *l[0])
continue continue
repo.ui.note(_(b'end of auction\n\n')) repo.ui.note(_(b'end of auction\n\n'))
# TODO: think about commitinfo when bid merge is used # TODO: think about commitinfo when bid merge is used
mresult.updatevalues(diverge, renamedelete, {}) mresult.updatevalues(diverge, renamedelete, {})
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.updateactions(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) _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
mresult.setactions(prunedactions) mresult.setactions(prunedactions)
return mresult return mresult