mercurial/dirstatemap.py

48147:142e9f0a70b5

        self._dirtyparents = True
        copies = {}
        if fold_p2:
            for f, s in pycompat.iteritems(self._map):
                # Discard "merged" markers when moving away from a merge state
                if s.merged or s.from_p2:
                    source = self.copymap.pop(f, None)
                    if source:
                        copies[f] = source
                    s.drop_merge_data()
        return copies

                # exception due to mutation during iteration.
                # TODO: move this the whole loop to Rust where `iter_mut`
                # enables in-place mutation of elements of a collection while
                # iterating it, without mutating the collection itself.
                files_with_p2_info = [
                    f for f, s in self._map.items() if s.merged or s.from_p2
                ]
                rust_map = self._map
                for f in files_with_p2_info:
                    e = rust_map.get(f)
                    source = self.copymap.pop(f, None)

48148:e2753a7acfa7

        self._dirtyparents = True
        copies = {}
        if fold_p2:
            for f, s in pycompat.iteritems(self._map):
                # Discard "merged" markers when moving away from a merge state
                if s.p2_info:
                    source = self.copymap.pop(f, None)
                    if source:
                        copies[f] = source
                    s.drop_merge_data()
        return copies

                # exception due to mutation during iteration.
                # TODO: move this the whole loop to Rust where `iter_mut`
                # enables in-place mutation of elements of a collection while
                # iterating it, without mutating the collection itself.
                files_with_p2_info = [
                    f for f, s in self._map.items() if s.p2_info
                ]
                rust_map = self._map
                for f in files_with_p2_info:
                    e = rust_map.get(f)
                    source = self.copymap.pop(f, None)