comparison hgext/largefiles/overrides.py @ 47649:4b17971f0181

largefile: use parentchange during mergerecordupdates

This match what core is doing around recordupdates.

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

47648:093b1df410c9

@eh.wrapfunction(mergestatemod, b'recordupdates')
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
    if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:
        lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
        for lfile, args, msg in actions[MERGE_ACTION_LARGEFILE_MARK_REMOVED]:
            # this should be executed before 'orig', to execute 'remove'
            # before all other actions
            repo.dirstate.remove(lfile)
            # make sure lfile doesn't get synclfdirstate'd as normal
            lfdirstate.add(lfile)
        lfdirstate.write()

    return orig(repo, actions, branchmerge, getfiledata)

47649:4b17971f0181

@eh.wrapfunction(mergestatemod, b'recordupdates')
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
    if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:
        lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
        with lfdirstate.parentchange():
            for lfile, args, msg in actions[
                MERGE_ACTION_LARGEFILE_MARK_REMOVED
            ]:
                # this should be executed before 'orig', to execute 'remove'
                # before all other actions
                repo.dirstate.remove(lfile)
                # make sure lfile doesn't get synclfdirstate'd as normal
                lfdirstate.add(lfile)
        lfdirstate.write()

    return orig(repo, actions, branchmerge, getfiledata)