changeset 47696:ff481c238496

dirstate: properly update `_lastnormaltime` in `update_file_p1` This was previously overlooked. Differential Revision: https://phab.mercurial-scm.org/D11138
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 19 Jul 2021 04:43:28 +0200
parents f98145ce78d7
children c9e412712e0c
files mercurial/dirstate.py
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Mon Jul 19 04:43:14 2021 +0200
+++ b/mercurial/dirstate.py	Mon Jul 19 04:43:28 2021 +0200
@@ -552,6 +552,14 @@
             possibly_dirty=possibly_dirty,
             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(