1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
|
# Copyright (C) 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from cStringIO import StringIO
import bz2
import re
from bzrlib import (
diff,
errors,
iterablefile,
multiparent,
osutils,
pack,
revision as _mod_revision,
trace,
xml_serializer,
)
from bzrlib.bundle import bundle_data, serializer
from bzrlib.util import bencode
class BundleWriter(object):
"""Writer for bundle-format files.
This serves roughly the same purpose as ContainerReader, but acts as a
layer on top of it.
Provides ways of writing the specific record types supported this bundle
format.
"""
def __init__(self, fileobj):
self._container = pack.ContainerWriter(self._write_encoded)
self._fileobj = fileobj
self._compressor = bz2.BZ2Compressor()
def _write_encoded(self, bytes):
"""Write bzip2-encoded bytes to the file"""
self._fileobj.write(self._compressor.compress(bytes))
def begin(self):
"""Start writing the bundle"""
self._fileobj.write(serializer._get_bundle_header(
serializer.v4_string))
self._fileobj.write('#\n')
self._container.begin()
def end(self):
"""Finish writing the bundle"""
self._container.end()
self._fileobj.write(self._compressor.flush())
def add_multiparent_record(self, mp_bytes, sha1, parents, repo_kind,
revision_id, file_id):
"""Add a record for a multi-parent diff
:mp_bytes: A multi-parent diff, as a bytestring
:sha1: The sha1 hash of the fulltext
:parents: a list of revision-ids of the parents
:repo_kind: The kind of object in the repository. May be 'file' or
'inventory'
:revision_id: The revision id of the mpdiff being added.
:file_id: The file-id of the file, or None for inventories.
"""
metadata = {'parents': parents,
'storage_kind': 'mpdiff',
'sha1': sha1}
self._add_record(mp_bytes, metadata, repo_kind, revision_id, file_id)
def add_fulltext_record(self, bytes, parents, repo_kind, revision_id):
"""Add a record for a fulltext
:bytes: The fulltext, as a bytestring
:parents: a list of revision-ids of the parents
:repo_kind: The kind of object in the repository. May be 'revision' or
'signature'
:revision_id: The revision id of the fulltext being added.
"""
metadata = {'parents': parents,
'storage_kind': 'mpdiff'}
self._add_record(bytes, {'parents': parents,
'storage_kind': 'fulltext'}, repo_kind, revision_id, None)
def add_info_record(self, **kwargs):
"""Add an info record to the bundle
Any parameters may be supplied, except 'self' and 'storage_kind'.
Values must be lists, strings, integers, dicts, or a combination.
"""
kwargs['storage_kind'] = 'header'
self._add_record(None, kwargs, 'info', None, None)
@staticmethod
def encode_name(content_kind, revision_id, file_id=None):
"""Encode semantic ids as a container name"""
assert content_kind in ('revision', 'file', 'inventory', 'signature',
'info')
if content_kind == 'file':
assert file_id is not None
else:
assert file_id is None
if content_kind == 'info':
assert revision_id is None
else:
assert revision_id is not None
names = [n.replace('/', '//') for n in
(content_kind, revision_id, file_id) if n is not None]
return '/'.join(names)
def _add_record(self, bytes, metadata, repo_kind, revision_id, file_id):
"""Add a bundle record to the container.
Most bundle records are recorded as header/body pairs, with the
body being nameless. Records with storage_kind 'header' have no
body.
"""
name = self.encode_name(repo_kind, revision_id, file_id)
encoded_metadata = bencode.bencode(metadata)
self._container.add_bytes_record(encoded_metadata, [(name, )])
if metadata['storage_kind'] != 'header':
self._container.add_bytes_record(bytes, [])
class BundleReader(object):
"""Reader for bundle-format files.
This serves roughly the same purpose as ContainerReader, but acts as a
layer on top of it, providing metadata, a semantic name, and a record
body
"""
def __init__(self, fileobj, stream_input=True):
"""Constructor
:param fileobj: a file containing a bzip-encoded container
:param stream_input: If True, the BundleReader stream input rather than
reading it all into memory at once. Reading it into memory all at
once is (currently) faster.
"""
line = fileobj.readline()
if line != '\n':
fileobj.readline()
self.patch_lines = []
if stream_input:
source_file = iterablefile.IterableFile(self.iter_decode(fileobj))
else:
source_file = StringIO(bz2.decompress(fileobj.read()))
self._container_file = source_file
@staticmethod
def iter_decode(fileobj):
"""Iterate through decoded fragments of the file"""
decompressor = bz2.BZ2Decompressor()
for line in fileobj:
try:
yield decompressor.decompress(line)
except EOFError:
return
@staticmethod
def decode_name(name):
"""Decode a name from its container form into a semantic form
:retval: content_kind, revision_id, file_id
"""
segments = re.split('(//?)', name)
names = ['']
for segment in segments:
if segment == '//':
names[-1] += '/'
elif segment == '/':
names.append('')
else:
names[-1] += segment
content_kind = names[0]
revision_id = None
file_id = None
if len(names) > 1:
revision_id = names[1]
if len(names) > 2:
file_id = names[2]
return content_kind, revision_id, file_id
def iter_records(self):
"""Iterate through bundle records
:return: a generator of (bytes, metadata, content_kind, revision_id,
file_id)
"""
iterator = pack.iter_records_from_file(self._container_file)
for names, bytes in iterator:
if len(names) != 1:
raise errors.BadBundle('Record has %d names instead of 1'
% len(names))
metadata = bencode.bdecode(bytes)
if metadata['storage_kind'] == 'header':
bytes = None
else:
_unused, bytes = iterator.next()
yield (bytes, metadata) + self.decode_name(names[0][0])
class BundleSerializerV4(serializer.BundleSerializer):
"""Implement the high-level bundle interface"""
def write(self, repository, revision_ids, forced_bases, fileobj):
"""Write a bundle to a file-like object
For backwards-compatibility only
"""
write_op = BundleWriteOperation.from_old_args(repository, revision_ids,
forced_bases, fileobj)
return write_op.do_write()
def write_bundle(self, repository, target, base, fileobj):
"""Write a bundle to a file object
:param repository: The repository to retrieve revision data from
:param target: The head revision to include ancestors of
:param base: The ancestor of the target to stop including acestors
at.
:param fileobj: The file-like object to write to
"""
write_op = BundleWriteOperation(base, target, repository, fileobj)
return write_op.do_write()
def read(self, file):
"""return a reader object for a given file"""
bundle = BundleInfoV4(file, self)
return bundle
@staticmethod
def get_source_serializer(info):
"""Retrieve the serializer for a given info object"""
return xml_serializer.format_registry.get(info['serializer'])
class BundleWriteOperation(object):
"""Perform the operation of writing revisions to a bundle"""
@classmethod
def from_old_args(cls, repository, revision_ids, forced_bases, fileobj):
"""Create a BundleWriteOperation from old-style arguments"""
base, target = cls.get_base_target(revision_ids, forced_bases,
repository)
return BundleWriteOperation(base, target, repository, fileobj,
revision_ids)
def __init__(self, base, target, repository, fileobj, revision_ids=None):
self.base = base
self.target = target
self.repository = repository
bundle = BundleWriter(fileobj)
self.bundle = bundle
self.base_ancestry = set(repository.get_ancestry(base,
topo_sorted=False))
if revision_ids is not None:
self.revision_ids = revision_ids
else:
revision_ids = set(repository.get_ancestry(target,
topo_sorted=False))
self.revision_ids = revision_ids.difference(self.base_ancestry)
def do_write(self):
"""Write all data to the bundle"""
self.bundle.begin()
self.write_info()
self.write_files()
self.write_revisions()
self.bundle.end()
return self.revision_ids
def write_info(self):
"""Write format info"""
serializer_format = self.repository.get_serializer_format()
supports_rich_root = {True: 1, False: 0}[
self.repository.supports_rich_root()]
self.bundle.add_info_record(serializer=serializer_format,
supports_rich_root=supports_rich_root)
def iter_file_revisions(self):
"""Iterate through all relevant revisions of all files.
This is the correct implementation, but is not compatible with bzr.dev,
because certain old revisions were not converted correctly, and have
the wrong "revision" marker in inventories.
"""
transaction = self.repository.get_transaction()
altered = self.repository.fileids_altered_by_revision_ids(
self.revision_ids)
for file_id, file_revision_ids in altered.iteritems():
vf = self.repository.weave_store.get_weave(file_id, transaction)
yield vf, file_id, file_revision_ids
def iter_file_revisions_aggressive(self):
"""Iterate through all relevant revisions of all files.
This uses the standard iter_file_revisions to determine what revisions
are referred to by inventories, but then uses the versionedfile to
determine what the build-dependencies of each required revision.
All build dependencies which are not ancestors of the base revision
are emitted.
"""
for vf, file_id, file_revision_ids in self.iter_file_revisions():
new_revision_ids = set()
pending = list(file_revision_ids)
while len(pending) > 0:
revision_id = pending.pop()
if revision_id in new_revision_ids:
continue
if revision_id in self.base_ancestry:
continue
new_revision_ids.add(revision_id)
pending.extend(vf.get_parents(revision_id))
yield vf, file_id, new_revision_ids
def write_files(self):
"""Write bundle records for all revisions of all files"""
for vf, file_id, revision_ids in self.iter_file_revisions():
self.add_mp_records('file', file_id, vf, revision_ids)
def write_revisions(self):
"""Write bundle records for all revisions and signatures"""
inv_vf = self.repository.get_inventory_weave()
revision_order = list(multiparent.topo_iter(inv_vf, self.revision_ids))
if self.target is not None and self.target in self.revision_ids:
revision_order.remove(self.target)
revision_order.append(self.target)
self.add_mp_records('inventory', None, inv_vf, revision_order)
parent_map = self.repository.get_parent_map(revision_order)
for revision_id in revision_order:
parents = parent_map.get(revision_id, None)
revision_text = self.repository.get_revision_xml(revision_id)
self.bundle.add_fulltext_record(revision_text, parents,
'revision', revision_id)
try:
self.bundle.add_fulltext_record(
self.repository.get_signature_text(
revision_id), parents, 'signature', revision_id)
except errors.NoSuchRevision:
pass
@staticmethod
def get_base_target(revision_ids, forced_bases, repository):
"""Determine the base and target from old-style revision ids"""
if len(revision_ids) == 0:
return None, None
target = revision_ids[0]
base = forced_bases.get(target)
if base is None:
parents = repository.get_revision(target).parent_ids
if len(parents) == 0:
base = _mod_revision.NULL_REVISION
else:
base = parents[0]
return base, target
def add_mp_records(self, repo_kind, file_id, vf, revision_ids):
"""Add multi-parent diff records to a bundle"""
revision_ids = list(multiparent.topo_iter(vf, revision_ids))
mpdiffs = vf.make_mpdiffs(revision_ids)
sha1s = vf.get_sha1s(revision_ids)
for mpdiff, revision_id, sha1, in zip(mpdiffs, revision_ids, sha1s):
parents = vf.get_parents(revision_id)
text = ''.join(mpdiff.to_patch())
self.bundle.add_multiparent_record(text, sha1, parents, repo_kind,
revision_id, file_id)
class BundleInfoV4(object):
"""Provide (most of) the BundleInfo interface"""
def __init__(self, fileobj, serializer):
self._fileobj = fileobj
self._serializer = serializer
self.__real_revisions = None
self.__revisions = None
def install(self, repository):
return self.install_revisions(repository)
def install_revisions(self, repository, stream_input=True):
"""Install this bundle's revisions into the specified repository
:param target_repo: The repository to install into
:param stream_input: If True, will stream input rather than reading it
all into memory at once. Reading it into memory all at once is
(currently) faster.
"""
repository.lock_write()
try:
ri = RevisionInstaller(self.get_bundle_reader(stream_input),
self._serializer, repository)
return ri.install()
finally:
repository.unlock()
def get_merge_request(self, target_repo):
"""Provide data for performing a merge
Returns suggested base, suggested target, and patch verification status
"""
return None, self.target, 'inapplicable'
def get_bundle_reader(self, stream_input=True):
"""Return a new BundleReader for the associated bundle
:param stream_input: If True, the BundleReader stream input rather than
reading it all into memory at once. Reading it into memory all at
once is (currently) faster.
"""
self._fileobj.seek(0)
return BundleReader(self._fileobj, stream_input)
def _get_real_revisions(self):
if self.__real_revisions is None:
self.__real_revisions = []
bundle_reader = self.get_bundle_reader()
for bytes, metadata, repo_kind, revision_id, file_id in \
bundle_reader.iter_records():
if repo_kind == 'info':
serializer =\
self._serializer.get_source_serializer(metadata)
if repo_kind == 'revision':
rev = serializer.read_revision_from_string(bytes)
self.__real_revisions.append(rev)
return self.__real_revisions
real_revisions = property(_get_real_revisions)
def _get_revisions(self):
if self.__revisions is None:
self.__revisions = []
for revision in self.real_revisions:
self.__revisions.append(
bundle_data.RevisionInfo.from_revision(revision))
return self.__revisions
revisions = property(_get_revisions)
def _get_target(self):
return self.revisions[-1].revision_id
target = property(_get_target)
class RevisionInstaller(object):
"""Installs revisions into a repository"""
def __init__(self, container, serializer, repository):
self._container = container
self._serializer = serializer
self._repository = repository
self._info = None
def install(self):
"""Perform the installation.
Must be called with the Repository locked.
"""
self._repository.start_write_group()
try:
result = self._install_in_write_group()
except:
self._repository.abort_write_group()
raise
self._repository.commit_write_group()
return result
def _install_in_write_group(self):
current_file = None
current_versionedfile = None
pending_file_records = []
inventory_vf = None
pending_inventory_records = []
added_inv = set()
target_revision = None
for bytes, metadata, repo_kind, revision_id, file_id in\
self._container.iter_records():
if repo_kind == 'info':
assert self._info is None
self._handle_info(metadata)
if (repo_kind, file_id) != ('file', current_file):
if len(pending_file_records) > 0:
self._install_mp_records(current_versionedfile,
pending_file_records)
current_file = None
current_versionedfile = None
pending_file_records = []
if len(pending_inventory_records) > 0 and repo_kind != 'inventory':
self._install_inventory_records(inventory_vf,
pending_inventory_records)
pending_inventory_records = []
if repo_kind == 'inventory':
if inventory_vf is None:
inventory_vf = self._repository.get_inventory_weave()
if revision_id not in inventory_vf:
pending_inventory_records.append((revision_id, metadata,
bytes))
if repo_kind == 'revision':
target_revision = revision_id
self._install_revision(revision_id, metadata, bytes)
if repo_kind == 'signature':
self._install_signature(revision_id, metadata, bytes)
if repo_kind == 'file':
current_file = file_id
if current_versionedfile is None:
current_versionedfile = \
self._repository.weave_store.get_weave_or_empty(
file_id, self._repository.get_transaction())
pending_file_records = []
if revision_id in current_versionedfile:
continue
pending_file_records.append((revision_id, metadata, bytes))
self._install_mp_records(current_versionedfile, pending_file_records)
return target_revision
def _handle_info(self, info):
"""Extract data from an info record"""
self._info = info
self._source_serializer = self._serializer.get_source_serializer(info)
if (info['supports_rich_root'] == 0 and
self._repository.supports_rich_root()):
self.update_root = True
else:
self.update_root = False
def _install_mp_records(self, versionedfile, records):
if len(records) == 0:
return
d_func = multiparent.MultiParent.from_patch
vf_records = [(r, m['parents'], m['sha1'], d_func(t)) for r, m, t in
records if r not in versionedfile]
versionedfile.add_mpdiffs(vf_records)
def _install_inventory_records(self, vf, records):
if self._info['serializer'] == self._repository._serializer.format_num:
return self._install_mp_records(vf, records)
for revision_id, metadata, bytes in records:
parent_ids = metadata['parents']
parents = [self._repository.get_inventory(p)
for p in parent_ids]
p_texts = [self._source_serializer.write_inventory_to_string(p)
for p in parents]
target_lines = multiparent.MultiParent.from_patch(bytes).to_lines(
p_texts)
sha1 = osutils.sha_strings(target_lines)
if sha1 != metadata['sha1']:
raise errors.BadBundle("Can't convert to target format")
target_inv = self._source_serializer.read_inventory_from_string(
''.join(target_lines))
self._handle_root(target_inv, parent_ids)
try:
self._repository.add_inventory(revision_id, target_inv,
parent_ids)
except errors.UnsupportedInventoryKind:
raise errors.IncompatibleRevision(repr(self._repository))
def _handle_root(self, target_inv, parent_ids):
revision_id = target_inv.revision_id
if self.update_root:
target_inv.root.revision = revision_id
store = self._repository.weave_store
transaction = self._repository.get_transaction()
vf = store.get_weave_or_empty(target_inv.root.file_id, transaction)
vf.add_lines(revision_id, parent_ids, [])
elif not self._repository.supports_rich_root():
if target_inv.root.revision != revision_id:
raise errors.IncompatibleRevision(repr(self._repository))
def _install_revision(self, revision_id, metadata, text):
if self._repository.has_revision(revision_id):
return
self._repository._add_revision_text(revision_id, text)
def _install_signature(self, revision_id, metadata, text):
transaction = self._repository.get_transaction()
if self._repository._revision_store.has_signature(revision_id,
transaction):
return
self._repository._revision_store.add_revision_signature_text(
revision_id, text, transaction)
|