This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11567

dirstatemap: move a multiple simple functions in the common class
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbbd924a36a6e: dirstatemap: move a multiple simple functions in the common class
Summary

These are small and simple, lets factor them out.

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:04 AM
Alphare accepted this revision.Oct 3 2021, 4:06 PM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/dirstatemap.py
44

Not sure if pleading or asserting ;)

This revision is now accepted and ready to land.Oct 3 2021, 4:06 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (61 lines)

Diff 30624

mercurial/dirstatemap.py

class _dirstatemapcommon(object): class _dirstatemapcommon(object):
""" """
Methods that are identical for both implementations of the dirstatemap Methods that are identical for both implementations of the dirstatemap
class, with and without Rust extensions enabled. class, with and without Rust extensions enabled.
""" """
# please pytype
AlphareUnsubmitted
Not Done

Not sure if pleading or asserting ;)

Alphare: Not sure if pleading or asserting ;)
_map = None
copymap = None
def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2): def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
self._use_dirstate_v2 = use_dirstate_v2 self._use_dirstate_v2 = use_dirstate_v2
self._nodeconstants = nodeconstants self._nodeconstants = nodeconstants
self._ui = ui self._ui = ui
self._opener = opener self._opener = opener
self._root = root self._root = root
self._filename = b'dirstate' self._filename = b'dirstate'
self._nodelen = 20 # Also update Rust code when changing this! self._nodelen = 20 # Also update Rust code when changing this!
self._parents = None self._parents = None
self._dirtyparents = False self._dirtyparents = False
# for consistent view between _pl() and _read() invocations # for consistent view between _pl() and _read() invocations
self._pendingmode = None self._pendingmode = None
def preload(self):
"""Loads the underlying data, if it's not already loaded"""
self._map
def get(self, key, default=None):
return self._map.get(key, default)
def __len__(self):
return len(self._map)
def __iter__(self):
return iter(self._map)
def __contains__(self, key):
return key in self._map
def __getitem__(self, item):
return self._map[item]
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.
""" """
Return an iterator of (filename, state, mode, size, mtime) tuples Return an iterator of (filename, state, mode, size, mtime) tuples
`all` is unused when Rust is not enabled `all` is unused when Rust is not enabled
""" """
for (filename, item) in self.items(): for (filename, item) in self.items():
yield (filename, item.state, item.mode, item.size, item.mtime) yield (filename, item.state, item.mode, item.size, item.mtime)
def __len__(self):
return len(self._map)
def __iter__(self):
return iter(self._map)
def get(self, key, default=None):
return self._map.get(key, default)
def __contains__(self, key):
return key in self._map
def __getitem__(self, key):
return self._map[key]
def keys(self): def keys(self):
return self._map.keys() return self._map.keys()
def preload(self):
"""Loads the underlying data, if it's not already loaded"""
self._map
def _dirs_incr(self, filename, old_entry=None): def _dirs_incr(self, filename, old_entry=None):
"""incremente the dirstate counter if applicable""" """incremente 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)
self._map.drop_item_and_copy_source(f) self._map.drop_item_and_copy_source(f)
else: else:
self._map.removefile(f, in_merge=True) self._map.removefile(f, in_merge=True)
return True return True
def removefile(self, *args, **kwargs): def removefile(self, *args, **kwargs):
return self._map.removefile(*args, **kwargs) return self._map.removefile(*args, **kwargs)
def get(self, *args, **kwargs):
return self._map.get(*args, **kwargs)
@property @property
def copymap(self): def copymap(self):
return self._map.copymap() return self._map.copymap()
def debug_iter(self, all): def debug_iter(self, all):
""" """
Return an iterator of (filename, state, mode, size, mtime) tuples Return an iterator of (filename, state, mode, size, mtime) tuples
`all`: also include with `state == b' '` dirstate tree nodes that `all`: also include with `state == b' '` dirstate tree nodes that
don't have an associated `DirstateItem`. don't have an associated `DirstateItem`.
""" """
return self._map.debug_iter(all) return self._map.debug_iter(all)
def preload(self):
self._map
def clear(self): def clear(self):
self._map.clear() self._map.clear()
self.setparents( self.setparents(
self._nodeconstants.nullid, self._nodeconstants.nullid self._nodeconstants.nullid, self._nodeconstants.nullid
) )
util.clearcachedproperty(self, b"_dirs") util.clearcachedproperty(self, b"_dirs")
util.clearcachedproperty(self, b"_alldirs") util.clearcachedproperty(self, b"_alldirs")
util.clearcachedproperty(self, b"dirfoldmap") util.clearcachedproperty(self, b"dirfoldmap")
def items(self): def items(self):
return self._map.items() return self._map.items()
def keys(self): def keys(self):
return iter(self._map) return iter(self._map)
def __contains__(self, key):
return key in self._map
def __getitem__(self, item):
return self._map[item]
def __len__(self):
return len(self._map)
def __iter__(self):
return iter(self._map)
# forward for python2,3 compat # forward for python2,3 compat
iteritems = items iteritems = items
def _opendirstatefile(self): def _opendirstatefile(self):
fp, mode = txnutil.trypending( fp, mode = txnutil.trypending(
self._root, self._opener, self._filename 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: