| SimonSapin | |
| pulkit |
| hg-reviewers |
This is shorter and simpler to read.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (5 lines) |
| if entry[0] == b'm' or entry[0] == b'n' and entry[2] == -2: | if entry[0] == b'm' or entry[0] == b'n' and entry[2] == -2: | ||||
| return | return | ||||
| self._addpath(f, b'n', 0, -1, -1) | self._addpath(f, b'n', 0, -1, -1) | ||||
| 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 self._pl[1] == self._nodeconstants.nullid: | if self._pl[1] == self._nodeconstants.nullid: | ||||
| raise error.Abort( | msg = _(b"setting %r to other parent only allowed in merges") % f | ||||
| _(b"setting %r to other parent only allowed in merges") % f | raise error.Abort(msg) | ||||
| ) | |||||
| if f in self and self[f] == b'n': | if f in self and self[f] == b'n': | ||||
| # merge-like | # merge-like | ||||
| self._addpath(f, b'm', 0, -2, -1) | self._addpath(f, b'm', 0, -2, -1) | ||||
| else: | else: | ||||
| # add-like | # add-like | ||||
| self._addpath(f, b'n', 0, -2, -1) | self._addpath(f, b'n', 0, -2, -1) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||