| SimonSapin | |
| pulkit |
| hg-reviewers |
The other case is now handled in from_p2_removed, and should ideally be moved
to a lower level. So we can drop the state == 'n' narrowing and move it in the
property itself.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cext/parsers.c (2 lines) | |||
| M | mercurial/dirstate.py (4 lines) | |||
| M | mercurial/pure/parsers.py (4 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 88bc94630c03 | 973f848667a0 | Pierre-Yves David | Jul 3 2021, 7:14 PM |
| Py_RETURN_TRUE; | Py_RETURN_TRUE; | ||||
| } else { | } else { | ||||
| Py_RETURN_FALSE; | Py_RETURN_FALSE; | ||||
| } | } | ||||
| }; | }; | ||||
| static PyObject *dirstatetuple_get_from_p2(dirstateTupleObject *self) | static PyObject *dirstatetuple_get_from_p2(dirstateTupleObject *self) | ||||
| { | { | ||||
| if (self->size == dirstate_v1_from_p2) { | if (self->state == 'n' && self->size == dirstate_v1_from_p2) { | ||||
| Py_RETURN_TRUE; | Py_RETURN_TRUE; | ||||
| } else { | } else { | ||||
| Py_RETURN_FALSE; | Py_RETURN_FALSE; | ||||
| } | } | ||||
| }; | }; | ||||
| static PyObject *dirstatetuple_get_from_p2_removed(dirstateTupleObject *self) | static PyObject *dirstatetuple_get_from_p2_removed(dirstateTupleObject *self) | ||||
| { | { | ||||
| # Discard "merged" markers when moving away from a merge state | # Discard "merged" markers when moving away from a merge state | ||||
| if s.merged: | 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.from_p2: | elif s.from_p2: | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if source: | if source: | ||||
| copies[f] = source | copies[f] = source | ||||
| self.add(f) | self.add(f) | ||||
| return copies | return copies | ||||
| def setbranch(self, branch): | def setbranch(self, branch): | ||||
| self.__class__._branch.set(self, encoding.fromlocal(branch)) | self.__class__._branch.set(self, encoding.fromlocal(branch)) | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if entry.merged_removed: | if entry.merged_removed: | ||||
| self.merge(f) | self.merge(f) | ||||
| elif entry.from_p2_removed: | elif entry.from_p2_removed: | ||||
| self.otherparent(f) | self.otherparent(f) | ||||
| if source is not None: | if source is not None: | ||||
| self.copy(source, f) | self.copy(source, f) | ||||
| return | return | ||||
| elif entry.merged or entry.state == b'n' and entry.from_p2: | elif entry.merged or entry.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 | ||||
| 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 | ||||
| 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 | ||||
| This is only True is the file is currently tracked. | |||||
| 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._state == b'n' and self._size == FROM_P2 | ||||
| @property | @property | ||||
| def from_p2_removed(self): | def from_p2_removed(self): | ||||
| """True if the file has been removed, but was merged initially | """True if the file has been removed, but was merged initially | ||||
| This property seems like an attraction leakage and should probably be | This property seems like an attraction leakage and should probably be | ||||
| dealt in this class (or maybe the dirstatemap one directly. | dealt in this class (or maybe the dirstatemap one directly. | ||||
| """ | """ | ||||