| Alphare |
| hg-reviewers |
All 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 (11 lines) |
| self._addpath(f, merged=True) | self._addpath(f, merged=True) | ||||
| else: | else: | ||||
| # add-like | # add-like | ||||
| self._addpath(f, from_p2=True) | self._addpath(f, from_p2=True) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def add(self, f): | def add(self, f): | ||||
| '''Mark a file added.''' | '''Mark a file added.''' | ||||
| if not self.pendingparentchange(): | if self.pendingparentchange(): | ||||
| util.nouideprecwarn( | util.nouideprecwarn( | ||||
| b"do not use `add` outside of update/merge context." | b"do not use `add` inside of update/merge context." | ||||
| b" Use `update_file`", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| else: | |||||
| util.nouideprecwarn( | |||||
| b"do not use `remove` outside of update/merge context." | |||||
| b" Use `set_tracked`", | b" Use `set_tracked`", | ||||
| b'6.0', | b'6.0', | ||||
| stacklevel=2, | stacklevel=2, | ||||
| ) | ) | ||||
| 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""" | ||||