mercurial/dirstate.py

47662:1a79bb8c572c

            return self.normallookup(f)
        return self.otherparent(f)

    def drop(self, f):
        '''Drop a file from the dirstate'''
        self._drop(f)

    def _drop(self, filename):
        """internal function to drop a file from the dirstate"""
        if self._map.dropfile(filename):

47663:6f8d6dd32e61

            return self.normallookup(f)
        return self.otherparent(f)

    def drop(self, f):
        '''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)

    def _drop(self, filename):
        """internal function to drop a file from the dirstate"""
        if self._map.dropfile(filename):