( )⚙ D11572 dirstatemap: use a common implementation for `dirstatemap.set_untracked`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11572

dirstatemap: use a common implementation for `dirstatemap.set_untracked`
ClosedPublic

Authored by marmoute on Oct 2 2021, 11:05 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGced8cf9c4905: dirstatemap: use a common implementation for `dirstatemap.set_untracked`
Summary

We can now make sure they use the same code, and drop the older, out of sync,
implementation of set_untracked for the rust wrapper.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (45 lines)

Diff 30560

mercurial/dirstatemap.py

This might be a no-op for some subclass who deal with directory This might be a no-op for some subclass who deal with directory
tracking in a different way. tracking in a different way.
""" """
def _refresh_entry(self, f, entry): def _refresh_entry(self, f, entry):
"""record updated state of an entry""" """record updated state of an entry"""
### method to manipulate the entries
def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map"""
entry = self.get(f)
if entry is None:
return False
else:
self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
if not entry.merged:
self.copymap.pop(f, None)
entry.set_untracked()
self._refresh_entry(f, entry)
return True
class dirstatemap(_dirstatemapcommon): class dirstatemap(_dirstatemapcommon):
"""Map encapsulating the dirstate's contents. """Map encapsulating the dirstate's contents.
The dirstate contains the following state: The dirstate contains the following state:
- `identity` is the identity of the dirstate file, which can be used to - `identity` is the identity of the dirstate file, which can be used to
detect when changes have occurred to the dirstate file. detect when changes have occurred to the dirstate file.
new = True new = True
else: else:
# XXX This is probably overkill for more case, but we need this to # XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one. # fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future. # Consider smoothing this in the future.
self.set_possibly_dirty(filename) self.set_possibly_dirty(filename)
return new return new
def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map"""
entry = self.get(f)
if entry is None:
return False
else:
self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
if not entry.merged:
self.copymap.pop(f, None)
entry.set_untracked()
if not entry.any_tracked:
self._map.pop(f, None)
return True
if rustmod is not None: if rustmod is not None:
class dirstatemap(_dirstatemapcommon): class dirstatemap(_dirstatemapcommon):
def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2): def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
super(dirstatemap, self).__init__( super(dirstatemap, self).__init__(
ui, opener, root, nodeconstants, use_dirstate_v2 ui, opener, root, nodeconstants, use_dirstate_v2
) )
new = True new = True
else: else:
# XXX This is probably overkill for more case, but we need this to # XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one. # fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future. # Consider smoothing this in the future.
self.set_possibly_dirty(filename) self.set_possibly_dirty(filename)
return new return new
def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map"""
# in merge is only trigger more logic, so it "fine" to pass it.
#
# the inner rust dirstate map code need to be adjusted once the API
# for dirstate/dirstatemap/DirstateItem is a bit more settled
entry = self.get(f)
if entry is None:
return False
else:
if entry.added:
self._map.drop_item_and_copy_source(f)
else:
self._map.removefile(f, in_merge=True)
return True
### Legacy method we need to get rid of ### Legacy method we need to get rid of
def addfile( def addfile(
self, self,
f, f,
mode=0, mode=0,
size=None, size=None,
mtime=None, mtime=None,