comparison mercurial/dirstatemap.py @ 48050:2ac0e6b23222

dirstate: Replace dropfile with drop_item_and_copy_source

Those removing a DirstateItem and a copy source are always done together

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

48049:29aa633815db

            # copy information are now outdated
            # (maybe new information should be in directly passed to this function)
            self.copymap.pop(filename, None)

            if not (p1_tracked or p2_tracked or wc_tracked):
                self.dropfile(filename)
            elif merged:
                # XXX might be merged and removed ?
                entry = self.get(filename)
                if entry is not None and entry.tracked:
                    # XXX mostly replicate dirstate.other parent.  We should get

            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):
            self._rustmap.copymap().pop(f, None)
            self._rustmap.dropfile(f, *args, **kwargs)

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

        def nonnormalentries(self):

48050:2ac0e6b23222

            # copy information are now outdated
            # (maybe new information should be in directly passed to this function)
            self.copymap.pop(filename, None)

            if not (p1_tracked or p2_tracked or wc_tracked):
                self._rustmap.drop_item_and_copy_source(filename)
            elif merged:
                # XXX might be merged and removed ?
                entry = self.get(filename)
                if entry is not None and entry.tracked:
                    # XXX mostly replicate dirstate.other parent.  We should get

            entry = self.get(f)
            if entry is None:
                return False
            else:
                if entry.added:
                    self._rustmap.drop_item_and_copy_source(f)
                else:
                    self._rustmap.removefile(f, in_merge=True)
                return True

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

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

        def nonnormalentries(self):