/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 bzrlib/_btree_serializer_py.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_btree_serializer_py.py
17
17
 
18
18
"""B+Tree index parsing."""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
 
from .. import static_tuple
23
 
 
24
 
 
25
 
def _parse_leaf_lines(data, key_length, ref_list_length):
26
 
    lines = data.split(b'\n')
 
20
from bzrlib import static_tuple
 
21
 
 
22
 
 
23
def _parse_leaf_lines(bytes, key_length, ref_list_length):
 
24
    lines = bytes.split('\n')
27
25
    nodes = []
28
26
    as_st = static_tuple.StaticTuple.from_sequence
29
27
    stuple = static_tuple.StaticTuple
30
28
    for line in lines[1:]:
31
 
        if line == b'':
 
29
        if line == '':
32
30
            return nodes
33
 
        elements = line.split(b'\0', key_length)
 
31
        elements = line.split('\0', key_length)
34
32
        # keys are tuples
35
33
        key = as_st(elements[:key_length]).intern()
36
34
        line = elements[-1]
37
 
        references, value = line.rsplit(b'\0', 1)
 
35
        references, value = line.rsplit('\0', 1)
38
36
        if ref_list_length:
39
37
            ref_lists = []
40
 
            for ref_string in references.split(b'\t'):
41
 
                ref_list = as_st([as_st(ref.split(b'\0')).intern()
42
 
                                  for ref in ref_string.split(b'\r') if ref])
 
38
            for ref_string in references.split('\t'):
 
39
                ref_list = as_st([as_st(ref.split('\0')).intern()
 
40
                                  for ref in ref_string.split('\r') if ref])
43
41
                ref_lists.append(ref_list)
44
42
            ref_lists = as_st(ref_lists)
45
43
            node_value = stuple(value, ref_lists)
63
61
        # TODO: Consider turning this back into the 'unoptimized' nested loop
64
62
        #       form. It is probably more obvious for most people, and this is
65
63
        #       just a reference implementation.
66
 
        flattened_references = [b'\r'.join([b'\x00'.join(reference)
67
 
                                            for reference in ref_list])
 
64
        flattened_references = ['\r'.join(['\x00'.join(reference)
 
65
                                           for reference in ref_list])
68
66
                                for ref_list in node[3]]
69
67
    else:
70
68
        flattened_references = []
71
 
    string_key = b'\x00'.join(node[1])
72
 
    line = (b"%s\x00%s\x00%s\n" % (string_key,
73
 
                                   b'\t'.join(flattened_references), node[2]))
 
69
    string_key = '\x00'.join(node[1])
 
70
    line = ("%s\x00%s\x00%s\n" % (string_key,
 
71
        '\t'.join(flattened_references), node[2]))
74
72
    return string_key, line