comparison hgext/largefiles/overrides.py @ 48432:f45a4a47f6a8

filemerge: inline `_filemerge()` into `filemerge()`

The caller is now trivial, so the indirection is pointless.

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

48431:6b1049d71c3e

    return orig(repo, actions, branchmerge, getfiledata)


# Override filemerge to prompt the user about how they wish to merge
# largefiles. This will handle identical edits without prompting the user.
@eh.wrapfunction(filemerge, b'_filemerge')
def overridefilemerge(
    origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
):
    if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent():
        return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)

48432:f45a4a47f6a8

    return orig(repo, actions, branchmerge, getfiledata)


# Override filemerge to prompt the user about how they wish to merge
# largefiles. This will handle identical edits without prompting the user.
@eh.wrapfunction(filemerge, b'filemerge')
def overridefilemerge(
    origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
):
    if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent():
        return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)