| SimonSapin | |
| pulkit |
| hg-reviewers |
Lets use more semantic property instead of the state implementation details.
| 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_added(dirstateTupleObject *self) | |||||
| { | |||||
| if (self->state == 'a') { | |||||
| Py_RETURN_TRUE; | |||||
| } else { | |||||
| Py_RETURN_FALSE; | |||||
| } | |||||
| }; | |||||
| static PyObject *dirstatetuple_get_merged(dirstateTupleObject *self) | static PyObject *dirstatetuple_get_merged(dirstateTupleObject *self) | ||||
| { | { | ||||
| if (self->state == 'm') { | if (self->state == 'm') { | ||||
| 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}, | ||||
| {"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}, | ||||
| {NULL} /* Sentinel */ | {NULL} /* Sentinel */ | ||||
| # changed in the same second without changing its size. | # changed in the same second without changing its size. | ||||
| # This can happen if we quickly do multiple commits. | # This can happen if we quickly do multiple commits. | ||||
| # Force lookup, so we don't miss such a racy file change. | # Force lookup, so we don't miss such a racy file change. | ||||
| ladd(fn) | ladd(fn) | ||||
| elif listclean: | elif listclean: | ||||
| cadd(fn) | cadd(fn) | ||||
| elif t.merged: | elif t.merged: | ||||
| madd(fn) | madd(fn) | ||||
| elif state == b'a': | elif t.added: | ||||
| aadd(fn) | aadd(fn) | ||||
| elif t.removed: | elif t.removed: | ||||
| radd(fn) | radd(fn) | ||||
| status = scmutil.status( | status = scmutil.status( | ||||
| modified, added, removed, deleted, unknown, ignored, clean | modified, added, removed, deleted, unknown, ignored, clean | ||||
| ) | ) | ||||
| return (lookup, status) | return (lookup, status) | ||||
| 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 added(self): | |||||
| """True if the file has been added""" | |||||
| return self._state == b'a' | |||||
| @property | |||||
| def merged(self): | def merged(self): | ||||
| """True if the file has been merged | """True if the file has been merged | ||||
| Should only be set if a merge is in progress in the dirstate | Should only be set if a merge is in progress in the dirstate | ||||
| """ | """ | ||||
| return self._state == b'm' | return self._state == b'm' | ||||
| @property | @property | ||||