comparison hgext/largefiles/overrides.py @ 34137:c0ce60459d84

merge: pass wctx to premerge, filemerge

In the in-memory merge branch. we'll need to call a function (``flushall``) on
the wctx inside of _xmerge.

This prepares the way so it can be done without hacks like ``fcd.ctx()``.

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

34136:ae95853c250a

    return orig(repo, actions, branchmerge)

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

    ahash = lfutil.readasstandin(fca).lower()
    dhash = lfutil.readasstandin(fcd).lower()
    ohash = lfutil.readasstandin(fco).lower()

34137:c0ce60459d84

    return orig(repo, actions, branchmerge)

# Override filemerge to prompt the user about how they wish to merge
# largefiles. This will handle identical edits without prompting the user.
def overridefilemerge(origfn, premerge, 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)

    ahash = lfutil.readasstandin(fca).lower()
    dhash = lfutil.readasstandin(fcd).lower()
    ohash = lfutil.readasstandin(fco).lower()