( )⚙ D11789 dirstate: make it mandatory to provide parentfiledata in `set_clean`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11789

dirstate: make it mandatory to provide parentfiledata in `set_clean`
ClosedPublic

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

Details

Reviewers
durin42
Alphare
Group Reviewers
hg-reviewers
Commits
rHG080151f18f3a: dirstate: make it mandatory to provide parentfiledata in `set_clean`
Summary

Gathering the mode, size and mtime, independently from determining that the file
is clean is a race-machine. So we just make these information required arguments.

(note that the data is still gathered in a racy way in practice, but at least
the API is no longer encouraging it.)

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.

Revision Contents
Changeset List

PathPackages
Mhgext/git/dirstate.py (2 lines)
Mmercurial/dirstate.py (7 lines)

Diff 31251

hgext/git/dirstate.py

return r return r
def matches(self, match): def matches(self, match):
for x in self.git.index: for x in self.git.index:
p = pycompat.fsencode(x.path) p = pycompat.fsencode(x.path)
if match(p): if match(p):
yield p yield p
def set_clean(self, f, parentfiledata=None): def set_clean(self, f, parentfiledata):
"""Mark a file normal and clean.""" """Mark a file normal and clean."""
# TODO: for now we just let libgit2 re-stat the file. We can # TODO: for now we just let libgit2 re-stat the file. We can
# clearly do better. # clearly do better.
def set_possibly_dirty(self, f): def set_possibly_dirty(self, f):
"""Mark a file normal, but possibly dirty.""" """Mark a file normal, but possibly dirty."""
# TODO: for now we just let libgit2 re-stat the file. We can # TODO: for now we just let libgit2 re-stat the file. We can
# clearly do better. # clearly do better.

mercurial/dirstate.py

return True the file was previously tracked, False otherwise. return True the file was previously tracked, False otherwise.
""" """
ret = self._map.set_untracked(filename) ret = self._map.set_untracked(filename)
if ret: if ret:
self._dirty = True self._dirty = True
return ret return ret
@requires_no_parents_change @requires_no_parents_change
def set_clean(self, filename, parentfiledata=None): def set_clean(self, filename, parentfiledata):
"""record that the current state of the file on disk is known to be clean""" """record that the current state of the file on disk is known to be clean"""
self._dirty = True self._dirty = True
if parentfiledata:
(mode, size, mtime) = parentfiledata
else:
(mode, size, mtime) = self._get_filedata(filename)
if not self._map[filename].tracked: if not self._map[filename].tracked:
self._check_new_tracked_filename(filename) self._check_new_tracked_filename(filename)
(mode, size, mtime) = parentfiledata
self._map.set_clean(filename, mode, size, mtime) self._map.set_clean(filename, mode, size, mtime)
if mtime > self._lastnormaltime: if mtime > self._lastnormaltime:
# Remember the most recent modification timeslot for status(), # Remember the most recent modification timeslot for status(),
# to make sure we won't miss future size-preserving file content # to make sure we won't miss future size-preserving file content
# modifications that happen within the same timeslot. # modifications that happen within the same timeslot.
self._lastnormaltime = mtime self._lastnormaltime = mtime
@requires_no_parents_change @requires_no_parents_change