( )⚙ D11352 dirstate: drop the `_normal` method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11352

dirstate: drop the `_normal` method
ClosedPublic

Authored by marmoute on Aug 26 2021, 10:21 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1b3c753b62c6: dirstate: drop the `_normal` method
Summary

It only has one caller so lets inline it and cleans things up further.

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.Aug 26 2021, 10:21 AM
Alphare accepted this revision.Aug 27 2021, 5:48 AM
This revision is now accepted and ready to land.Aug 27 2021, 5:48 AM
marmoute added a commit: rHG1b3c753b62c6: dirstate: drop the `_normal` method.Aug 27 2021, 8:40 AM
Closed by commit rHG1b3c753b62c6: dirstate: drop the `_normal` method (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (29 lines)

Diff 30110

mercurial/dirstate.py

self._map.set_untracked(filename) self._map.set_untracked(filename)
return True return True
@requires_no_parents_change @requires_no_parents_change
def set_clean(self, filename, parentfiledata=None): def set_clean(self, filename, parentfiledata=None):
"""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
self._updatedfiles.add(filename) self._updatedfiles.add(filename)
self._normal(filename, parentfiledata=parentfiledata) if parentfiledata:
(mode, size, mtime) = parentfiledata
else:
(mode, size, mtime) = self._get_filedata(filename)
self._addpath(filename, mode=mode, size=size, mtime=mtime)
self._map.copymap.pop(filename, None)
if filename in self._map.nonnormalset:
self._map.nonnormalset.remove(filename)
if mtime > 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 = mtime
@requires_no_parents_change @requires_no_parents_change
def set_possibly_dirty(self, filename): def set_possibly_dirty(self, filename):
"""record that the current state of the file on disk is unknown""" """record that the current state of the file on disk is unknown"""
self._dirty = True self._dirty = True
self._updatedfiles.add(filename) self._updatedfiles.add(filename)
self._map.set_possibly_dirty(filename) self._map.set_possibly_dirty(filename)
def _get_filedata(self, filename): def _get_filedata(self, filename):
"""returns""" """returns"""
s = os.lstat(self._join(filename)) s = os.lstat(self._join(filename))
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]
return (mode, size, mtime) return (mode, size, mtime)
def _normal(self, f, parentfiledata=None):
if parentfiledata:
(mode, size, mtime) = parentfiledata
else:
(mode, size, mtime) = self._get_filedata(f)
self._addpath(f, mode=mode, size=size, mtime=mtime)
self._map.copymap.pop(f, None)
if f in self._map.nonnormalset:
self._map.nonnormalset.remove(f)
if mtime > 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 = mtime
def _normallookup(self, f): def _normallookup(self, f):
'''Mark a file normal, but possibly dirty.''' '''Mark a file normal, but possibly dirty.'''
if self.in_merge: if self.in_merge:
# if there is a merge going on and the file was either # if there is a merge going on and the file was either
# "merged" or coming from other parent (-2) before # "merged" or coming from other parent (-2) before
# being removed, restore that state. # being removed, restore that state.
entry = self._map.get(f) entry = self._map.get(f)
if entry is not None: if entry is not None: