This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11132

dirstate: factor out the part retrieve "filedata" out of `normal`
ClosedPublic

Authored by marmoute on Jul 19 2021, 6:40 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa685c29ebf54: dirstate: factor out the part retrieve "filedata" out of `normal`
Summary

We will need them elsewhere.

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.Jul 19 2021, 6:40 AM
Alphare accepted this revision.Jul 19 2021, 12:28 PM
This revision is now accepted and ready to land.Jul 19 2021, 12:28 PM
baymax updated this revision to Diff 29551.Jul 20 2021, 3:21 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Jul 20 2021, 6:36 AM
mharbison72 added a subscriber: mharbison72.Jul 29 2021, 9:46 PM
mharbison72 added inline comments.
mercurial/dirstate.py
640

Truncated doc comment?

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (13 lines)

Diff 29633

mercurial/dirstate.py

size=size, size=size,
mtime=mtime, mtime=mtime,
added=added, added=added,
merged=merged, merged=merged,
from_p2=from_p2, from_p2=from_p2,
possibly_dirty=possibly_dirty, possibly_dirty=possibly_dirty,
) )
def _get_filedata(self, filename):
"""returns"""
mharbison72Unsubmitted
Not Done

Truncated doc comment?

mharbison72: Truncated doc comment?
s = os.lstat(self._join(filename))
mode = s.st_mode
size = s.st_size
mtime = s[stat.ST_MTIME]
return (mode, size, mtime)
def normal(self, f, parentfiledata=None): def normal(self, f, parentfiledata=None):
"""Mark a file normal and clean. """Mark a file normal and clean.
parentfiledata: (mode, size, mtime) of the clean file parentfiledata: (mode, size, mtime) of the clean file
parentfiledata should be computed from memory (for mode, parentfiledata should be computed from memory (for mode,
size), as or close as possible from the point where we size), as or close as possible from the point where we
determined the file was clean, to limit the risk of the determined the file was clean, to limit the risk of the
file having been changed by an external process between the file having been changed by an external process between the
moment where the file was determined to be clean and now.""" moment where the file was determined to be clean and now."""
if parentfiledata: if parentfiledata:
(mode, size, mtime) = parentfiledata (mode, size, mtime) = parentfiledata
else: else:
s = os.lstat(self._join(f)) (mode, size, mtime) = self._get_filedata(f)
mode = s.st_mode
size = s.st_size
mtime = s[stat.ST_MTIME]
self._addpath(f, mode=mode, size=size, mtime=mtime) self._addpath(f, mode=mode, size=size, mtime=mtime)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
if f in self._map.nonnormalset: if f in self._map.nonnormalset:
self._map.nonnormalset.remove(f) self._map.nonnormalset.remove(f)
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.