D11170: amend: use `update_file` instead of `normallookup`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Mon Jul 19 14:10:47 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/D11170
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
@@ -2984,7 +2984,9 @@
# would mark them as clean but with uncommitted contents.
normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
for f in normalfiles:
- dirstate.normallookup(f)
+ dirstate.update_file(
+ f, p1_tracked=True, wc_tracked=True, possibly_dirty=True
+ )
# Update the state of files which were removed in the amend
# to "removed" in the dirstate.
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list