From patchwork Mon Jul 19 10:42:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D11140: largefile: use `update_file` instead of `remove` in `mergerecordupdates` From: phabricator X-Patchwork-Id: 49454 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Mon, 19 Jul 2021 10:42:55 +0000 marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is the newer, more semantic API. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11140 AFFECTED FILES hgext/largefiles/overrides.py CHANGE DETAILS To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -654,7 +654,9 @@ ]: # this should be executed before 'orig', to execute 'remove' # before all other actions - repo.dirstate.remove(lfile) + 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()