comparison hgext/largefiles/overrides.py @ 44856:b7808443ed6a

mergestate: split out merge state handling code from main merge module

There's already some pretty reasonable encapsulation here, but I want
to make the mergestate storage a property of the context so memctx
instances can do a reasonable thing. This is the first step in a
reshuffle to make that easier.

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

44855:1d2d353e5c4a

    filemerge,
    hg,
    logcmdutil,
    match as matchmod,
    merge,
    pathutil,
    pycompat,
    scmutil,
    smartset,
    subrepo,

                actions[standin] = (b'r', None, b'replaced by non-standin')

    return actions, diverge, renamedelete


@eh.wrapfunction(merge, b'recordupdates')
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
    if b'lfmr' in actions:
        lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
        for lfile, args, msg in actions[b'lfmr']:
            # this should be executed before 'orig', to execute 'remove'

44856:b7808443ed6a

    filemerge,
    hg,
    logcmdutil,
    match as matchmod,
    merge,
    mergestate as mergestatemod,
    pathutil,
    pycompat,
    scmutil,
    smartset,
    subrepo,

                actions[standin] = (b'r', None, b'replaced by non-standin')

    return actions, diverge, renamedelete


@eh.wrapfunction(mergestatemod, b'recordupdates')
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
    if b'lfmr' in actions:
        lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
        for lfile, args, msg in actions[b'lfmr']:
            # this should be executed before 'orig', to execute 'remove'