/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/bzr/knitpack_repo.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-28 02:47:10 UTC
  • mfrom: (7519.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200728024710-a2ylds219f1lsl62
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/388173

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/knitpack_repo.py
16
16
 
17
17
"""Knit-based pack repository formats."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
from .. import (
22
20
    errors,
23
21
    )
70
68
    PackRepository,
71
69
    RepositoryPackCollection,
72
70
    )
73
 
from ..sixish import (
74
 
    viewitems,
75
 
    zip
76
 
    )
77
71
from ..bzr.vf_repository import (
78
72
    StreamSource,
79
73
    )
653
647
            request_groups[index].append((key, value))
654
648
        record_index = 0
655
649
        pb.update("Copied record", record_index, len(nodes))
656
 
        for index, items in viewitems(request_groups):
 
650
        for index, items in request_groups.items():
657
651
            pack_readv_requests = []
658
652
            for key, value in items:
659
653
                # ---- KnitGraphIndex.get_position
745
739
        fileid_revisions = repo._find_file_ids_from_xml_inventory_lines(
746
740
            inv_lines, self.revision_keys)
747
741
        text_filter = []
748
 
        for fileid, file_revids in viewitems(fileid_revisions):
 
742
        for fileid, file_revids in fileid_revisions.items():
749
743
            text_filter.extend([(fileid, file_revid)
750
744
                                for file_revid in file_revids])
751
745
        self._text_filter = text_filter
944
938
                request_groups[index] = []
945
939
            request_groups[index].append((key, value, references))
946
940
        result = []
947
 
        for index, items in viewitems(request_groups):
 
941
        for index, items in request_groups.items():
948
942
            pack_readv_requests = []
949
943
            for key, value, references in items:
950
944
                # ---- KnitGraphIndex.get_position