| 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 (16 lines) | |||
| M | mercurial/dirstatemap.py (2 lines) | |||
| M | mercurial/pure/parsers.py (8 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_merged(dirstateTupleObject *self) | |||||
| { | |||||
| if (self->state == 'm') { | |||||
| 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}, | |||||
| {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 */ | ||||
| return self._pl[1] != self._nodeconstants.nullid | return self._pl[1] != self._nodeconstants.nullid | ||||
| def branch(self): | def branch(self): | ||||
| return encoding.tolocal(self._branch) | return encoding.tolocal(self._branch) | ||||
| def setparents(self, p1, p2=None): | def setparents(self, p1, p2=None): | ||||
| """Set dirstate parents to p1 and p2. | """Set dirstate parents to p1 and p2. | ||||
| When moving from two parents to one, 'm' merged entries a | When moving from two parents to one, "merged" entries a | ||||
| adjusted to normal and previous copy records discarded and | adjusted to normal and previous copy records discarded and | ||||
| returned by the call. | returned by the call. | ||||
| See localrepo.setparents() | See localrepo.setparents() | ||||
| """ | """ | ||||
| if p2 is None: | if p2 is None: | ||||
| p2 = self._nodeconstants.nullid | p2 = self._nodeconstants.nullid | ||||
| if self._parentwriters == 0: | if self._parentwriters == 0: | ||||
| ): | ): | ||||
| candidatefiles = self._map.non_normal_or_other_parent_paths() | candidatefiles = self._map.non_normal_or_other_parent_paths() | ||||
| for f in candidatefiles: | for f in candidatefiles: | ||||
| s = self._map.get(f) | s = self._map.get(f) | ||||
| if s is None: | if s is None: | ||||
| continue | continue | ||||
| # Discard 'm' markers when moving away from a merge state | # Discard "merged" markers when moving away from a merge state | ||||
| if s.state == b'm': | if s.merged: | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if source: | if source: | ||||
| copies[f] = source | copies[f] = source | ||||
| self.normallookup(f) | self.normallookup(f) | ||||
| # Also fix up otherparent markers | # Also fix up otherparent markers | ||||
| elif s.state == b'n' and s[2] == FROM_P2: | elif s.state == b'n' and s[2] == FROM_P2: | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if source: | if source: | ||||
| # to make sure we won't miss future size-preserving file content | # to make sure we won't miss future size-preserving file content | ||||
| # modifications that happen within the same timeslot. | # modifications that happen within the same timeslot. | ||||
| self._lastnormaltime = mtime | self._lastnormaltime = mtime | ||||
| 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 | ||||
| # in state 'm' (-1) 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 entry[2] in (NONNORMAL, FROM_P2): | if entry.state == b'r' and entry[2] in (NONNORMAL, 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[2] == FROM_P2: | elif entry[2] == FROM_P2: | ||||
| self.otherparent(f) | self.otherparent(f) | ||||
| if source: | if source: | ||||
| self.copy(source, f) | self.copy(source, f) | ||||
| return | return | ||||
| if ( | if entry.merged or entry.state == b'n' and entry[2] == FROM_P2: | ||||
| entry.state == b'm' | |||||
| or entry.state == b'n' | |||||
| and entry[2] == FROM_P2 | |||||
| ): | |||||
| return | return | ||||
| self._addpath(f, b'n', 0, possibly_dirty=True) | self._addpath(f, b'n', 0, possibly_dirty=True) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def otherparent(self, f): | def otherparent(self, f): | ||||
| '''Mark as coming from the other parent, always dirty.''' | '''Mark as coming from the other parent, always dirty.''' | ||||
| if not self.in_merge: | if not self.in_merge: | ||||
| msg = _(b"setting %r to other parent only allowed in merges") % f | msg = _(b"setting %r to other parent only allowed in merges") % f | ||||
| elif st[stat.ST_MTIME] == lastnormaltime: | elif st[stat.ST_MTIME] == lastnormaltime: | ||||
| # fn may have just been marked as normal and it may have | # fn may have just been marked as normal and it may have | ||||
| # 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 state == b'm': | elif t.merged: | ||||
| madd(fn) | madd(fn) | ||||
| elif state == b'a': | elif state == b'a': | ||||
| aadd(fn) | aadd(fn) | ||||
| elif state == b'r': | elif state == b'r': | ||||
| radd(fn) | radd(fn) | ||||
| status = scmutil.status( | status = scmutil.status( | ||||
| modified, added, removed, deleted, unknown, ignored, clean | modified, added, removed, deleted, unknown, ignored, clean | ||||
| ) | ) | ||||
| size = 0 | size = 0 | ||||
| if in_merge: | if in_merge: | ||||
| # XXX we should not be able to have 'm' state and 'FROM_P2' if not | # XXX we should not be able to have 'm' state and 'FROM_P2' if not | ||||
| # during a merge. So I (marmoute) am not sure we need the | # during a merge. So I (marmoute) am not sure we need the | ||||
| # conditionnal at all. Adding double checking this with assert | # conditionnal at all. Adding double checking this with assert | ||||
| # would be nice. | # would be nice. | ||||
| if entry is not None: | if entry is not None: | ||||
| # backup the previous state | # backup the previous state | ||||
| if entry[0] == b'm': # merge | if entry.merged: # merge | ||||
| size = NONNORMAL | size = NONNORMAL | ||||
| elif entry[0] == b'n' and entry[2] == FROM_P2: # other parent | elif entry[0] == b'n' and entry[2] == FROM_P2: # other parent | ||||
| size = FROM_P2 | size = FROM_P2 | ||||
| self.otherparentset.add(f) | self.otherparentset.add(f) | ||||
| if size == 0: | if size == 0: | ||||
| self.copymap.pop(f, None) | self.copymap.pop(f, None) | ||||
| if entry is not None and entry[0] != b'r' and "_dirs" in self.__dict__: | if entry is not None and entry[0] != b'r' and "_dirs" in self.__dict__: | ||||
| a marked for addition | a marked for addition | ||||
| 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 | |||||
| def merged(self): | |||||
| """True if the file has been merged | |||||
| Should only be set if a merge is in progress in the dirstate | |||||
| """ | |||||
| return self._state == b'm' | |||||
| 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 | ||||