comparison mercurial/dirstatemap.py @ 47970:7ab99007fce5

dirstate: move the copymap drop inside dropfile

Since the copymap is part of the dirstatemap it make more sense for the
dirstatemap to manage it directly.

This is part of a generic effort to move unified logic at lower level and to
clean up higher level API.

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

47969:87e3f878e65f

        previously recorded.
        """
        old_entry = self._map.pop(f, None)
        self._dirs_decr(f, old_entry=old_entry)
        self.nonnormalset.discard(f)
        return old_entry is not None

    def clearambiguoustimes(self, files, now):
        for f in files:
            e = self.get(f)

            self._rustmap.removefile(f, in_merge=True)

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

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

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

        def nonnormalentries(self):

47970:7ab99007fce5

        previously recorded.
        """
        old_entry = self._map.pop(f, None)
        self._dirs_decr(f, old_entry=old_entry)
        self.nonnormalset.discard(f)
        self.copymap.pop(f, None)
        return old_entry is not None

    def clearambiguoustimes(self, files, now):
        for f in files:
            e = self.get(f)

            self._rustmap.removefile(f, in_merge=True)

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

        def dropfile(self, f, *args, **kwargs):
            self._rustmap.copymap().pop(f, None)
            return self._rustmap.dropfile(f, *args, **kwargs)

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

        def nonnormalentries(self):