( )⚙ D11434 dirstate: remove the `normallookup` function

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11434

dirstate: remove the `normallookup` function
ClosedPublic

Authored by marmoute on Sep 16 2021, 10:44 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGccb9cc47b7b6: dirstate: remove the `normallookup` function
Summary

All use have been migrated.

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.Sep 16 2021, 10:44 AM
Alphare accepted this revision.Sep 20 2021, 9:45 AM
This revision is now accepted and ready to land.Sep 20 2021, 9:45 AM
marmoute added a commit: rHGccb9cc47b7b6: dirstate: remove the `normallookup` function.Sep 20 2021, 10:07 AM
Closed by commit rHGccb9cc47b7b6: dirstate: remove the `normallookup` function (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (25 lines)

Diff 30316

mercurial/dirstate.py

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 _normallookup(self, f):
'''Mark a file normal, but possibly dirty.'''
if self.in_merge:
# if there is a merge going on and the file was either
# "merged" or coming from other parent (-2) before
# being removed, restore that state.
entry = self._map.get(f)
if entry is not None:
# XXX this should probably be dealt with a a lower level
# (see `merged_removed` and `from_p2_removed`)
if entry.merged_removed or entry.from_p2_removed:
source = self._map.copymap.get(f)
if entry.merged_removed:
self._addpath(f, merged=True)
else:
self._addpath(f, from_p2=True)
self._map.copymap.pop(f, None)
if source is not None:
self.copy(source, f)
return
elif entry.merged or entry.from_p2:
return
self._addpath(f, possibly_dirty=True)
self._map.copymap.pop(f, None)
def _discoverpath(self, path, normed, ignoremissing, exists, storemap): def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
if exists is None: if exists is None:
exists = os.path.lexists(os.path.join(self._root, path)) exists = os.path.lexists(os.path.join(self._root, path))
if not exists: if not exists:
# Maybe a path component exists # Maybe a path component exists
if not ignoremissing and b'/' in path: if not ignoremissing and b'/' in path:
d, f = path.rsplit(b'/', 1) d, f = path.rsplit(b'/', 1)
d = self._normalize(d, False, ignoremissing, None) d = self._normalize(d, False, ignoremissing, None)