This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11423

dirstate: same logic as what we did for `_drop`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGffde999a3ea9: dirstate: same logic as what we did for `_drop`
Summary

This is part of the dirstatemap so let le dirstatemap deal with it.

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:42 AM
Alphare accepted this revision.Sep 20 2021, 5:13 AM
Alphare added a subscriber: Alphare.

"le dirstatemap" -> as much as I'm enjoying this, that probably should be edited. I'll do it on-the-fly

This revision is now accepted and ready to land.Sep 20 2021, 5:13 AM
marmoute added a commit: rHGffde999a3ea9: dirstate: same logic as what we did for `_drop`.Sep 20 2021, 10:06 AM
Closed by commit rHGffde999a3ea9: dirstate: same logic as what we did for `_drop` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (1 line)
Mmercurial/dirstatemap.py (6 lines)

Diff 30305

mercurial/dirstate.py

elif entry.merged or entry.from_p2: elif entry.merged or entry.from_p2:
return return
self._addpath(f, possibly_dirty=True) self._addpath(f, possibly_dirty=True)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def _add(self, filename): def _add(self, filename):
"""internal function to mark a file as added""" """internal function to mark a file as added"""
self._addpath(filename, added=True) self._addpath(filename, added=True)
self._map.copymap.pop(filename, None)
def _drop(self, filename): def _drop(self, filename):
"""internal function to drop a file from the dirstate""" """internal function to drop a file from the dirstate"""
if self._map.dropfile(filename): if self._map.dropfile(filename):
self._dirty = True self._dirty = True
self._updatedfiles.add(filename) self._updatedfiles.add(filename)
def _discoverpath(self, path, normed, ignoremissing, exists, storemap): def _discoverpath(self, path, normed, ignoremissing, exists, storemap):

mercurial/dirstatemap.py

possibly_dirty=False, possibly_dirty=False,
): ):
"""Add a tracked file to the dirstate.""" """Add a tracked file to the dirstate."""
if added: if added:
assert not merged assert not merged
assert not possibly_dirty assert not possibly_dirty
assert not from_p2 assert not from_p2
new_entry = DirstateItem.new_added() new_entry = DirstateItem.new_added()
self.copymap.pop(f, None)
elif merged: elif merged:
assert not possibly_dirty assert not possibly_dirty
assert not from_p2 assert not from_p2
new_entry = DirstateItem.new_merged() new_entry = DirstateItem.new_merged()
elif from_p2: elif from_p2:
assert not possibly_dirty assert not possibly_dirty
new_entry = DirstateItem.new_from_p2() new_entry = DirstateItem.new_from_p2()
elif possibly_dirty: elif possibly_dirty:
mode=0, mode=0,
size=None, size=None,
mtime=None, mtime=None,
added=False, added=False,
merged=False, merged=False,
from_p2=False, from_p2=False,
possibly_dirty=False, possibly_dirty=False,
): ):
return self._rustmap.addfile( ret = self._rustmap.addfile(
f, f,
mode, mode,
size, size,
mtime, mtime,
added, added,
merged, merged,
from_p2, from_p2,
possibly_dirty, possibly_dirty,
) )
if added:
self.copymap.pop(f, None)
return ret
def reset_state( def reset_state(
self, self,
filename, filename,
wc_tracked, wc_tracked,
p1_tracked, p1_tracked,
p2_tracked=False, p2_tracked=False,
merged=False, merged=False,