| SimonSapin | |
| pulkit |
| hg-reviewers |
Lets start to define and use more semantic property.
| 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 (8 lines) | |||
| M | mercurial/pure/parsers.py (5 lines) |
| { | { | ||||
| if (self->size == dirstate_v1_from_p2) { | if (self->size == dirstate_v1_from_p2) { | ||||
| Py_RETURN_TRUE; | Py_RETURN_TRUE; | ||||
| } else { | } else { | ||||
| Py_RETURN_FALSE; | Py_RETURN_FALSE; | ||||
| } | } | ||||
| }; | }; | ||||
| static PyObject *dirstatetuple_get_removed(dirstateTupleObject *self) | |||||
| { | |||||
| if (self->state == 'r') { | |||||
| Py_RETURN_TRUE; | |||||
| } else { | |||||
| 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}, | ||||
| {"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL}, | {"merged", (getter)dirstatetuple_get_merged, NULL, "merged", 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}, | |||||
| {NULL} /* Sentinel */ | {NULL} /* Sentinel */ | ||||
| }; | }; | ||||
| PyTypeObject dirstateTupleType = { | PyTypeObject dirstateTupleType = { | ||||
| PyVarObject_HEAD_INIT(NULL, 0) /* header */ | PyVarObject_HEAD_INIT(NULL, 0) /* header */ | ||||
| "dirstate_tuple", /* tp_name */ | "dirstate_tuple", /* tp_name */ | ||||
| sizeof(dirstateTupleObject), /* tp_basicsize */ | sizeof(dirstateTupleObject), /* tp_basicsize */ | ||||
| 0, /* tp_itemsize */ | 0, /* tp_itemsize */ | ||||
| msg = _(b'directory %r already in dirstate') | msg = _(b'directory %r already in dirstate') | ||||
| msg %= pycompat.bytestr(f) | msg %= pycompat.bytestr(f) | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| # shadows | # shadows | ||||
| for d in pathutil.finddirs(f): | for d in pathutil.finddirs(f): | ||||
| if self._map.hastrackeddir(d): | if self._map.hastrackeddir(d): | ||||
| break | break | ||||
| entry = self._map.get(d) | entry = self._map.get(d) | ||||
| if entry is not None and entry.state != b'r': | if entry is not None and not entry.removed: | ||||
| msg = _(b'file %r in dirstate clashes with %r') | msg = _(b'file %r in dirstate clashes with %r') | ||||
| msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) | msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| if state == b'a': | if state == b'a': | ||||
| assert not possibly_dirty | assert not possibly_dirty | ||||
| assert not from_p2 | assert not from_p2 | ||||
| size = NONNORMAL | size = NONNORMAL | ||||
| mtime = AMBIGUOUS_TIME | mtime = AMBIGUOUS_TIME | ||||
| def normallookup(self, f): | def normallookup(self, f): | ||||
| '''Mark a file normal, but possibly dirty.''' | '''Mark a file normal, but possibly dirty.''' | ||||
| if self.in_merge: | if self.in_merge: | ||||
| # if there is a merge going on and the file was either | # if there is a merge going on and the file was either | ||||
| # "merged" or coming from other parent (-2) before | # "merged" or coming from other parent (-2) before | ||||
| # being removed, restore that state. | # being removed, restore that state. | ||||
| entry = self._map.get(f) | entry = self._map.get(f) | ||||
| if entry is not None: | if entry is not None: | ||||
| if entry.state == b'r' and ( | if entry.removed and (entry[2] == NONNORMAL or entry.from_p2): | ||||
| entry[2] == NONNORMAL or entry.from_p2 | |||||
| ): | |||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if entry[2] == NONNORMAL: | if entry[2] == NONNORMAL: | ||||
| self.merge(f) | self.merge(f) | ||||
| elif entry.from_p2: | elif entry.from_p2: | ||||
| self.otherparent(f) | self.otherparent(f) | ||||
| if source: | if source: | ||||
| self.copy(source, f) | self.copy(source, f) | ||||
| return | return | ||||
| # 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 state == b'a': | ||||
| aadd(fn) | aadd(fn) | ||||
| elif state == b'r': | 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) | ||||
| def matches(self, match): | def matches(self, match): | ||||
| """ | """ | ||||
| @property | @property | ||||
| def from_p2(self): | def from_p2(self): | ||||
| """True if the file have been fetched from p2 during the current merge | """True if the file have been fetched from p2 during the current merge | ||||
| 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._size == FROM_P2 | return self._size == FROM_P2 | ||||
| @property | |||||
| def removed(self): | |||||
| """True if the file has been removed""" | |||||
| return self._state == b'r' | |||||
| def v1_state(self): | def v1_state(self): | ||||
| """return a "state" suitable for v1 serialization""" | """return a "state" suitable for v1 serialization""" | ||||
| return self._state | return self._state | ||||
| def v1_mode(self): | def v1_mode(self): | ||||
| """return a "mode" suitable for v1 serialization""" | """return a "mode" suitable for v1 serialization""" | ||||
| return self._mode | return self._mode | ||||