From patchwork Mon Jul 19 10:44:14 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D11149: revert: use `set_clean` instead of `normal`
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 49471
Message-Id: <differential-rev-PHID-DREV-ozoghv2ydqv52ro7jzx7-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Mon, 19 Jul 2021 10:44:14 +0000

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/D11149

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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(