filemerge: merge `premerge()` into `filemerge()`
Differential Revision: https://phab.mercurial-scm.org/D11858
--- a/mercurial/filemerge.py Fri Dec 03 15:43:54 2021 -0800
+++ b/mercurial/filemerge.py Fri Dec 03 16:21:46 2021 -0800
@@ -1277,16 +1277,15 @@
return repo.wjoin(ctx.path())
-def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
- return _filemerge(
+def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
+ complete, merge_ret, deleted = _filemerge(
True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
)
-
-
-def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
- return _filemerge(
- False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
- )
+ if not complete:
+ complete, merge_ret, deleted = _filemerge(
+ False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
+ )
+ return complete, merge_ret, deleted
def loadinternalmerge(ui, extname, registrarobj):
--- a/mercurial/mergestate.py Fri Dec 03 15:43:54 2021 -0800
+++ b/mercurial/mergestate.py Fri Dec 03 16:21:46 2021 -0800
@@ -354,7 +354,7 @@
self._restore_backup(wctx[dfile], localkey, flags)
else:
wctx[dfile].remove(ignoremissing=True)
- complete, merge_ret, deleted = filemerge.premerge(
+ complete, merge_ret, deleted = filemerge.filemerge(
self._repo,
wctx,
self._local,
@@ -364,17 +364,6 @@
fca,
labels=self._labels,
)
- if not complete:
- complete, merge_ret, deleted = filemerge.filemerge(
- self._repo,
- wctx,
- self._local,
- lfile,
- fcd,
- fco,
- fca,
- labels=self._labels,
- )
if merge_ret is None:
# If return value of merge is None, then there are no real conflict
del self._state[dfile]