Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/overrides.py @ 48476:6b1049d71c3e
filemerge: make `_filemerge()` do both premerge and merge
This patch removes the `premerge` argument from `_filemerge()` and
makes it do both the "premerge" and "merge" steps without the caller
having to call it twice.
Differential Revision: https://phab.mercurial-scm.org/D11859
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 03 Dec 2021 21:41:43 -0800 |
| parents | 322525db4c98 |
| children | f45a4a47f6a8 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Fri Dec 03 16:21:46 2021 -0800 +++ b/hgext/largefiles/overrides.py Fri Dec 03 21:41:43 2021 -0800 @@ -668,12 +668,10 @@ # largefiles. This will handle identical edits without prompting the user. @eh.wrapfunction(filemerge, b'_filemerge') def overridefilemerge( - origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None + origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None ): if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): - return origfn( - premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels - ) + return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels) ahash = lfutil.readasstandin(fca).lower() dhash = lfutil.readasstandin(fcd).lower()