mergestate: use an early return for trivial merges
`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.
Differential Revision: https://phab.mercurial-scm.org/D12153
--- a/mercurial/mergestate.py Mon Feb 07 14:07:04 2022 -0800
+++ b/mercurial/mergestate.py Mon Feb 07 20:12:09 2022 -0800
@@ -434,8 +434,11 @@
if merge_ret is None:
# If return value of merge is None, then there are no real conflict
del self._state[dfile]
+ self._results[dfile] = None, None
self._dirty = True
- elif not merge_ret:
+ return None
+
+ if not merge_ret:
self.mark(dfile, MERGE_RECORD_RESOLVED)
action = None