| SimonSapin | |
| pulkit |
| hg-reviewers |
This is clearer than "tuple" indexing.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cext/parsers.c (6 lines) | |||
| M | mercurial/dirstate.py (2 lines) | |||
| M | mercurial/pure/parsers.py (4 lines) |
| "return a \"size\" suitable for v1 serialization"}, | "return a \"size\" suitable for v1 serialization"}, | ||||
| {"v1_mtime", (PyCFunction)dirstatetuple_v1_mtime, METH_NOARGS, | {"v1_mtime", (PyCFunction)dirstatetuple_v1_mtime, METH_NOARGS, | ||||
| "return a \"mtime\" suitable for v1 serialization"}, | "return a \"mtime\" suitable for v1 serialization"}, | ||||
| {"need_delay", (PyCFunction)dirstatetuple_need_delay, METH_O, | {"need_delay", (PyCFunction)dirstatetuple_need_delay, METH_O, | ||||
| "True if the stored mtime would be ambiguous with the current time"}, | "True if the stored mtime would be ambiguous with the current time"}, | ||||
| {NULL} /* Sentinel */ | {NULL} /* Sentinel */ | ||||
| }; | }; | ||||
| static PyObject *dirstatetuple_get_mode(dirstateTupleObject *self) | |||||
| { | |||||
| return PyInt_FromLong(self->mode); | |||||
| }; | |||||
| 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') { | ||||
| if (self->state == 'r') { | if (self->state == 'r') { | ||||
| 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}, | |||||
| {"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}, | ||||
| # This is equivalent to 'state, mode, size, time = dmap[fn]' but not | # This is equivalent to 'state, mode, size, time = dmap[fn]' but not | ||||
| # 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[1] | mode = t.mode | ||||
| size = t[2] | size = t[2] | ||||
| 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: | ||||
| elif idx == 2 or idx == -2: | elif idx == 2 or idx == -2: | ||||
| return self._size | return self._size | ||||
| elif idx == 3 or idx == -1: | elif idx == 3 or idx == -1: | ||||
| return self._mtime | return self._mtime | ||||
| else: | else: | ||||
| raise IndexError(idx) | raise IndexError(idx) | ||||
| @property | @property | ||||
| def mode(self): | |||||
| return self._mode | |||||
| @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 | ||||