comparison hgext/largefiles/overrides.py @ 27050:df9b73d2d444

largefiles: fall back to the original for change/delete conflicts

The largefiles merge code (currently) does not handle change/delete conflicts.
So fall back to regular filemerge in that case.

Making this code handle change/delete conflicts is left as an exercise for the
future.

27049:0d61f7ec7f76

# 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):
        return origfn(premerge, repo, mynode, orig, fcd, fco, fca,
                      labels=labels)

    ahash = fca.data().strip().lower()
    dhash = fcd.data().strip().lower()

27050:df9b73d2d444

# 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 = fca.data().strip().lower()
    dhash = fcd.data().strip().lower()