Mercurial > hg
comparison mercurial/dirstate.py @ 47889:6614ab9f061d
dirstate: forward `remove` call to newer `API`
The `_remove` method was only called in the deprecated `remove` function. We
merge the two and express it in terms of call to new API methods.
Differential Revision: https://phab.mercurial-scm.org/D11314
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Aug 2021 11:23:52 +0200 |
parents | 1c797757f5bb |
children | 3853e6ee160d |
comparison
equal
deleted
inserted
replaced
47878:31a72e5e9200 | 47889:6614ab9f061d |
---|---|
856 b"do not use `remove` outside of update/merge context." | 856 b"do not use `remove` outside of update/merge context." |
857 b" Use `set_untracked`", | 857 b" Use `set_untracked`", |
858 b'6.0', | 858 b'6.0', |
859 stacklevel=2, | 859 stacklevel=2, |
860 ) | 860 ) |
861 self._remove(f) | |
862 | |
863 def _remove(self, filename): | |
864 """internal function to mark a file removed""" | |
865 self._dirty = True | 861 self._dirty = True |
866 self._updatedfiles.add(filename) | 862 self._updatedfiles.add(f) |
867 self._map.removefile(filename, in_merge=self.in_merge) | 863 entry = self._map.get(f) |
864 if entry is None: | |
865 # Assuming we are in a update/merge case | |
866 self.update_file(f, p1_tracked=True, wc_tracked=False) | |
867 else: | |
868 self.set_untracked(f) | |
868 | 869 |
869 def merge(self, f): | 870 def merge(self, f): |
870 '''Mark a file merged.''' | 871 '''Mark a file merged.''' |
871 if self.pendingparentchange(): | 872 if self.pendingparentchange(): |
872 util.nouideprecwarn( | 873 util.nouideprecwarn( |