This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10929

dirstate: move the _rangemask filtering closer to its storage
ClosedPublic

Authored by marmoute on Jul 2 2021, 11:17 AM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5eb65ec12465: dirstate: move the _rangemask filtering closer to its storage
Summary

The goal is to get ready to move these kind of processing at a lower level. We start with move
move _rangemask filtering close to where it is sent to the lower level to make the future move trivial.

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 2 2021, 11:17 AM
SimonSapin accepted this revision.Jul 2 2021, 11:57 AM
pulkit accepted this revision.Jul 3 2021, 7:40 AM
This revision is now accepted and ready to land.Jul 3 2021, 7:40 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (6 lines)

Diff 28761

mercurial/dirstate.py

for d in pathutil.finddirs(f): for d in pathutil.finddirs(f):
if self._map.hastrackeddir(d): if self._map.hastrackeddir(d):
break break
entry = self._map.get(d) entry = self._map.get(d)
if entry is not None and entry[0] != b'r': if entry is not None and entry[0] != b'r':
msg = _(b'file %r in dirstate clashes with %r') msg = _(b'file %r in dirstate clashes with %r')
msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
raise error.Abort(msg) raise error.Abort(msg)
if size != NONNORMAL and size != FROM_P2:
size = size & _rangemask
if mtime != AMBIGUOUS_TIME:
mtime = mtime & _rangemask
self._dirty = True self._dirty = True
self._updatedfiles.add(f) self._updatedfiles.add(f)
self._map.addfile(f, oldstate, state, mode, size, mtime) self._map.addfile(f, oldstate, state, 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)) s = os.lstat(self._join(f))
mode = s.st_mode mode = s.st_mode
size = s.st_size size = s.st_size
mtime = s[stat.ST_MTIME] mtime = s[stat.ST_MTIME]
self._addpath(f, b'n', mode, size & _rangemask, mtime & _rangemask) self._addpath(f, b'n', mode, size, 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.
self._lastnormaltime = mtime self._lastnormaltime = mtime