132
123
"""Write the header for the changes"""
134
125
f.write(BUNDLE_HEADER)
138
def _write(self, key, value, indent=1, trailing_space_when_empty=False):
139
"""Write out meta information, with proper indenting, etc.
141
:param trailing_space_when_empty: To work around a bug in earlier
142
bundle readers, when writing an empty property, we use "prop: \n"
143
rather than writing "prop:\n".
144
If this parameter is True, and value is the empty string, we will
145
write an extra space.
129
def _write(self, key, value, indent=1):
130
"""Write out meta information, with proper indenting, etc"""
147
131
assert indent > 0, 'indentation must be greater than 0'
149
133
f.write('#' + (' ' * indent))
150
134
f.write(key.encode('utf-8'))
152
if trailing_space_when_empty and value == '':
156
elif isinstance(value, str):
160
elif isinstance(value, unicode):
137
elif isinstance(value, basestring):
162
139
f.write(value.encode('utf-8'))
331
298
if new_rev != old_rev:
332
299
action = Action('modified', [ie.kind,
333
300
new_tree.id2path(ie.file_id)])
334
action.add_utf8_property('last-changed', ie.revision)
301
action.add_property('last-changed', ie.revision)
335
302
action.write(self.to_file)
338
class BundleReader(object):
339
"""This class reads in a bundle from a file, and returns
340
a Bundle object, which can then be applied against a tree.
342
def __init__(self, from_file):
343
"""Read in the bundle from the file.
345
:param from_file: A file-like object (must have iterator support).
347
object.__init__(self)
348
self.from_file = iter(from_file)
349
self._next_line = None
351
self.info = self._get_info()
352
# We put the actual inventory ids in the footer, so that the patch
353
# is easier to read for humans.
354
# Unfortunately, that means we need to read everything before we
355
# can create a proper bundle.
360
return BundleInfo08()
364
while self._next_line is not None:
365
if not self._read_revision_header():
367
if self._next_line is None:
373
"""Make sure that the information read in makes sense
374
and passes appropriate checksums.
376
# Fill in all the missing blanks for the revisions
377
# and generate the real_revisions list.
378
self.info.complete_info()
381
"""yield the next line, but secretly
382
keep 1 extra line for peeking.
384
for line in self.from_file:
385
last = self._next_line
386
self._next_line = line
388
#mutter('yielding line: %r' % last)
390
last = self._next_line
391
self._next_line = None
392
#mutter('yielding line: %r' % last)
395
def _read_revision_header(self):
396
found_something = False
397
self.info.revisions.append(RevisionInfo(None))
398
for line in self._next():
399
# The bzr header is terminated with a blank line
400
# which does not start with '#'
401
if line is None or line == '\n':
403
if not line.startswith('#'):
405
found_something = True
406
self._handle_next(line)
407
if not found_something:
408
# Nothing was there, so remove the added revision
409
self.info.revisions.pop()
410
return found_something
412
def _read_next_entry(self, line, indent=1):
413
"""Read in a key-value pair
415
if not line.startswith('#'):
416
raise errors.MalformedHeader('Bzr header did not start with #')
417
line = line[1:-1].decode('utf-8') # Remove the '#' and '\n'
418
if line[:indent] == ' '*indent:
421
return None, None# Ignore blank lines
423
loc = line.find(': ')
428
value = self._read_many(indent=indent+2)
429
elif line[-1:] == ':':
431
value = self._read_many(indent=indent+2)
433
raise errors.MalformedHeader('While looking for key: value pairs,'
434
' did not find the colon %r' % (line))
436
key = key.replace(' ', '_')
437
#mutter('found %s: %s' % (key, value))
440
def _handle_next(self, line):
443
key, value = self._read_next_entry(line, indent=1)
444
mutter('_handle_next %r => %r' % (key, value))
448
revision_info = self.info.revisions[-1]
449
if key in revision_info.__dict__:
450
if getattr(revision_info, key) is None:
451
if key in ('file_id', 'revision_id', 'base_id'):
452
value = value.encode('utf8')
453
elif key in ('parent_ids'):
454
value = [v.encode('utf8') for v in value]
455
setattr(revision_info, key, value)
457
raise errors.MalformedHeader('Duplicated Key: %s' % key)
459
# What do we do with a key we don't recognize
460
raise errors.MalformedHeader('Unknown Key: "%s"' % key)
462
def _read_many(self, indent):
463
"""If a line ends with no entry, that means that it should be
464
followed with multiple lines of values.
466
This detects the end of the list, because it will be a line that
467
does not start properly indented.
470
start = '#' + (' '*indent)
472
if self._next_line is None or self._next_line[:len(start)] != start:
475
for line in self._next():
476
values.append(line[len(start):-1].decode('utf-8'))
477
if self._next_line is None or self._next_line[:len(start)] != start:
481
def _read_one_patch(self):
482
"""Read in one patch, return the complete patch, along with
485
:return: action, lines, do_continue
487
#mutter('_read_one_patch: %r' % self._next_line)
488
# Peek and see if there are no patches
489
if self._next_line is None or self._next_line.startswith('#'):
490
return None, [], False
494
for line in self._next():
496
if not line.startswith('==='):
497
raise errors.MalformedPatches('The first line of all patches'
498
' should be a bzr meta line "==="'
500
action = line[4:-1].decode('utf-8')
501
elif line.startswith('... '):
502
action += line[len('... '):-1].decode('utf-8')
504
if (self._next_line is not None and
505
self._next_line.startswith('===')):
506
return action, lines, True
507
elif self._next_line is None or self._next_line.startswith('#'):
508
return action, lines, False
512
elif not line.startswith('... '):
515
return action, lines, False
517
def _read_patches(self):
519
revision_actions = []
521
action, lines, do_continue = self._read_one_patch()
522
if action is not None:
523
revision_actions.append((action, lines))
524
assert self.info.revisions[-1].tree_actions is None
525
self.info.revisions[-1].tree_actions = revision_actions
527
def _read_footer(self):
528
"""Read the rest of the meta information.
530
:param first_line: The previous step iterates past what it
531
can handle. That extra line is given here.
533
for line in self._next():
534
self._handle_next(line)
535
if self._next_line is None:
537
if not self._next_line.startswith('#'):
538
# Consume the trailing \n and stop processing
542
class BundleInfo08(BundleInfo):
544
def _update_tree(self, bundle_tree, revision_id):
545
bundle_tree.note_last_changed('', revision_id)
546
BundleInfo._update_tree(self, bundle_tree, revision_id)
548
def _testament_sha1_from_revision(self, repository, revision_id):
549
testament = StrictTestament.from_revision(repository, revision_id)
550
return testament.as_sha1()
552
def _testament_sha1(self, revision, inventory):
553
return StrictTestament(revision, inventory).as_sha1()
added
removed
bzrlib/bundle/serializer/v07.py
