From patchwork Mon Jul 19 15:45:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D11193: mq: replace `drop` call with newer API From: phabricator X-Patchwork-Id: 49513 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Mon, 19 Jul 2021 15:45:30 +0000 marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11193 AFFECTED FILES hgext/mq.py CHANGE DETAILS To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -1842,7 +1842,9 @@ with repo.dirstate.parentchange(): for f in a: repo.wvfs.unlinkpath(f, ignoremissing=True) - repo.dirstate.drop(f) + repo.dirstate.update_file( + f, p1_tracked=False, wc_tracked=False + ) for f in m + r: fctx = ctx[f] repo.wwrite(f, fctx.data(), fctx.flags()) @@ -2044,7 +2046,7 @@ for f in mm: repo.dirstate.update_file_p1(f, p1_tracked=True) for f in forget: - repo.dirstate.drop(f) + repo.dirstate.update_file_p1(f, p1_tracked=False) user = ph.user or ctx.user()