This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11432

dirstate: replace the use of `_normallookup` in `rebuild`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG14fa2e583422: dirstate: replace the use of `_normallookup` in `rebuild`
Summary

Normal lookup is a complicated function that we want to get rid of.

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
Mmercurial/dirstate.py (12 lines)

Diff 30314

mercurial/dirstate.py

to_lookup = changedfilesset & set(allfiles) to_lookup = changedfilesset & set(allfiles)
to_drop = changedfilesset - to_lookup to_drop = changedfilesset - to_lookup
if self._origpl is None: if self._origpl is None:
self._origpl = self._pl self._origpl = self._pl
self._map.setparents(parent, self._nodeconstants.nullid) self._map.setparents(parent, self._nodeconstants.nullid)
for f in to_lookup: for f in to_lookup:
self._normallookup(f)
if self.in_merge:
self.set_tracked(f)
else:
self._map.reset_state(
f,
wc_tracked=True,
p1_tracked=True,
possibly_dirty=True,
)
self._updatedfiles.add(f)
for f in to_drop: for f in to_drop:
if self._map.dropfile(f): if self._map.dropfile(f):
self._updatedfiles.add(f) self._updatedfiles.add(f)
self._dirty = True self._dirty = True
def identity(self): def identity(self):
"""Return identity of dirstate itself to detect changing in storage """Return identity of dirstate itself to detect changing in storage