This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11790

dirstate: stop gathering parentfiledata in update_file_p1
ClosedPublic

Authored by marmoute on Nov 24 2021, 6:12 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6becd5773133: dirstate: stop gathering parentfiledata in update_file_p1
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Nov 24 2021, 6:12 AM
Alphare accepted this revision.Nov 24 2021, 8:40 AM
This revision is now accepted and ready to land.Nov 24 2021, 8:40 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (13 lines)

Diff 31252

mercurial/dirstate.py

# the file is no longer relevant to anyone # the file is no longer relevant to anyone
if self._map.get(filename) is not None: if self._map.get(filename) is not None:
self._map.reset_state(filename) self._map.reset_state(filename)
self._dirty = True self._dirty = True
elif (not p1_tracked) and wc_tracked: elif (not p1_tracked) and wc_tracked:
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,
p1_tracked, p1_tracked,
# 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,
) )
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(
self, self,
filename, filename,
wc_tracked, wc_tracked,
p1_tracked, p1_tracked,
p2_info=False, p2_info=False,