comparison mercurial/dirstatemap.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

            self.otherparentset.discard(filename)
        self._map[filename] = entry

    def set_untracked(self, f):
        """Mark a file as no longer tracked in the dirstate map"""
        entry = self[f]
        self._dirs_decr(f, old_entry=entry, remove_variant=True)
        if entry.from_p2:
            self.otherparentset.add(f)
        elif not entry.merged:
            self.copymap.pop(f, None)
        entry.set_untracked()
        self.nonnormalset.add(f)

    def dropfile(self, f):
        """
        Remove a file from the dirstate.  Returns True if the file was
        previously recorded.

            """Mark a file as no longer tracked in the dirstate map"""
            # in merge is only trigger more logic, so it "fine" to pass it.
            #
            # the inner rust dirstate map code need to be adjusted once the API
            # for dirstate/dirstatemap/DirstateItem is a bit more settled
            self._rustmap.removefile(f, in_merge=True)

        def removefile(self, *args, **kwargs):
            return self._rustmap.removefile(*args, **kwargs)

        def dropfile(self, f, *args, **kwargs):

47972:5a6c1ef4bcac

            self.otherparentset.discard(filename)
        self._map[filename] = entry

    def set_untracked(self, f):
        """Mark a file as no longer tracked in the dirstate map"""
        entry = self.get(f)
        if entry is None:
            return False
        else:
            self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
            if not entry.merged:
                self.copymap.pop(f, None)
            if entry.added:
                self.nonnormalset.discard(f)
                self._map.pop(f, None)
            else:
                self.nonnormalset.add(f)
                if entry.from_p2:
                    self.otherparentset.add(f)
                entry.set_untracked()
            return True

    def dropfile(self, f):
        """
        Remove a file from the dirstate.  Returns True if the file was
        previously recorded.

            """Mark a file as no longer tracked in the dirstate map"""
            # in merge is only trigger more logic, so it "fine" to pass it.
            #
            # the inner rust dirstate map code need to be adjusted once the API
            # for dirstate/dirstatemap/DirstateItem is a bit more settled
            entry = self.get(f)
            if entry is None:
                return False
            else:
                if entry.added:
                    self._rustmap.copymap().pop(f, None)
                    self._rustmap.dropfile(f)
                else:
                    self._rustmap.removefile(f, in_merge=True)
                return True

        def removefile(self, *args, **kwargs):
            return self._rustmap.removefile(*args, **kwargs)

        def dropfile(self, f, *args, **kwargs):