( )⚙ D11440 dirstate: use `reset_state` in `rebuild` instead of `dropfile`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11440

dirstate: use `reset_state` in `rebuild` instead of `dropfile`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1370d695c258: dirstate: use `reset_state` in `rebuild` instead of `dropfile`
Summary

As dirstatemap.dropfile is on its way out.

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 (4 lines)

Diff 30322

mercurial/dirstate.py

self._map.reset_state( self._map.reset_state(
f, f,
wc_tracked=True, wc_tracked=True,
p1_tracked=True, p1_tracked=True,
possibly_dirty=True, possibly_dirty=True,
) )
self._updatedfiles.add(f) self._updatedfiles.add(f)
for f in to_drop: for f in to_drop:
if self._map.dropfile(f): self._map.reset_state(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
If identity of previous dirstate is equal to this, writing If identity of previous dirstate is equal to this, writing
changes based on the former dirstate out can keep consistency. changes based on the former dirstate out can keep consistency.