/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/index.py

  • Committer: Martin
  • Date: 2017-06-05 20:48:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6658.
  • Revision ID: gzlist@googlemail.com-20170605204831-20accykspjcrx0a8
Apply 2to3 dict fixer and clean up resulting mess using view helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/index.py
45
45
from .sixish import (
46
46
    BytesIO,
47
47
    viewvalues,
 
48
    viewitems,
48
49
    )
49
50
from .static_tuple import StaticTuple
50
51
 
144
145
        if self._nodes_by_key is None:
145
146
            nodes_by_key = {}
146
147
            if self.reference_lists:
147
 
                for key, (absent, references, value) in self._nodes.iteritems():
 
148
                for key, (absent, references, value) in viewitems(self._nodes):
148
149
                    if absent:
149
150
                        continue
150
151
                    key_dict = nodes_by_key
152
153
                        key_dict = key_dict.setdefault(subkey, {})
153
154
                    key_dict[key[-1]] = key, value, references
154
155
            else:
155
 
                for key, (absent, references, value) in self._nodes.iteritems():
 
156
                for key, (absent, references, value) in viewitems(self._nodes):
156
157
                    if absent:
157
158
                        continue
158
159
                    key_dict = nodes_by_key
276
277
        # forward sorted by key. In future we may consider topological sorting,
277
278
        # at the cost of table scans for direct lookup, or a second index for
278
279
        # direct lookup
279
 
        nodes = sorted(self._nodes.items())
 
280
        nodes = sorted(viewitems(self._nodes))
280
281
        # if we do not prepass, we don't know how long it will be up front.
281
282
        expected_bytes = None
282
283
        # we only need to pre-pass if we have reference lists at all.
479
480
        stream.close()
480
481
        del lines[-1]
481
482
        _, _, _, trailers = self._parse_lines(lines, pos)
482
 
        for key, absent, references, value in self._keys_by_offset.itervalues():
 
483
        for key, absent, references, value in viewvalues(self._keys_by_offset):
483
484
            if absent:
484
485
                continue
485
486
            # resolve references:
510
511
                % (ref_list_num, self.node_ref_lists))
511
512
        refs = set()
512
513
        nodes = self._nodes
513
 
        for key, (value, ref_lists) in nodes.iteritems():
 
514
        for key, (value, ref_lists) in viewitems(nodes):
514
515
            ref_list = ref_lists[ref_list_num]
515
516
            refs.update([ref for ref in ref_list if ref not in nodes])
516
517
        return refs
519
520
        if self._nodes_by_key is None:
520
521
            nodes_by_key = {}
521
522
            if self.node_ref_lists:
522
 
                for key, (value, references) in self._nodes.iteritems():
 
523
                for key, (value, references) in viewitems(self._nodes):
523
524
                    key_dict = nodes_by_key
524
525
                    for subkey in key[:-1]:
525
526
                        key_dict = key_dict.setdefault(subkey, {})
526
527
                    key_dict[key[-1]] = key, value, references
527
528
            else:
528
 
                for key, value in self._nodes.iteritems():
 
529
                for key, value in viewitems(self._nodes):
529
530
                    key_dict = nodes_by_key
530
531
                    for subkey in key[:-1]:
531
532
                        key_dict = key_dict.setdefault(subkey, {})
548
549
        if self._nodes is None:
549
550
            self._buffer_all()
550
551
        if self.node_ref_lists:
551
 
            for key, (value, node_ref_lists) in self._nodes.iteritems():
 
552
            for key, (value, node_ref_lists) in viewitems(self._nodes):
552
553
                yield self, key, value, node_ref_lists
553
554
        else:
554
 
            for key, value in self._nodes.iteritems():
 
555
            for key, value in viewitems(self._nodes):
555
556
                yield self, key, value
556
557
 
557
558
    def _read_prefix(self, stream):
1599
1600
            trace.mutter_callsite(3,
1600
1601
                "iter_all_entries scales with size of history.")
1601
1602
        if self.reference_lists:
1602
 
            for key, (absent, references, value) in self._nodes.iteritems():
 
1603
            for key, (absent, references, value) in viewitems(self._nodes):
1603
1604
                if not absent:
1604
1605
                    yield self, key, value, references
1605
1606
        else:
1606
 
            for key, (absent, references, value) in self._nodes.iteritems():
 
1607
            for key, (absent, references, value) in viewitems(self._nodes):
1607
1608
                if not absent:
1608
1609
                    yield self, key, value
1609
1610