This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11577

dirstatemap: add a common `_drop_entry` method for dirstatemap
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc057d7c97b72: dirstatemap: add a common `_drop_entry` method for dirstatemap
Summary

This method is called to remove DirstateItem from the map.

Each variant have a different implementation (which is … the point).

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.Oct 2 2021, 11:05 AM
Alphare accepted this revision.Oct 3 2021, 4:28 PM
This revision is now accepted and ready to land.Oct 3 2021, 4:28 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (14 lines)

Diff 30634

mercurial/dirstatemap.py

"""record updated state of an entry""" """record updated state of an entry"""
def _insert_entry(self, f, entry): def _insert_entry(self, f, entry):
"""add a new dirstate entry (or replace an unrelated one) """add a new dirstate entry (or replace an unrelated one)
The fact it is actually new is the responsability of the caller The fact it is actually new is the responsability of the caller
""" """
def _drop_entry(self, f):
"""remove any entry for file f
This should also drop associated copy information
The fact we actually need to drop it is the responsability of the caller"""
### method to manipulate the entries ### method to manipulate the entries
def set_possibly_dirty(self, filename): def set_possibly_dirty(self, filename):
"""record that the current state of the file on disk is unknown""" """record that the current state of the file on disk is unknown"""
entry = self[filename] entry = self[filename]
entry.set_possibly_dirty() entry.set_possibly_dirty()
self._refresh_entry(filename, entry) self._refresh_entry(filename, entry)
merged=merged, merged=merged,
clean_p1=clean_p1, clean_p1=clean_p1,
clean_p2=clean_p2, clean_p2=clean_p2,
possibly_dirty=possibly_dirty, possibly_dirty=possibly_dirty,
parentfiledata=parentfiledata, parentfiledata=parentfiledata,
) )
self._map[filename] = entry self._map[filename] = entry
def _drop_entry(self, f):
self._map.pop(f, None)
self._copymap.pop(f, None)
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
) )
if not entry.any_tracked: if not entry.any_tracked:
self._map.drop_item_and_copy_source(f) self._map.drop_item_and_copy_source(f)
else: else:
self._map.addfile(f, entry) self._map.addfile(f, entry)
def _insert_entry(self, f, entry): def _insert_entry(self, f, entry):
self._map.addfile(f, entry) self._map.addfile(f, entry)
def _drop_entry(self, f):
self._map.drop_item_and_copy_source(f)
def __setitem__(self, key, value): def __setitem__(self, key, value):
assert isinstance(value, DirstateItem) assert isinstance(value, DirstateItem)
self._map.set_dirstate_item(key, value) self._map.set_dirstate_item(key, value)
def reset_state( def reset_state(
self, self,
filename, filename,
wc_tracked=False, wc_tracked=False,