This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10949

dirstate-entry: turn dirstate tuple into a real object (like in C)
ClosedPublic

Authored by marmoute on Jul 4 2021, 5:49 PM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd4c795576aeb: dirstate-entry: turn dirstate tuple into a real object (like in C)
Summary

With dirstate V2, the stored information and actual format will change. This mean we need to start an a better abstraction for a dirstate entry that a tuple directly accessed.

By chance, the C code is already doing this and pretend to be a tuple. So it
should be fairly easy. We start with turning the tuple into an object, we will
slowly migrate the dirstate code to no longer use the tuple directly in later
changesets.

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.Jul 4 2021, 5:49 PM
SimonSapin accepted this revision.Jul 4 2021, 11:54 PM
pulkit added a subscriber: pulkit.Jul 6 2021, 12:20 PM

s/that a tuple directly accessed/than a tuple directly accessed in commit message.

mercurial/pure/parsers.py
37

s/represente/represent

39

s/constains/contains

baymax updated this revision to Diff 28851.Jul 6 2021, 2:08 PM

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

pulkit accepted this revision.Jul 6 2021, 2:49 PM
This revision is now accepted and ready to land.Jul 6 2021, 2:49 PM
durin42 added a subscriber: durin42.Jul 8 2021, 4:38 PM

Could this be an attr.s instead of a bespoke class with slots?

mercurial/pure/parsers.py
47

Typo: this should be __slots__ (note missing s in submitted code). Please send a followup for that (or preferably replacing this bespoke object with an attr.s)

durin42 added a comment.Jul 8 2021, 5:24 PM

FYI: I did the followup as D11030 because I found myself with a few minutes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (31 lines)

Diff 28888

mercurial/pure/parsers.py

stringio = pycompat.bytesio stringio = pycompat.bytesio
_pack = struct.pack _pack = struct.pack
_unpack = struct.unpack _unpack = struct.unpack
_compress = zlib.compress _compress = zlib.compress
_decompress = zlib.decompress _decompress = zlib.decompress
# Some code below makes tuples directly because it's more convenient. However,
# code outside this module should always use dirstatetuple. class dirstatetuple(object):
def dirstatetuple(*x): """represent a dirstate entry
pulkitUnsubmitted
Not Done

s/represente/represent

pulkit: s/represente/represent
"""the four items are:
It contains:
pulkitUnsubmitted
Not Done

s/constains/contains

pulkit: s/constains/contains
- state (one of 'n', 'a', 'r', 'm') - state (one of 'n', 'a', 'r', 'm')
- mode, - mode,
- size, - size,
- mtime, - mtime,
""" """
# x is a tuple __slot__ = ('_state', '_mode', '_size', '_mtime')
durin42Unsubmitted
Not Done

Typo: this should be __slots__ (note missing s in submitted code). Please send a followup for that (or preferably replacing this bespoke object with an attr.s)

durin42: Typo: this should be `__slots__` (note missing `s` in submitted code). Please send a followup…
return x
def __init__(self, state, mode, size, mtime):
self._state = state
self._mode = mode
self._size = size
self._mtime = mtime
def __getitem__(self, idx):
if idx == 0 or idx == -4:
return self._state
elif idx == 1 or idx == -3:
return self._mode
elif idx == 2 or idx == -2:
return self._size
elif idx == 3 or idx == -1:
return self._mtime
else:
raise IndexError(idx)
def gettype(q): def gettype(q):
return int(q & 0xFFFF) return int(q & 0xFFFF)
class BaseIndexObject(object): class BaseIndexObject(object):
# Can I be passed to an algorithme implemented in Rust ? # Can I be passed to an algorithme implemented in Rust ?