filemerge: merge `premerge()` into `filemerge()`

Differential Revision: https://phab.mercurial-scm.org/D11858

mercurial/filemerge.py

@@ -1277,16 +1277,15 def _workingpath(repo, ctx):
     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(
+    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):

mercurial/mergestate.py

@@ -354,17 +354,6 class _mergestate_base(object):
             self._restore_backup(wctx[dfile], localkey, flags)
         else:
             wctx[dfile].remove(ignoremissing=True)
-        complete, merge_ret, deleted = filemerge.premerge(
-            self._repo,
-            wctx,
-            self._local,
-            lfile,
-            fcd,
-            fco,
-            fca,
-            labels=self._labels,
-        )
-        if not complete:
             complete, merge_ret, deleted = filemerge.filemerge(
                 self._repo,
                 wctx,