This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12153

mergestate: use an early return for trivial merges
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd169e651066b: mergestate: use an early return for trivial merges
Summary

filemerge.filemerge() returns None if no merge was needed because
the two sides were identical. I'd like to move that to the
caller. This is a little refactoring to prepare for that.

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/mergestate.py (5 lines)

Diff 32196

mercurial/mergestate.py

fcd, fcd,
fco, fco,
fca, fca,
labels=self._labels, labels=self._labels,
) )
if merge_ret is None: if merge_ret is None:
# If return value of merge is None, then there are no real conflict # If return value of merge is None, then there are no real conflict
del self._state[dfile] del self._state[dfile]
self._results[dfile] = None, None
self._dirty = True self._dirty = True
elif not merge_ret: return None
if not merge_ret:
self.mark(dfile, MERGE_RECORD_RESOLVED) self.mark(dfile, MERGE_RECORD_RESOLVED)
action = None action = None
if deleted: if deleted:
if fcd.isabsent(): if fcd.isabsent():
# dc: local picked. Need to drop if present, which may # dc: local picked. Need to drop if present, which may
# happen on re-resolves. # happen on re-resolves.
action = ACTION_FORGET action = ACTION_FORGET