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

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/groupcompress.py
45
45
from .sixish import (
46
46
    map,
47
47
    range,
 
48
    viewitems,
48
49
    )
49
50
from .versionedfile import (
50
51
    _KeyRefs,
73
74
    # groupcompress ordering is approximately reverse topological,
74
75
    # properly grouped by file-id.
75
76
    per_prefix_map = {}
76
 
    for key, value in parent_map.iteritems():
 
77
    for key, value in viewitems(parent_map):
77
78
        if isinstance(key, str) or len(key) == 1:
78
79
            prefix = ''
79
80
        else:
1541
1542
            # This is the group the bytes are stored in, followed by the
1542
1543
            # location in the group
1543
1544
            return locations[key][0]
1544
 
        present_keys = sorted(locations.iterkeys(), key=get_group)
1545
1545
        # We don't have an ordering for keys in the in-memory object, but
1546
1546
        # lets process the in-memory ones first.
1547
 
        present_keys = list(unadded_keys) + present_keys
 
1547
        present_keys = list(unadded_keys)
 
1548
        present_keys.extend(sorted(locations, key=get_group))
1548
1549
        # Now grab all of the ones from other sources
1549
1550
        source_keys = [(self, present_keys)]
1550
1551
        source_keys.extend(source_result)
1574
1575
            # start with one key, recurse to its oldest parent, then grab
1575
1576
            # everything in the same group, etc.
1576
1577
            parent_map = dict((key, details[2]) for key, details in
1577
 
                locations.iteritems())
 
1578
                viewitems(locations))
1578
1579
            for key in unadded_keys:
1579
1580
                parent_map[key] = self._unadded_refs[key]
1580
1581
            parent_map.update(fallback_parent_map)
2032
2033
        if changed:
2033
2034
            result = []
2034
2035
            if self._parents:
2035
 
                for key, (value, node_refs) in keys.iteritems():
 
2036
                for key, (value, node_refs) in viewitems(keys):
2036
2037
                    result.append((key, value, node_refs))
2037
2038
            else:
2038
 
                for key, (value, node_refs) in keys.iteritems():
 
2039
                for key, (value, node_refs) in viewitems(keys):
2039
2040
                    result.append((key, value))
2040
2041
            records = result
2041
2042
        key_dependencies = self._key_dependencies