Mercurial > hg

changeset 47707:61753b1ba96f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: use `set_clean` instead of `normal` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11149
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 19 Jul 2021 03:52:20 +0200
parents 5bbf304271a0
children 7bdfd88251c0
files mercurial/cmdutil.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Mon Jul 19 03:15:57 2021 +0200
+++ b/mercurial/cmdutil.py	Mon Jul 19 03:52:20 2021 +0200
@@ -3598,7 +3598,7 @@
         if p2 != repo.nullid:
             normal = repo.dirstate.normallookup
         else:
-            normal = repo.dirstate.normal
+            normal = repo.dirstate.set_clean
 
     newlyaddedandmodifiedfiles = set()
     if interactive:
@@ -3691,7 +3691,7 @@
 
     normal = repo.dirstate.normallookup
     if node == parent and p2 == repo.nullid:
-        normal = repo.dirstate.normal
+        normal = repo.dirstate.set_clean
     for f in actions[b'undelete'][0]:
         if interactive:
             choice = repo.ui.promptchoice(