Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: use `update_file` instead of `normallookup`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 19 Jul 2021 01:18:23 +0200
changeset 47728 4d1ae9cba551
parent 47727 0e581d7e89b7
child 47729 b66ae4468c9a
amend: use `update_file` instead of `normallookup` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11170
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Mon Jul 19 05:45:22 2021 +0200
+++ b/mercurial/cmdutil.py	Mon Jul 19 01:18:23 2021 +0200
@@ -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.
mercurial