This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8816

merge: introduce hasconflicts() on mergeresult object
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0c849f0166c2: merge: introduce hasconflicts() on mergeresult object
Summary

This and upcoming patches will improve the mergeresult object making it more
powerful and provide clean APIs for various things. Doing this will clean up the
core merge code which is present in update() a bit.

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:53 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/merge.py
589

This preserves the old logic, so this is a fine refactor. But I don wonder if this should be an explicit inclusion set rather than an exclusion one. The way it is now, if we add an action and forget to update this set, this code could be buggy.

This revision is now accepted and ready to land.Aug 2 2020, 12:53 PM
indygreg added inline comments.Aug 2 2020, 1:14 PM
mercurial/merge.py
587

pyflakes didn't like the shadowing of _ here. So I changed variable names in flight.

pulkit added a commit: rHG0c849f0166c2: merge: introduce hasconflicts() on mergeresult object.Aug 2 2020, 1:43 PM
Closed by commit rHG0c849f0166c2: merge: introduce hasconflicts() on mergeresult object (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (30 lines)

Diff 22199

mercurial/merge.py

@property @property
def commitinfo(self): def commitinfo(self):
return self._commitinfo return self._commitinfo
def setactions(self, actions): def setactions(self, actions):
self._actions = actions self._actions = actions
def hasconflicts(self):
""" tells whether this merge resulted in some actions which can
result in conflicts or not """
for _f, (m, _unused, _unused) in pycompat.iteritems(self._actions):
indygregUnsubmitted
Not Done

pyflakes didn't like the shadowing of _ here. So I changed variable names in flight.

indygreg: pyflakes didn't like the shadowing of `_` here. So I changed variable names in flight.
if m not in (
mergestatemod.ACTION_GET,
indygregUnsubmitted
Not Done

This preserves the old logic, so this is a fine refactor. But I don wonder if this should be an explicit inclusion set rather than an exclusion one. The way it is now, if we add an action and forget to update this set, this code could be buggy.

indygreg: This preserves the old logic, so this is a fine refactor. But I don wonder if this should be an…
mergestatemod.ACTION_KEEP,
mergestatemod.ACTION_EXEC,
mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
):
return True
return False
def manifestmerge( def manifestmerge(
repo, repo,
wctx, wctx,
p2, p2,
pa, pa,
branchmerge, branchmerge,
force, force,
followcopies, followcopies,
matcher=matcher, matcher=matcher,
mergeforce=mergeforce, mergeforce=mergeforce,
) )
actionbyfile = mresult.actions actionbyfile = mresult.actions
if updatecheck == UPDATECHECK_NO_CONFLICT: if updatecheck == UPDATECHECK_NO_CONFLICT:
for f, (m, args, msg) in pycompat.iteritems(actionbyfile): if mresult.hasconflicts():
if m not in (
mergestatemod.ACTION_GET,
mergestatemod.ACTION_KEEP,
mergestatemod.ACTION_EXEC,
mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
):
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 actionbyfile:
f = b'.hgsubstate' f = b'.hgsubstate'
m, args, msg = actionbyfile[f] m, args, msg = actionbyfile[f]
prompts = filemerge.partextras(labels) prompts = filemerge.partextras(labels)