[Updated] D11170: amend: use `update_file` instead of `normallookup`

[marmoute (Pierre-Yves David)]

Closed by commit rHG4d1ae9cba551: amend: use `update_file` instead of `normallookup` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11170?vs=29515&id=29671

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11170/new/

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, Alphare, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210720/1bb0439e/attachment-0002.html>