comparison mercurial/dirstate.py @ 47972:5a6c1ef4bcac

dirstate: make dirstatemap.set_untracked deal with added file

This merge dropfile in set_untracked.

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

47971:c0157aca5bf5

        This function is to be called outside of "update/merge" case. For
        example by a command like `hg remove X`.

        return True the file was previously tracked, False otherwise.
        """
        entry = self._map.get(filename)
        if entry is None:
            return False
        else:
            self._dirty = True
            self._updatedfiles.add(filename)
            if entry.added:
                self._map.dropfile(filename)
            else:
                self._map.set_untracked(filename)
            return True

    @requires_no_parents_change
    def set_clean(self, filename, parentfiledata=None):
        """record that the current state of the file on disk is known to be clean"""
        self._dirty = True

47972:5a6c1ef4bcac

        This function is to be called outside of "update/merge" case. For
        example by a command like `hg remove X`.

        return True the file was previously tracked, False otherwise.
        """
        ret = self._map.set_untracked(filename)
        if ret:
            self._dirty = True
            self._updatedfiles.add(filename)
        return ret

    @requires_no_parents_change
    def set_clean(self, filename, parentfiledata=None):
        """record that the current state of the file on disk is known to be clean"""
        self._dirty = True