comparison hgext/largefiles/overrides.py @ 45297:ab57793dec5b

largefiles: override merge.emptyactions() to include `lfmr`

I found it weird that we were not already doing this. I encountered this while
using `emptyactions()` in mergeresult() class.

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

45296:cb0cd87e16b4

            dirstate = lfutil.openlfdirstate(ui, repo)

        orig(ui, fakerepo, *pats, **opts)
    else:
        orig(ui, repo, *pats, **opts)


# Before starting the manifest merge, merge.updates will call
# _checkunknownfile to check if there are any files in the merged-in
# changeset that collide with unknown files in the working copy.

45297:ab57793dec5b

            dirstate = lfutil.openlfdirstate(ui, repo)

        orig(ui, fakerepo, *pats, **opts)
    else:
        orig(ui, repo, *pats, **opts)


# Register the `lfmr` merge action in emptyactions() return type
@eh.wrapfunction(merge, b'emptyactions')
def overrideemptyactions(origfn):
    ret = origfn()
    ret[b'lfmr'] = []
    return ret


# Before starting the manifest merge, merge.updates will call
# _checkunknownfile to check if there are any files in the merged-in
# changeset that collide with unknown files in the working copy.