Mercurial Mercurial > hg-stable / 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.
revert: use `set_possibly_dirty` instead of `normallookup`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 19 Jul 2021 03:52:54 +0200
changeset 47732 dc610e325302
parent 47731 485ae37a7ec5
child 47733 4b7eb01db10b
revert: use `set_possibly_dirty` instead of `normallookup` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11174
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Mon Jul 19 14:02:58 2021 +0200
+++ b/mercurial/cmdutil.py	Mon Jul 19 03:52:54 2021 +0200
@@ -3610,7 +3610,7 @@
         # to report the file as clean. We have to use normallookup for
         # merges to avoid losing information about merged/dirty files.
         if p2 != repo.nullid:
-            normal = repo.dirstate.normallookup
+            normal = repo.dirstate.set_tracked
         else:
             normal = repo.dirstate.set_clean
 
@@ -3703,7 +3703,7 @@
             checkout(f)
             repo.dirstate.set_tracked(f)
 
-    normal = repo.dirstate.normallookup
+    normal = repo.dirstate.set_tracked
     if node == parent and p2 == repo.nullid:
         normal = repo.dirstate.set_clean
     for f in actions[b'undelete'][0]:
hg-stable