This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11564

dirstatemap: introduce a common base for the dirstatemap class
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGaec5b0981c26: dirstatemap: introduce a common base for the dirstatemap class
Summary

We have two dirstatemaps class. One for the python version of the dirstate map
and one for the Rust version (that has a python wrapper to deal with some
aspect of it). We end up with duplicated code between them, so we introduce a
common base class to start migrating common code in them.

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:02 PM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/dirstatemap.py
38–45

Only a few months until we can get rid of those ugly object

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

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (11 lines)

Diff 30621

mercurial/dirstatemap.py

if rustmod is None: if rustmod is None:
DirstateItem = parsers.DirstateItem DirstateItem = parsers.DirstateItem
else: else:
DirstateItem = rustmod.DirstateItem DirstateItem = rustmod.DirstateItem
rangemask = 0x7FFFFFFF rangemask = 0x7FFFFFFF
class dirstatemap(object): class _dirstatemapcommon(object):
"""
Methods that are identical for both implementations of the dirstatemap
class, with and without Rust extensions enabled.
"""
class dirstatemap(_dirstatemapcommon):
AlphareUnsubmitted
Not Done

Only a few months until we can get rid of those ugly object

Alphare: Only a few months until we can get rid of those ugly `object`
"""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.
- `parents` is a pair containing the parents of the working copy. The - `parents` is a pair containing the parents of the working copy. The
normcase = util.normcase normcase = util.normcase
for name in self._dirs: for name in self._dirs:
f[normcase(name)] = name f[normcase(name)] = name
return f return f
if rustmod is not None: if rustmod is not None:
class dirstatemap(object): class dirstatemap(_dirstatemapcommon):
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!