( )⚙ D11439 dirstate: use `reset_state` to drop file in `update_file_p1`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11439

dirstate: use `reset_state` to drop file in `update_file_p1`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbac82c2ce858: dirstate: use `reset_state` to drop file in `update_file_p1`
Summary

The dropfile function is on its way out.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (3 lines)

Diff 30277

mercurial/dirstate.py

wc_tracked = entry.tracked wc_tracked = entry.tracked
possibly_dirty = False possibly_dirty = False
if p1_tracked and wc_tracked: if p1_tracked and wc_tracked:
# the underlying reference might have changed, we will have to # the underlying reference might have changed, we will have to
# check it. # check it.
possibly_dirty = True possibly_dirty = True
elif not (p1_tracked or wc_tracked): elif not (p1_tracked or wc_tracked):
# the file is no longer relevant to anyone # the file is no longer relevant to anyone
if self._map.dropfile(filename): if self._map.get(filename) is not None:
self._map.reset_state(filename)
self._dirty = True self._dirty = True
self._updatedfiles.add(filename) self._updatedfiles.add(filename)
elif (not p1_tracked) and wc_tracked: elif (not p1_tracked) and wc_tracked:
if entry is not None and entry.added: if entry is not None and entry.added:
return # avoid dropping copy information (maybe?) return # avoid dropping copy information (maybe?)
elif p1_tracked and not wc_tracked: elif p1_tracked and not wc_tracked:
pass pass
else: else: