| Alphare | |
| pulkit |
| hg-reviewers |
All core users have been migrated.
| 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 (7 lines) |
| 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(): | |||||
| util.nouideprecwarn( | |||||
| b"do not use `drop` outside of update/merge context." | |||||
| b" Use `set_untracked`", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| self._drop(f) | self._drop(f) | ||||
| def _drop(self, filename): | def _drop(self, filename): | ||||
| """internal function to drop a file from the dirstate""" | """internal function to drop a file from the dirstate""" | ||||
| if self._map.dropfile(filename): | if self._map.dropfile(filename): | ||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(filename) | self._updatedfiles.add(filename) | ||||
| self._map.copymap.pop(filename, None) | self._map.copymap.pop(filename, None) | ||||