| Alphare |
| hg-reviewers |
All code have been migrated to the new APIs.
| 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 (21 lines) |
| if entry is not None: | if entry is not None: | ||||
| # XXX this should probably be dealt with a a lower level | # XXX this should probably be dealt with a a lower level | ||||
| # (see `merged_removed` and `from_p2_removed`) | # (see `merged_removed` and `from_p2_removed`) | ||||
| if entry.merged_removed or entry.from_p2_removed: | if entry.merged_removed or entry.from_p2_removed: | ||||
| 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.from_p2: | elif entry.merged or entry.from_p2: | ||||
| return | return | ||||
| self._addpath(f, possibly_dirty=True) | self._addpath(f, 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 self.pendingparentchange(): | |||||
| util.nouideprecwarn( | |||||
| b"do not use `otherparent` inside of update/merge context." | |||||
| b" Use `update_file` or `update_file_p1`", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| else: | |||||
| util.nouideprecwarn( | |||||
| b"do not use `otherparent` outside of update/merge context." | |||||
| b"It should have been set by the update/merge code", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| self._otherparent(f) | |||||
| def _otherparent(self, f): | |||||
| 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 | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| entry = self._map.get(f) | entry = self._map.get(f) | ||||
| if entry is not None and entry.tracked: | if entry is not None and entry.tracked: | ||||
| # merge-like | # merge-like | ||||
| self._addpath(f, merged=True) | self._addpath(f, merged=True) | ||||
| else: | else: | ||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(filename) | self._updatedfiles.add(filename) | ||||
| self._map.removefile(filename, in_merge=self.in_merge) | self._map.removefile(filename, in_merge=self.in_merge) | ||||
| def merge(self, f): | def merge(self, f): | ||||
| '''Mark a file merged.''' | '''Mark a file merged.''' | ||||
| if not self.in_merge: | if not self.in_merge: | ||||
| return self._normallookup(f) | return self._normallookup(f) | ||||
| return self.otherparent(f) | return self._otherparent(f) | ||||
| def drop(self, f): | def drop(self, f): | ||||
| '''Drop a file from the dirstate''' | '''Drop a file from the dirstate''' | ||||
| if not self.pendingparentchange(): | if not self.pendingparentchange(): | ||||
| util.nouideprecwarn( | util.nouideprecwarn( | ||||
| b"do not use `drop` outside of update/merge context." | b"do not use `drop` outside of update/merge context." | ||||
| b" Use `set_untracked`", | b" Use `set_untracked`", | ||||
| b'6.0', | b'6.0', | ||||