/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4491.2.1 by Martin Pool
Clearer documentation and variable name in ReadVFile
1
# Copyright (C) 2007, 2009 Canonical Ltd
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
16
17
"""Container format for Bazaar data.
18
2916.2.13 by Andrew Bennetts
Improve some docstrings.
19
"Containers" and "records" are described in
20
doc/developers/container-format.txt.
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
21
"""
22
2661.2.2 by Robert Collins
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
23
from cStringIO import StringIO
2506.5.2 by Andrew Bennetts
Raise InvalidRecordError on invalid names.
24
import re
25
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
26
from bzrlib import errors
27
28
2535.3.26 by Andrew Bennetts
Revert merge of container-format changes rejected for bzr.dev (i.e. undo andrew.bennetts@canonical.com-20070717044423-cetp5spep142xsr4).
29
FORMAT_ONE = "Bazaar pack format 1 (introduced in 0.18)"
30
31
32
_whitespace_re = re.compile('[\t\n\x0b\x0c\r ]')
2506.5.2 by Andrew Bennetts
Raise InvalidRecordError on invalid names.
33
34
35
def _check_name(name):
36
    """Do some basic checking of 'name'.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
37
2535.3.26 by Andrew Bennetts
Revert merge of container-format changes rejected for bzr.dev (i.e. undo andrew.bennetts@canonical.com-20070717044423-cetp5spep142xsr4).
38
    At the moment, this just checks that there are no whitespace characters in a
39
    name.
2506.5.2 by Andrew Bennetts
Raise InvalidRecordError on invalid names.
40
41
    :raises InvalidRecordError: if name is not valid.
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
42
    :seealso: _check_name_encoding
2506.5.2 by Andrew Bennetts
Raise InvalidRecordError on invalid names.
43
    """
2535.3.26 by Andrew Bennetts
Revert merge of container-format changes rejected for bzr.dev (i.e. undo andrew.bennetts@canonical.com-20070717044423-cetp5spep142xsr4).
44
    if _whitespace_re.search(name) is not None:
2506.5.2 by Andrew Bennetts
Raise InvalidRecordError on invalid names.
45
        raise errors.InvalidRecordError("%r is not a valid name." % (name,))
46
47
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
48
def _check_name_encoding(name):
49
    """Check that 'name' is valid UTF-8.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
50
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
51
    This is separate from _check_name because UTF-8 decoding is relatively
52
    expensive, and we usually want to avoid it.
53
54
    :raises InvalidRecordError: if name is not valid UTF-8.
55
    """
56
    try:
57
        name.decode('utf-8')
58
    except UnicodeDecodeError, e:
59
        raise errors.InvalidRecordError(str(e))
60
61
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
62
class ContainerSerialiser(object):
2916.2.6 by Andrew Bennetts
Better docstrings.
63
    """A helper class for serialising containers.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
64
2916.2.6 by Andrew Bennetts
Better docstrings.
65
    It simply returns bytes from method calls to 'begin', 'end' and
66
    'bytes_record'.  You may find ContainerWriter to be a more convenient
67
    interface.
68
    """
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
69
70
    def begin(self):
2916.2.6 by Andrew Bennetts
Better docstrings.
71
        """Return the bytes to begin a container."""
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
72
        return FORMAT_ONE + "\n"
73
74
    def end(self):
2916.2.6 by Andrew Bennetts
Better docstrings.
75
        """Return the bytes to finish a container."""
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
76
        return "E"
77
78
    def bytes_record(self, bytes, names):
2916.2.6 by Andrew Bennetts
Better docstrings.
79
        """Return the bytes for a Bytes record with the given name and
80
        contents.
81
        """
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
82
        # Kind marker
83
        byte_sections = ["B"]
84
        # Length
85
        byte_sections.append(str(len(bytes)) + "\n")
86
        # Names
87
        for name_tuple in names:
88
            # Make sure we're writing valid names.  Note that we will leave a
89
            # half-written record if a name is bad!
90
            for name in name_tuple:
91
                _check_name(name)
92
            byte_sections.append('\x00'.join(name_tuple) + "\n")
93
        # End of headers
94
        byte_sections.append("\n")
95
        # Finally, the contents.
96
        byte_sections.append(bytes)
97
        # XXX: This causes a memory copy of bytes in size, but is usually
98
        # faster than two write calls (12 vs 13 seconds to output a gig of
99
        # 1k records.) - results may differ on significantly larger records
100
        # like .iso's but as they should be rare in any case and thus not
101
        # likely to be the common case. The biggest issue is causing extreme
102
        # memory pressure in that case. One possibly improvement here is to
103
        # check the size of the content before deciding to join here vs call
104
        # write twice.
105
        return ''.join(byte_sections)
106
107
2506.3.1 by Andrew Bennetts
More progress:
108
class ContainerWriter(object):
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
109
    """A class for writing containers to a file.
2698.1.1 by Robert Collins
Add records_written attribute to ContainerWriter's. (Robert Collins).
110
111
    :attribute records_written: The number of user records added to the
112
        container. This does not count the prelude or suffix of the container
113
        introduced by the begin() and end() methods.
114
    """
2506.3.1 by Andrew Bennetts
More progress:
115
116
    def __init__(self, write_func):
117
        """Constructor.
118
119
        :param write_func: a callable that will be called when this
120
            ContainerWriter needs to write some bytes.
121
        """
2661.2.1 by Robert Collins
* ``bzrlib.pack.ContainerWriter`` now returns an offset, length tuple to
122
        self._write_func = write_func
123
        self.current_offset = 0
2698.1.1 by Robert Collins
Add records_written attribute to ContainerWriter's. (Robert Collins).
124
        self.records_written = 0
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
125
        self._serialiser = ContainerSerialiser()
2506.3.1 by Andrew Bennetts
More progress:
126
127
    def begin(self):
128
        """Begin writing a container."""
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
129
        self.write_func(self._serialiser.begin())
2506.3.1 by Andrew Bennetts
More progress:
130
2661.2.1 by Robert Collins
* ``bzrlib.pack.ContainerWriter`` now returns an offset, length tuple to
131
    def write_func(self, bytes):
132
        self._write_func(bytes)
133
        self.current_offset += len(bytes)
134
2506.3.1 by Andrew Bennetts
More progress:
135
    def end(self):
136
        """Finish writing a container."""
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
137
        self.write_func(self._serialiser.end())
2506.3.1 by Andrew Bennetts
More progress:
138
139
    def add_bytes_record(self, bytes, names):
2661.2.1 by Robert Collins
* ``bzrlib.pack.ContainerWriter`` now returns an offset, length tuple to
140
        """Add a Bytes record with the given names.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
141
2661.2.1 by Robert Collins
* ``bzrlib.pack.ContainerWriter`` now returns an offset, length tuple to
142
        :param bytes: The bytes to insert.
2682.1.1 by Robert Collins
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
143
        :param names: The names to give the inserted bytes. Each name is
144
            a tuple of bytestrings. The bytestrings may not contain
145
            whitespace.
2661.2.1 by Robert Collins
* ``bzrlib.pack.ContainerWriter`` now returns an offset, length tuple to
146
        :return: An offset, length tuple. The offset is the offset
147
            of the record within the container, and the length is the
148
            length of data that will need to be read to reconstitute the
149
            record. These offset and length can only be used with the pack
150
            interface - they might be offset by headers or other such details
151
            and thus are only suitable for use by a ContainerReader.
152
        """
153
        current_offset = self.current_offset
2916.2.5 by Andrew Bennetts
Extract a ContainerSerialiser class from ContainerWriter.
154
        serialised_record = self._serialiser.bytes_record(bytes, names)
2916.2.4 by Andrew Bennetts
Extract a _serialise_byte_records function.
155
        self.write_func(serialised_record)
156
        self.records_written += 1
157
        # return a memo of where we wrote data to allow random access.
158
        return current_offset, self.current_offset - current_offset
159
2506.3.1 by Andrew Bennetts
More progress:
160
2661.2.2 by Robert Collins
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
161
class ReadVFile(object):
4491.2.1 by Martin Pool
Clearer documentation and variable name in ReadVFile
162
    """Adapt a readv result iterator to a file like protocol.
163
    
164
    The readv result must support the iterator protocol returning (offset,
165
    data_bytes) pairs.
166
    """
167
168
    # XXX: This could be a generic transport class, as other code may want to
169
    # gradually consume the readv result.
2661.2.2 by Robert Collins
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
170
171
    def __init__(self, readv_result):
172
        self.readv_result = readv_result
173
        # the most recent readv result block
174
        self._string = None
175
176
    def _next(self):
177
        if (self._string is None or
178
            self._string.tell() == self._string_length):
4491.2.1 by Martin Pool
Clearer documentation and variable name in ReadVFile
179
            offset, data = self.readv_result.next()
2661.2.2 by Robert Collins
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
180
            self._string_length = len(data)
181
            self._string = StringIO(data)
182
183
    def read(self, length):
184
        self._next()
185
        result = self._string.read(length)
186
        if len(result) < length:
187
            raise errors.BzrError('request for too much data from a readv hunk.')
188
        return result
189
190
    def readline(self):
191
        """Note that readline will not cross readv segments."""
192
        self._next()
193
        result = self._string.readline()
194
        if self._string.tell() == self._string_length and result[-1] != '\n':
195
            raise errors.BzrError('short readline in the readvfile hunk.')
196
        return result
197
198
199
def make_readv_reader(transport, filename, requested_records):
200
    """Create a ContainerReader that will read selected records only.
201
202
    :param transport: The transport the pack file is located on.
203
    :param filename: The filename of the pack file.
204
    :param requested_records: The record offset, length tuples as returned
205
        by add_bytes_record for the desired records.
206
    """
207
    readv_blocks = [(0, len(FORMAT_ONE)+1)]
208
    readv_blocks.extend(requested_records)
209
    result = ContainerReader(ReadVFile(
210
        transport.readv(filename, readv_blocks)))
211
    return result
212
213
2506.3.1 by Andrew Bennetts
More progress:
214
class BaseReader(object):
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
215
2506.2.9 by Aaron Bentley
Use file-like objects as container input, not callables
216
    def __init__(self, source_file):
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
217
        """Constructor.
218
2506.2.12 by Andrew Bennetts
Update docstring for Aaron's changes.
219
        :param source_file: a file-like object with `read` and `readline`
220
            methods.
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
221
        """
2506.2.9 by Aaron Bentley
Use file-like objects as container input, not callables
222
        self._source = source_file
223
224
    def reader_func(self, length=None):
225
        return self._source.read(length)
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
226
2506.3.1 by Andrew Bennetts
More progress:
227
    def _read_line(self):
2506.2.9 by Aaron Bentley
Use file-like objects as container input, not callables
228
        line = self._source.readline()
229
        if not line.endswith('\n'):
230
            raise errors.UnexpectedEndOfContainerError()
231
        return line.rstrip('\n')
2506.3.1 by Andrew Bennetts
More progress:
232
233
234
class ContainerReader(BaseReader):
235
    """A class for reading Bazaar's container format."""
236
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
237
    def iter_records(self):
238
        """Iterate over the container, yielding each record as it is read.
239
2506.6.2 by Andrew Bennetts
Docstring improvements.
240
        Each yielded record will be a 2-tuple of (names, callable), where names
241
        is a ``list`` and bytes is a function that takes one argument,
242
        ``max_length``.
243
4031.3.1 by Frank Aspell
Fixing various typos
244
        You **must not** call the callable after advancing the iterator to the
2506.6.2 by Andrew Bennetts
Docstring improvements.
245
        next record.  That is, this code is invalid::
246
247
            record_iter = container.iter_records()
248
            names1, callable1 = record_iter.next()
249
            names2, callable2 = record_iter.next()
250
            bytes1 = callable1(None)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
251
2506.6.2 by Andrew Bennetts
Docstring improvements.
252
        As it will give incorrect results and invalidate the state of the
253
        ContainerReader.
2506.3.1 by Andrew Bennetts
More progress:
254
4031.3.1 by Frank Aspell
Fixing various typos
255
        :raises ContainerError: if any sort of container corruption is
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
256
            detected, e.g. UnknownContainerFormatError is the format of the
257
            container is unrecognised.
2506.6.2 by Andrew Bennetts
Docstring improvements.
258
        :seealso: ContainerReader.read
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
259
        """
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
260
        self._read_format()
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
261
        return self._iter_records()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
262
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
263
    def iter_record_objects(self):
264
        """Iterate over the container, yielding each record as it is read.
265
266
        Each yielded record will be an object with ``read`` and ``validate``
2506.6.2 by Andrew Bennetts
Docstring improvements.
267
        methods.  Like with iter_records, it is not safe to use a record object
268
        after advancing the iterator to yield next record.
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
269
4031.3.1 by Frank Aspell
Fixing various typos
270
        :raises ContainerError: if any sort of container corruption is
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
271
            detected, e.g. UnknownContainerFormatError is the format of the
272
            container is unrecognised.
2506.6.2 by Andrew Bennetts
Docstring improvements.
273
        :seealso: iter_records
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
274
        """
275
        self._read_format()
276
        return self._iter_record_objects()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
277
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
278
    def _iter_records(self):
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
279
        for record in self._iter_record_objects():
280
            yield record.read()
281
282
    def _iter_record_objects(self):
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
283
        while True:
284
            record_kind = self.reader_func(1)
285
            if record_kind == 'B':
286
                # Bytes record.
2506.2.9 by Aaron Bentley
Use file-like objects as container input, not callables
287
                reader = BytesRecordReader(self._source)
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
288
                yield reader
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
289
            elif record_kind == 'E':
290
                # End marker.  There are no more records.
291
                return
292
            elif record_kind == '':
293
                # End of stream encountered, but no End Marker record seen, so
294
                # this container is incomplete.
295
                raise errors.UnexpectedEndOfContainerError()
296
            else:
297
                # Unknown record type.
298
                raise errors.UnknownRecordTypeError(record_kind)
299
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
300
    def _read_format(self):
301
        format = self._read_line()
2535.3.26 by Andrew Bennetts
Revert merge of container-format changes rejected for bzr.dev (i.e. undo andrew.bennetts@canonical.com-20070717044423-cetp5spep142xsr4).
302
        if format != FORMAT_ONE:
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
303
            raise errors.UnknownContainerFormatError(format)
304
2506.2.6 by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader.
305
    def validate(self):
306
        """Validate this container and its records.
307
2506.2.7 by Andrew Bennetts
Change read/iter_records to return a callable, add more validation, and
308
        Validating consumes the data stream just like iter_records and
309
        iter_record_objects, so you cannot call it after
310
        iter_records/iter_record_objects.
2506.2.6 by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader.
311
312
        :raises ContainerError: if something is invalid.
313
        """
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
314
        all_names = set()
315
        for record_names, read_bytes in self.iter_records():
316
            read_bytes(None)
2682.1.1 by Robert Collins
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
317
            for name_tuple in record_names:
318
                for name in name_tuple:
319
                    _check_name_encoding(name)
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
320
                # Check that the name is unique.  Note that Python will refuse
321
                # to decode non-shortest forms of UTF-8 encoding, so there is no
322
                # risk that the same unicode string has been encoded two
323
                # different ways.
2682.1.1 by Robert Collins
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
324
                if name_tuple in all_names:
325
                    raise errors.DuplicateRecordNameError(name_tuple)
326
                all_names.add(name_tuple)
2506.2.6 by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader.
327
        excess_bytes = self.reader_func(1)
328
        if excess_bytes != '':
329
            raise errors.ContainerHasExcessDataError(excess_bytes)
330
2506.3.1 by Andrew Bennetts
More progress:
331
332
class BytesRecordReader(BaseReader):
333
334
    def read(self):
2506.2.6 by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader.
335
        """Read this record.
336
2506.6.2 by Andrew Bennetts
Docstring improvements.
337
        You can either validate or read a record, you can't do both.
2506.2.6 by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader.
338
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
339
        :returns: A tuple of (names, callable).  The callable can be called
340
            repeatedly to obtain the bytes for the record, with a max_length
341
            argument.  If max_length is None, returns all the bytes.  Because
342
            records can be arbitrarily large, using None is not recommended
343
            unless you have reason to believe the content will fit in memory.
2506.2.6 by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader.
344
        """
2506.3.1 by Andrew Bennetts
More progress:
345
        # Read the content length.
346
        length_line = self._read_line()
347
        try:
348
            length = int(length_line)
349
        except ValueError:
350
            raise errors.InvalidRecordError(
351
                "%r is not a valid length." % (length_line,))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
352
2506.3.1 by Andrew Bennetts
More progress:
353
        # Read the list of names.
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
354
        names = []
355
        while True:
2682.1.1 by Robert Collins
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
356
            name_line = self._read_line()
357
            if name_line == '':
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
358
                break
2682.1.1 by Robert Collins
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
359
            name_tuple = tuple(name_line.split('\x00'))
360
            for name in name_tuple:
361
                _check_name(name)
362
            names.append(name_tuple)
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
363
364
        self._remaining_length = length
365
        return names, self._content_reader
366
367
    def _content_reader(self, max_length):
368
        if max_length is None:
369
            length_to_read = self._remaining_length
370
        else:
371
            length_to_read = min(max_length, self._remaining_length)
372
        self._remaining_length -= length_to_read
373
        bytes = self.reader_func(length_to_read)
374
        if len(bytes) != length_to_read:
2506.3.3 by Andrew Bennetts
Deal with EOF in the middle of a bytes record.
375
            raise errors.UnexpectedEndOfContainerError()
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
376
        return bytes
2506.2.1 by Andrew Bennetts
Start implementing container format reading and writing.
377
2506.2.6 by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader.
378
    def validate(self):
379
        """Validate this record.
380
381
        You can either validate or read, you can't do both.
382
383
        :raises ContainerError: if this record is invalid.
384
        """
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
385
        names, read_bytes = self.read()
2682.1.1 by Robert Collins
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
386
        for name_tuple in names:
387
            for name in name_tuple:
388
                _check_name_encoding(name)
2506.6.1 by Andrew Bennetts
Return a callable instead of a str from read, and add more validation.
389
        read_bytes(None)
390
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
391
392
class ContainerPushParser(object):
2916.2.14 by Andrew Bennetts
Add a docstring.
393
    """A "push" parser for container format 1.
394
395
    It accepts bytes via the ``accept_bytes`` method, and parses them into
396
    records which can be retrieved via the ``read_pending_records`` method.
397
    """
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
398
399
    def __init__(self):
400
        self._buffer = ''
401
        self._state_handler = self._state_expecting_format_line
402
        self._parsed_records = []
403
        self._reset_current_record()
2916.2.10 by Andrew Bennetts
Simpler iter_records_from_file implementation.
404
        self.finished = False
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
405
406
    def _reset_current_record(self):
407
        self._current_record_length = None
408
        self._current_record_names = []
409
410
    def accept_bytes(self, bytes):
411
        self._buffer += bytes
412
        # Keep iterating the state machine until it stops consuming bytes from
413
        # the buffer.
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
414
        last_buffer_length = None
415
        cur_buffer_length = len(self._buffer)
4464.1.1 by Aaron Bentley
ContainerPushParser.accept_bytes handles zero-length records correctly.
416
        last_state_handler = None
417
        while (cur_buffer_length != last_buffer_length
418
               or last_state_handler != self._state_handler):
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
419
            last_buffer_length = cur_buffer_length
4464.1.1 by Aaron Bentley
ContainerPushParser.accept_bytes handles zero-length records correctly.
420
            last_state_handler = self._state_handler
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
421
            self._state_handler()
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
422
            cur_buffer_length = len(self._buffer)
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
423
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
424
    def read_pending_records(self, max=None):
425
        if max:
426
            records = self._parsed_records[:max]
427
            del self._parsed_records[:max]
428
            return records
429
        else:
430
            records = self._parsed_records
431
            self._parsed_records = []
432
            return records
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
433
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
434
    def _consume_line(self):
435
        """Take a line out of the buffer, and return the line.
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
436
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
437
        If a newline byte is not found in the buffer, the buffer is
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
438
        unchanged and this returns None instead.
439
        """
440
        newline_pos = self._buffer.find('\n')
441
        if newline_pos != -1:
442
            line = self._buffer[:newline_pos]
443
            self._buffer = self._buffer[newline_pos+1:]
444
            return line
445
        else:
446
            return None
447
448
    def _state_expecting_format_line(self):
449
        line = self._consume_line()
450
        if line is not None:
451
            if line != FORMAT_ONE:
452
                raise errors.UnknownContainerFormatError(line)
453
            self._state_handler = self._state_expecting_record_type
454
455
    def _state_expecting_record_type(self):
456
        if len(self._buffer) >= 1:
457
            record_type = self._buffer[0]
458
            self._buffer = self._buffer[1:]
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
459
            if record_type == 'B':
460
                self._state_handler = self._state_expecting_length
461
            elif record_type == 'E':
2916.2.10 by Andrew Bennetts
Simpler iter_records_from_file implementation.
462
                self.finished = True
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
463
                self._state_handler = self._state_expecting_nothing
464
            else:
465
                raise errors.UnknownRecordTypeError(record_type)
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
466
467
    def _state_expecting_length(self):
468
        line = self._consume_line()
469
        if line is not None:
470
            try:
471
                self._current_record_length = int(line)
472
            except ValueError:
473
                raise errors.InvalidRecordError(
474
                    "%r is not a valid length." % (line,))
475
            self._state_handler = self._state_expecting_name
476
477
    def _state_expecting_name(self):
478
        encoded_name_parts = self._consume_line()
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
479
        if encoded_name_parts == '':
480
            self._state_handler = self._state_expecting_body
481
        elif encoded_name_parts:
482
            name_parts = tuple(encoded_name_parts.split('\x00'))
483
            for name_part in name_parts:
484
                _check_name(name_part)
485
            self._current_record_names.append(name_parts)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
486
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
487
    def _state_expecting_body(self):
488
        if len(self._buffer) >= self._current_record_length:
489
            body_bytes = self._buffer[:self._current_record_length]
490
            self._buffer = self._buffer[self._current_record_length:]
491
            record = (self._current_record_names, body_bytes)
492
            self._parsed_records.append(record)
493
            self._reset_current_record()
494
            self._state_handler = self._state_expecting_record_type
495
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
496
    def _state_expecting_nothing(self):
497
        pass
498
2916.2.10 by Andrew Bennetts
Simpler iter_records_from_file implementation.
499
    def read_size_hint(self):
500
        hint = 16384
501
        if self._state_handler == self._state_expecting_body:
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
502
            remaining = self._current_record_length - len(self._buffer)
503
            if remaining < 0:
504
                remaining = 0
2916.2.10 by Andrew Bennetts
Simpler iter_records_from_file implementation.
505
            return max(hint, remaining)
506
        return hint
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
507
508
509
def iter_records_from_file(source_file):
510
    parser = ContainerPushParser()
511
    while True:
2916.2.10 by Andrew Bennetts
Simpler iter_records_from_file implementation.
512
        bytes = source_file.read(parser.read_size_hint())
2916.2.8 by Andrew Bennetts
Add bzrlib.pack.iter_records_from_file.
513
        parser.accept_bytes(bytes)
514
        for record in parser.read_pending_records():
515
            yield record
2916.2.10 by Andrew Bennetts
Simpler iter_records_from_file implementation.
516
        if parser.finished:
517
            break
2916.2.1 by Andrew Bennetts
Initial implementation of a 'push' parser for the container format.
518