Commit 6becd577 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

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
parent 080151f18f3a
...@@ -536,10 +536,6 @@ ...@@ -536,10 +536,6 @@
if entry is not None and entry.added: if entry is not None and entry.added:
return # avoid dropping copy information (maybe?) return # avoid dropping copy information (maybe?)
parentfiledata = None
if wc_tracked and p1_tracked:
parentfiledata = self._get_filedata(filename)
self._map.reset_state( self._map.reset_state(
filename, filename,
wc_tracked, wc_tracked,
...@@ -547,5 +543,4 @@ ...@@ -547,5 +543,4 @@
# the underlying reference might have changed, we will have to # the underlying reference might have changed, we will have to
# check it. # check it.
has_meaningful_mtime=False, has_meaningful_mtime=False,
parentfiledata=parentfiledata,
) )
...@@ -551,12 +546,4 @@ ...@@ -551,12 +546,4 @@
) )
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 @requires_parents_change
def update_file( def update_file(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment