D11137: dirstate: properly update `_lastnormaltime` in `update_file`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Mon Jul 19 10:41:47 UTC 2021
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
This was previously overlooked.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11137
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -620,6 +620,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]
def _addpath(
self,
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list