mercurial/dirstate.py

47945:8e46934c58d2

    def _merge(self, f):
        if not self.in_merge:
            return self._normallookup(f)
        return self._otherparent(f)

    def drop(self, f):
        '''Drop a file from the dirstate'''
        if self.pendingparentchange():
            util.nouideprecwarn(
                b"do not use `drop` inside of update/merge context."
                b" Use `update_file`",
                b'6.0',
                stacklevel=2,
            )
        else:
            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):
            self._dirty = True

47946:51cd60c0a345

    def _merge(self, f):
        if not self.in_merge:
            return self._normallookup(f)
        return self._otherparent(f)

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