( )⚙ D10980 dirstate-entry: add a `size` property

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10980

dirstate-entry: add a `size` property
ClosedPublic

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

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0e5800c88eb4: dirstate-entry: add a `size` property
Summary

This is clearer than "tuple" indexing.

Diff Detail

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

Event Timeline

marmoute created this revision.Jul 4 2021, 5:52 PM
SimonSapin accepted this revision.Jul 5 2021, 1:26 AM
baymax updated this revision to Diff 28882.Jul 6 2021, 2:09 PM

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

pulkit accepted this revision.Jul 6 2021, 3:11 PM
This revision is now accepted and ready to land.Jul 6 2021, 3:11 PM
marmoute added a commit: rHG0e5800c88eb4: dirstate-entry: add a `size` property.Jul 6 2021, 3:42 PM
Closed by commit rHG0e5800c88eb4: dirstate-entry: add a `size` property (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28882

mercurial/cext/parsers.c

{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
static PyObject *dirstatetuple_get_mode(dirstateTupleObject *self) static PyObject *dirstatetuple_get_mode(dirstateTupleObject *self)
{ {
return PyInt_FromLong(self->mode); return PyInt_FromLong(self->mode);
}; };
static PyObject *dirstatetuple_get_size(dirstateTupleObject *self)
{
return PyInt_FromLong(self->size);
};
static PyObject *dirstatetuple_get_state(dirstateTupleObject *self) static PyObject *dirstatetuple_get_state(dirstateTupleObject *self)
{ {
return PyBytes_FromStringAndSize(&self->state, 1); return PyBytes_FromStringAndSize(&self->state, 1);
}; };
static PyObject *dirstatetuple_get_tracked(dirstateTupleObject *self) static PyObject *dirstatetuple_get_tracked(dirstateTupleObject *self)
{ {
if (self->state == 'a' || self->state == 'm' || self->state == 'n') { if (self->state == 'a' || self->state == 'm' || self->state == 'n') {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyGetSetDef dirstatetuple_getset[] = { static PyGetSetDef dirstatetuple_getset[] = {
{"mode", (getter)dirstatetuple_get_mode, NULL, "mode", NULL}, {"mode", (getter)dirstatetuple_get_mode, NULL, "mode", NULL},
{"size", (getter)dirstatetuple_get_size, NULL, "size", NULL},
{"state", (getter)dirstatetuple_get_state, NULL, "state", NULL}, {"state", (getter)dirstatetuple_get_state, NULL, "state", NULL},
{"tracked", (getter)dirstatetuple_get_tracked, NULL, "tracked", NULL}, {"tracked", (getter)dirstatetuple_get_tracked, NULL, "tracked", NULL},
{"added", (getter)dirstatetuple_get_added, NULL, "added", NULL}, {"added", (getter)dirstatetuple_get_added, NULL, "added", NULL},
{"merged_removed", (getter)dirstatetuple_get_merged_removed, NULL, {"merged_removed", (getter)dirstatetuple_get_merged_removed, NULL,
"merged_removed", NULL}, "merged_removed", NULL},
{"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL}, {"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL},
{"from_p2_removed", (getter)dirstatetuple_get_from_p2_removed, NULL, {"from_p2_removed", (getter)dirstatetuple_get_from_p2_removed, NULL,
"from_p2_removed", NULL}, "from_p2_removed", NULL},

mercurial/dirstate.py

# written like that for performance reasons. dmap[fn] is not a # written like that for performance reasons. dmap[fn] is not a
# Python tuple in compiled builds. The CPython UNPACK_SEQUENCE # Python tuple in compiled builds. The CPython UNPACK_SEQUENCE
# opcode has fast paths when the value to be unpacked is a tuple or # opcode has fast paths when the value to be unpacked is a tuple or
# a list, but falls back to creating a full-fledged iterator in # a list, but falls back to creating a full-fledged iterator in
# general. That is much slower than simply accessing and storing the # general. That is much slower than simply accessing and storing the
# tuple members one by one. # tuple members one by one.
t = dget(fn) t = dget(fn)
mode = t.mode mode = t.mode
size = t[2] size = t.size
time = t[3] time = t[3]
if not st and t.tracked: if not st and t.tracked:
dadd(fn) dadd(fn)
elif t.merged: elif t.merged:
madd(fn) madd(fn)
elif t.added: elif t.added:
aadd(fn) aadd(fn)

mercurial/pure/parsers.py

else: else:
raise IndexError(idx) raise IndexError(idx)
@property @property
def mode(self): def mode(self):
return self._mode return self._mode
@property @property
def size(self):
return self._size
@property
def state(self): def state(self):
""" """
States are: States are:
n normal n normal
m needs merging m needs merging
r marked for removal r marked for removal
a marked for addition a marked for addition