comparison hgext/largefiles/overrides.py @ 47698:9fa1085fbd63

largefile: use `update_file` instead of `remove` in `mergerecordupdates`

This is the newer, more semantic API.

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

47697:c9e412712e0c

            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)

47698:9fa1085fbd63

            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.update_file(
                    lfile, p1_tracked=True, wc_tracked=False
                )
                # make sure lfile doesn't get synclfdirstate'd as normal
                lfdirstate.add(lfile)
        lfdirstate.write()

    return orig(repo, actions, branchmerge, getfiledata)