← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_chk_map_py.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_chk_map_py.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
import zlib
20
20
import struct
21
21
 
 
22
from bzrlib.static_tuple import StaticTuple
 
23
 
22
24
_LeafNode = None
23
25
_InternalNode = None
24
26
_unknown = None
93
95
        value_lines = lines[pos:pos+num_value_lines]
94
96
        pos += num_value_lines
95
97
        value = '\n'.join(value_lines)
96
 
        items[tuple(elements[:-1])] = value
 
98
        items[StaticTuple.from_sequence(elements[:-1])] = value
97
99
    if len(items) != length:
98
100
        raise AssertionError("item count (%d) mismatch for key %s,"
99
101
            " bytes %r" % (length, key, bytes))
141
143
    for line in lines[5:]:
142
144
        line = common_prefix + line
143
145
        prefix, flat_key = line.rsplit('\x00', 1)
144
 
        items[prefix] = (flat_key,)
 
146
        items[prefix] = StaticTuple(flat_key,)
 
147
    if len(items) == 0:
 
148
        raise AssertionError("We didn't find any item for %s" % key)
145
149
    result._items = items
146
150
    result._len = length
147
151
    result._maximum_size = maximum_size
151
155
    #      change if we add prefix compression
152
156
    result._raw_size = None # len(bytes)
153
157
    result._node_width = len(prefix)
154
 
    assert len(items) > 0
155
158
    result._search_prefix = common_prefix
156
159
    return result
157
160
 
 
161
 
 
162
def _bytes_to_text_key(bytes):
 
163
    """Take a CHKInventory value string and return a (file_id, rev_id) tuple"""
 
164
    sections = bytes.split('\n')
 
165
    kind, file_id = sections[0].split(': ')
 
166
    return (intern(file_id), intern(sections[3]))
 
167