| Alphare |
| hg-reviewers |
We want to split current user of dirstate.remove between hg rm-like cases and
update of the dirstate coming from update/merge.
To do this we will introduce new API. The first step is to introduces an
internal function that these new API migh use (or not use) to distinct between
the migrated users and the others.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
✅ refresh by Heptapod after a successful CI run (🐙 💚)
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (10 lines) |
| self._add(f) | self._add(f) | ||||
| def _add(self, filename): | def _add(self, filename): | ||||
| """internal function to mark a file as added""" | """internal function to mark a file as added""" | ||||
| self._addpath(filename, added=True) | self._addpath(filename, added=True) | ||||
| self._map.copymap.pop(filename, None) | self._map.copymap.pop(filename, None) | ||||
| def remove(self, f): | def remove(self, f): | ||||
| '''Mark a file removed.''' | '''Mark a file removed''' | ||||
| self._remove(f) | |||||
| def _remove(self, filename): | |||||
| """internal function to mark a file removed""" | |||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(f) | self._updatedfiles.add(filename) | ||||
| self._map.removefile(f, 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): | ||||