comparison mercurial/dirstatemap.py @ 47535:6025353c9c55

dirstate: no longer pass `oldstate` to the `dropfile`

The `oldstate` value come literally from `_map` so we don't need to pass tha
information along.

Differential Revision: https://phab.mercurial-scm.org/D10978

47534:e53a42dce923

            normed = util.normcase(f)
            self.filefoldmap.pop(normed, None)
        self._map[f] = dirstatetuple(b'r', 0, size, 0)
        self.nonnormalset.add(f)

    def dropfile(self, f, oldstate):
        """
        Remove a file from the dirstate.  Returns True if the file was
        previously recorded.
        """
        exists = self._map.pop(f, None) is not None
        if exists:
            if oldstate != b"r" and "_dirs" in self.__dict__:
                self._dirs.delpath(f)
            if "_alldirs" in self.__dict__:
                self._alldirs.delpath(f)

47535:6025353c9c55

            normed = util.normcase(f)
            self.filefoldmap.pop(normed, None)
        self._map[f] = dirstatetuple(b'r', 0, size, 0)
        self.nonnormalset.add(f)

    def dropfile(self, f):
        """
        Remove a file from the dirstate.  Returns True if the file was
        previously recorded.
        """
        old_entry = self._map.pop(f, None)
        exists = False
        oldstate = b'?'
        if old_entry is not None:
            exists = True
            oldstate = old_entry.state
        if exists:
            if oldstate != b"r" and "_dirs" in self.__dict__:
                self._dirs.delpath(f)
            if "_alldirs" in self.__dict__:
                self._alldirs.delpath(f)