diff mercurial/dirstate.py @ 47890:3853e6ee160d

dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` All the other caller goes through `reset_state`, so we can safely have an explicit method on `DirstateItem` object. This means that all the logic to preserve the previous state (from p2, merged, etc) is now properly encapsulated within the DirstateItem. This pave the way to using different storage for these information. Differential Revision: https://phab.mercurial-scm.org/D11315
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Aug 2021 11:27:01 +0200
parents 6614ab9f061d
children f89ac1ed2bc6
line wrap: on
line diff
--- a/mercurial/dirstate.py	Fri Aug 20 11:23:52 2021 +0200
+++ b/mercurial/dirstate.py	Fri Aug 20 11:27:01 2021 +0200
@@ -502,7 +502,7 @@
         else:
             self._dirty = True
             self._updatedfiles.add(filename)
-            self._map.removefile(filename, in_merge=self.in_merge)
+            self._map.set_untracked(filename)
             return True
 
     @requires_no_parents_change