[Updated] D11790: dirstate: stop gathering parentfiledata in update_file_p1
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Wed Dec 1 15:22:39 UTC 2021
Closed by commit rHG6becd5773133: dirstate: stop gathering parentfiledata in update_file_p1 (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11790?vs=31112&id=31252
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11790/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11790
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
@@ -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(
To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20211201/1c611526/attachment-0001.html>
More information about the Mercurial-patches
mailing list