This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12470

dirstatemap: move `_dirs_incr` and `_dirs_decr` methods out of the common
ClosedPublic

Authored by Alphare on Apr 6 2022, 10:12 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG9ea58ab16f11: dirstatemap: move `_dirs_incr` and `_dirs_decr` methods out of the common
rHGd26ff89dc3a2: dirstatemap: move `_dirs_incr` and `_dirs_decr` methods out of the common
Summary

They are only used by the Python implementation now

Diff Detail

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

Event Timeline

Alphare created this revision.Apr 6 2022, 10:12 AM
marmoute accepted this revision.Apr 8 2022, 7:31 AM
Alphare added a commit: rHGd26ff89dc3a2: dirstatemap: move `_dirs_incr` and `_dirs_decr` methods out of the common.Apr 8 2022, 11:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd26ff89dc3a2: dirstatemap: move `_dirs_incr` and `_dirs_decr` methods out of the common (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 32942.Apr 8 2022, 12:29 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 33044.Apr 12 2022, 10:58 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 33126.Apr 12 2022, 12:06 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (23 lines)

Diff 33126

mercurial/dirstatemap.py

return iter(self._map) return iter(self._map)
def __contains__(self, key): def __contains__(self, key):
return key in self._map return key in self._map
def __getitem__(self, item): def __getitem__(self, item):
return self._map[item] return self._map[item]
### sub-class utility method
#
# Use to allow for generic implementation of some method while still coping
# with minor difference between implementation.
def _dirs_incr(self, filename, old_entry=None):
"""increment the dirstate counter if applicable
This might be a no-op for some subclasses who deal with directory
tracking in a different way.
"""
def _dirs_decr(self, filename, old_entry=None, remove_variant=False):
"""decrement the dirstate counter if applicable
This might be a no-op for some subclasses who deal with directory
tracking in a different way.
"""
### disk interaction ### disk interaction
def _opendirstatefile(self): def _opendirstatefile(self):
fp, mode = txnutil.trypending(self._root, self._opener, self._filename) fp, mode = txnutil.trypending(self._root, self._opener, self._filename)
if self._pendingmode is not None and self._pendingmode != mode: if self._pendingmode is not None and self._pendingmode != mode:
fp.close() fp.close()
raise error.Abort( raise error.Abort(
_(b'working directory state may be changed parallelly') _(b'working directory state may be changed parallelly')
def identity(self): def identity(self):
self._map self._map
return self.identity return self.identity
### code related to maintaining and accessing "extra" property ### code related to maintaining and accessing "extra" property
# (e.g. "has_dir") # (e.g. "has_dir")
def _dirs_incr(self, filename, old_entry=None): def _dirs_incr(self, filename, old_entry=None):
"""incremente the dirstate counter if applicable""" """increment the dirstate counter if applicable"""
if ( if (
old_entry is None or old_entry.removed old_entry is None or old_entry.removed
) and "_dirs" in self.__dict__: ) and "_dirs" in self.__dict__:
self._dirs.addpath(filename) self._dirs.addpath(filename)
if old_entry is None and "_alldirs" in self.__dict__: if old_entry is None and "_alldirs" in self.__dict__:
self._alldirs.addpath(filename) self._alldirs.addpath(filename)
def _dirs_decr(self, filename, old_entry=None, remove_variant=False): def _dirs_decr(self, filename, old_entry=None, remove_variant=False):
"""decremente the dirstate counter if applicable""" """decrement the dirstate counter if applicable"""
if old_entry is not None: if old_entry is not None:
if "_dirs" in self.__dict__ and not old_entry.removed: if "_dirs" in self.__dict__ and not old_entry.removed:
self._dirs.delpath(filename) self._dirs.delpath(filename)
if "_alldirs" in self.__dict__ and not remove_variant: if "_alldirs" in self.__dict__ and not remove_variant:
self._alldirs.delpath(filename) self._alldirs.delpath(filename)
elif remove_variant and "_alldirs" in self.__dict__: elif remove_variant and "_alldirs" in self.__dict__:
self._alldirs.addpath(filename) self._alldirs.addpath(filename)
if "filefoldmap" in self.__dict__: if "filefoldmap" in self.__dict__: