dirstate: stop gathering parentfiledata in update_file_p1
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 17 Nov 2021 20:26:33 +0100
changeset 48386 6becd5773133
parent 48385 080151f18f3a
child 48387 f838f5bca038
dirstate: stop gathering parentfiledata in update_file_p1 Gathering information here assume that they are valid cache information for a clean file. It is true most of the time, but not garanteed. So we drop this and will let the next `hg status` call record actual information. Differential Revision: https://phab.mercurial-scm.org/D11790
mercurial/dirstate.py
--- a/mercurial/dirstate.py	Wed Nov 17 20:26:14 2021 +0100
+++ b/mercurial/dirstate.py	Wed Nov 17 20:26:33 2021 +0100
@@ -536,10 +536,6 @@
             if entry is not None and entry.added:
                 return  # avoid dropping copy information (maybe?)
 
-        parentfiledata = None
-        if wc_tracked and p1_tracked:
-            parentfiledata = self._get_filedata(filename)
-
         self._map.reset_state(
             filename,
             wc_tracked,
@@ -547,16 +543,7 @@
             # the underlying reference might have changed, we will have to
             # check it.
             has_meaningful_mtime=False,
-            parentfiledata=parentfiledata,
         )
-        if (
-            parentfiledata is not None
-            and parentfiledata[2] > self._lastnormaltime
-        ):
-            # Remember the most recent modification timeslot for status(),
-            # to make sure we won't miss future size-preserving file content
-            # modifications that happen within the same timeslot.
-            self._lastnormaltime = parentfiledata[2]
 
     @requires_parents_change
     def update_file(