D11188: amend: use `update_file` instead of `drop`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Mon Jul 19 15:44:44 UTC 2021
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/D11188
AFFECTED FILES
mercurial/cmdutil.py
CHANGE DETAILS
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3004,7 +3004,7 @@
# to "removed" in the dirstate.
removedfiles = set(wctx.removed()) & filestoamend
for f in removedfiles:
- dirstate.drop(f)
+ dirstate.update_file(f, p1_tracked=False, wc_tracked=False)
mapping = {old.node(): (newid,)}
obsmetadata = None
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list