← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-17 18:18:18 UTC
  • mfrom: (4618.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090817181818-6ks7pxgiwpqvsd3l
(vila) Make selftest --parallel=fork work again

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
62
62
    # groupcompress ordering is approximately reverse topological,
63
63
    # properly grouped by file-id.
64
64
    per_prefix_map = {}
65
 
    for key, value in parent_map.iteritems():
 
65
    for item in parent_map.iteritems():
 
66
        key = item[0]
66
67
        if isinstance(key, str) or len(key) == 1:
67
68
            prefix = ''
68
69
        else:
69
70
            prefix = key[0]
70
71
        try:
71
 
            per_prefix_map[prefix][key] = value
 
72
            per_prefix_map[prefix].append(item)
72
73
        except KeyError:
73
 
            per_prefix_map[prefix] = {key: value}
 
74
            per_prefix_map[prefix] = [item]
74
75
 
75
76
    present_keys = []
76
77
    for prefix in sorted(per_prefix_map):
1098
1099
            self._check_lines_not_unicode(lines)
1099
1100
            self._check_lines_are_lines(lines)
1100
1101
 
1101
 
    def get_known_graph_ancestry(self, keys):
1102
 
        """Get a KnownGraph instance with the ancestry of keys."""
1103
 
        parent_map, missing_keys = self._index._graph_index.find_ancestry(keys,
1104
 
                                                                          0)
1105
 
        kg = _mod_graph.KnownGraph(parent_map)
1106
 
        return kg
1107
 
 
1108
1102
    def get_parent_map(self, keys):
1109
1103
        """Get a map of the graph parents of keys.
1110
1104