( )⚙ D11565 dirstatemap: use a common __init__ for dirstatemap

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11565

dirstatemap: use a common __init__ for dirstatemap
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGfe6617715464: dirstatemap: use a common __init__ for dirstatemap
Summary

This is the first and simplest things to put in common.

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:04 PM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/dirstatemap.py
98

Assuming this is the Italian spelling of supported

This revision is now accepted and ready to land.Oct 3 2021, 4:04 PM
marmoute added a commit: rHGfe6617715464: dirstatemap: use a common __init__ for dirstatemap.Oct 3 2021, 5:32 PM
Closed by commit rHGfe6617715464: dirstatemap: use a common __init__ for dirstatemap (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (51 lines)

Diff 30622

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.
""" """
def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
self._use_dirstate_v2 = use_dirstate_v2
self._nodeconstants = nodeconstants
self._ui = ui
self._opener = opener
self._root = root
self._filename = b'dirstate'
self._nodelen = 20 # Also update Rust code when changing this!
self._parents = None
self._dirtyparents = False
# for consistent view between _pl() and _read() invocations
self._pendingmode = None
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.
- `filefoldmap` is a dict mapping normalized filenames to the denormalized - `filefoldmap` is a dict mapping normalized filenames to the denormalized
form that they appear as in the dirstate. form that they appear as in the dirstate.
- `dirfoldmap` is a dict mapping normalized directory names to the - `dirfoldmap` is a dict mapping normalized directory names to the
denormalized form that they appear as in the dirstate. denormalized form that they appear as in the dirstate.
""" """
def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2): def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
self._ui = ui super(dirstatemap, self).__init__(
self._opener = opener ui, opener, root, nodeconstants, use_dirstate_v2
self._root = root )
self._filename = b'dirstate' if self._use_dirstate_v2:
self._nodelen = 20 msg = "Dirstate V2 not supportedi"
AlphareUnsubmitted
Not Done

Assuming this is the Italian spelling of supported

Alphare: Assuming this is the Italian spelling of supported
self._nodeconstants = nodeconstants msg += "(should have detected unsupported requirement)"
assert ( raise error.ProgrammingError(msg)
not use_dirstate_v2
), "should have detected unsupported requirement"
self._parents = None
self._dirtyparents = False
# for consistent view between _pl() and _read() invocations
self._pendingmode = None
@propertycache @propertycache
def _map(self): def _map(self):
self._map = {} self._map = {}
self.read() self.read()
return self._map return self._map
@propertycache @propertycache
f[normcase(name)] = name f[normcase(name)] = name
return f return f
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):
self._use_dirstate_v2 = use_dirstate_v2 super(dirstatemap, self).__init__(
self._nodeconstants = nodeconstants ui, opener, root, nodeconstants, use_dirstate_v2
self._ui = ui )
self._opener = opener
self._root = root
self._filename = b'dirstate'
self._nodelen = 20 # Also update Rust code when changing this!
self._parents = None
self._dirtyparents = False
self._docket = None self._docket = None
# for consistent view between _pl() and _read() invocations
self._pendingmode = None
def addfile( def addfile(
self, self,
f, f,
mode=0, mode=0,
size=None, size=None,
mtime=None, mtime=None,
added=False, added=False,
merged=False, merged=False,