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

47878:31a72e5e9200

                b"do not use `remove` outside of update/merge context."
                b" Use `set_untracked`",
                b'6.0',
                stacklevel=2,
            )
        self._remove(f)

    def _remove(self, filename):
        """internal function to mark a file removed"""
        self._dirty = True
        self._updatedfiles.add(filename)
        self._map.removefile(filename, in_merge=self.in_merge)

    def merge(self, f):
        '''Mark a file merged.'''
        if self.pendingparentchange():
            util.nouideprecwarn(

47889:6614ab9f061d

                b"do not use `remove` outside of update/merge context."
                b" Use `set_untracked`",
                b'6.0',
                stacklevel=2,
            )
        self._dirty = True
        self._updatedfiles.add(f)
        entry = self._map.get(f)
        if entry is None:
            # Assuming we are in a update/merge case
            self.update_file(f, p1_tracked=True, wc_tracked=False)
        else:
            self.set_untracked(f)

    def merge(self, f):
        '''Mark a file merged.'''
        if self.pendingparentchange():
            util.nouideprecwarn(