Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 48475:921853391276
filemerge: merge `premerge()` into `filemerge()`
Differential Revision: https://phab.mercurial-scm.org/D11858
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 03 Dec 2021 16:21:46 -0800 |
| parents | 6ce9ccfcac23 |
| children | 6b1049d71c3e |
line wrap: on
line diff
--- 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):