| SimonSapin | |
| pulkit |
| hg-reviewers |
This abstract the individual state value and has a clear semantic.
| 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 (10 lines) | |||
| M | mercurial/dirstate.py (2 lines) | |||
| M | mercurial/pure/parsers.py (5 lines) |
| {NULL} /* Sentinel */ | {NULL} /* Sentinel */ | ||||
| }; | }; | ||||
| 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) | |||||
| { | |||||
| if (self->state == 'a' || self->state == 'm' || self->state == 'n') { | |||||
| Py_RETURN_TRUE; | |||||
| } else { | |||||
| Py_RETURN_FALSE; | |||||
| } | |||||
| }; | |||||
| static PyObject *dirstatetuple_get_added(dirstateTupleObject *self) | static PyObject *dirstatetuple_get_added(dirstateTupleObject *self) | ||||
| { | { | ||||
| if (self->state == 'a') { | if (self->state == 'a') { | ||||
| Py_RETURN_TRUE; | Py_RETURN_TRUE; | ||||
| } else { | } else { | ||||
| Py_RETURN_FALSE; | Py_RETURN_FALSE; | ||||
| } | } | ||||
| }; | }; | ||||
| Py_RETURN_TRUE; | Py_RETURN_TRUE; | ||||
| } else { | } else { | ||||
| Py_RETURN_FALSE; | Py_RETURN_FALSE; | ||||
| } | } | ||||
| }; | }; | ||||
| static PyGetSetDef dirstatetuple_getset[] = { | static PyGetSetDef dirstatetuple_getset[] = { | ||||
| {"state", (getter)dirstatetuple_get_state, NULL, "state", NULL}, | {"state", (getter)dirstatetuple_get_state, NULL, "state", 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}, | ||||
| {"from_p2", (getter)dirstatetuple_get_from_p2, NULL, "from_p2", NULL}, | {"from_p2", (getter)dirstatetuple_get_from_p2, NULL, "from_p2", NULL}, | ||||
| {"removed", (getter)dirstatetuple_get_removed, NULL, "removed", NULL}, | {"removed", (getter)dirstatetuple_get_removed, NULL, "removed", NULL}, | ||||
| # 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) | ||||
| state = t.state | state = t.state | ||||
| mode = t[1] | mode = t[1] | ||||
| size = t[2] | size = t[2] | ||||
| time = t[3] | time = t[3] | ||||
| if not st and state in b"nma": | if not st and t.tracked: | ||||
| dadd(fn) | dadd(fn) | ||||
| elif state == b'n': | elif state == b'n': | ||||
| if ( | if ( | ||||
| size >= 0 | size >= 0 | ||||
| and ( | and ( | ||||
| (size != st.st_size and size != st.st_size & _rangemask) | (size != st.st_size and size != st.st_size & _rangemask) | ||||
| or ((mode ^ st.st_mode) & 0o100 and checkexec) | or ((mode ^ st.st_mode) & 0o100 and checkexec) | ||||
| ) | ) | ||||
| XXX This "state" is a bit obscure and mostly a direct expression of the | XXX This "state" is a bit obscure and mostly a direct expression of the | ||||
| dirstatev1 format. It would make sense to ultimately deprecate it in | dirstatev1 format. It would make sense to ultimately deprecate it in | ||||
| favor of the more "semantic" attributes. | favor of the more "semantic" attributes. | ||||
| """ | """ | ||||
| return self._state | return self._state | ||||
| @property | @property | ||||
| def tracked(self): | |||||
| """True is the file is tracked in the working copy""" | |||||
| return self._state in b"nma" | |||||
| @property | |||||
| def added(self): | def added(self): | ||||
| """True if the file has been added""" | """True if the file has been added""" | ||||
| return self._state == b'a' | return self._state == b'a' | ||||
| @property | @property | ||||
| def merged(self): | def merged(self): | ||||
| """True if the file has been merged | """True if the file has been merged | ||||