1
# Copyright (C) 2007-2010 Canonical Ltd
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.
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.
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
29
revision as _mod_revision,
36
versionedfile as _mod_versionedfile,
38
from ...bundle import bundle_data, serializer as bundle_serializer
39
from ...i18n import ngettext
40
from ...sixish import (
46
class _MPDiffInventoryGenerator(_mod_versionedfile._MPDiffGenerator):
47
"""Generate Inventory diffs serialized inventories."""
49
def __init__(self, repo, inventory_keys):
50
super(_MPDiffInventoryGenerator, self).__init__(repo.inventories,
56
"""Compute the diffs one at a time."""
57
# This is instead of compute_diffs() since we guarantee our ordering of
58
# inventories, we don't have to do any buffering
59
self._find_needed_keys()
60
# We actually use a slightly different ordering. We grab all of the
61
# parents first, and then grab the ordered requests.
62
needed_ids = [k[-1] for k in self.present_parents]
63
needed_ids.extend([k[-1] for k in self.ordered_keys])
64
inv_to_bytes = self.repo._serializer.write_inventory_to_string
65
for inv in self.repo.iter_inventories(needed_ids):
66
revision_id = inv.revision_id
68
if key in self.present_parents:
69
# Not a key we will transmit, which is a shame, since because
70
# of that bundles don't work with stacked branches
73
parent_ids = [k[-1] for k in self.parent_map[key]]
74
as_bytes = inv_to_bytes(inv)
75
self._process_one_record(key, (as_bytes,))
76
if parent_ids is None:
78
diff = self.diffs.pop(key)
79
sha1 = osutils.sha_string(as_bytes)
80
yield revision_id, parent_ids, sha1, diff
83
class BundleWriter(object):
84
"""Writer for bundle-format files.
86
This serves roughly the same purpose as ContainerReader, but acts as a
89
Provides ways of writing the specific record types supported this bundle
93
def __init__(self, fileobj):
94
self._container = pack.ContainerWriter(self._write_encoded)
95
self._fileobj = fileobj
96
self._compressor = bz2.BZ2Compressor()
98
def _write_encoded(self, bytes):
99
"""Write bzip2-encoded bytes to the file"""
100
self._fileobj.write(self._compressor.compress(bytes))
103
"""Start writing the bundle"""
104
self._fileobj.write(bundle_serializer._get_bundle_header('4'))
105
self._fileobj.write(b'#\n')
106
self._container.begin()
109
"""Finish writing the bundle"""
110
self._container.end()
111
self._fileobj.write(self._compressor.flush())
113
def add_multiparent_record(self, mp_bytes, sha1, parents, repo_kind,
114
revision_id, file_id):
115
"""Add a record for a multi-parent diff
117
:mp_bytes: A multi-parent diff, as a bytestring
118
:sha1: The sha1 hash of the fulltext
119
:parents: a list of revision-ids of the parents
120
:repo_kind: The kind of object in the repository. May be 'file' or
122
:revision_id: The revision id of the mpdiff being added.
123
:file_id: The file-id of the file, or None for inventories.
125
metadata = {b'parents': parents,
126
b'storage_kind': b'mpdiff',
128
self._add_record(mp_bytes, metadata, repo_kind, revision_id, file_id)
130
def add_fulltext_record(self, bytes, parents, repo_kind, revision_id):
131
"""Add a record for a fulltext
133
:bytes: The fulltext, as a bytestring
134
:parents: a list of revision-ids of the parents
135
:repo_kind: The kind of object in the repository. May be 'revision' or
137
:revision_id: The revision id of the fulltext being added.
139
metadata = {b'parents': parents,
140
b'storage_kind': b'mpdiff'}
141
self._add_record(bytes, {b'parents': parents,
142
b'storage_kind': b'fulltext'}, repo_kind, revision_id, None)
144
def add_info_record(self, kwargs):
145
"""Add an info record to the bundle
147
Any parameters may be supplied, except 'self' and 'storage_kind'.
148
Values must be lists, strings, integers, dicts, or a combination.
150
kwargs[b'storage_kind'] = b'header'
151
self._add_record(None, kwargs, 'info', None, None)
154
def encode_name(content_kind, revision_id, file_id=None):
155
"""Encode semantic ids as a container name"""
156
if content_kind not in ('revision', 'file', 'inventory', 'signature',
158
raise ValueError(content_kind)
159
if content_kind == 'file':
161
raise AssertionError()
163
if file_id is not None:
164
raise AssertionError()
165
if content_kind == 'info':
166
if revision_id is not None:
167
raise AssertionError()
168
elif revision_id is None:
169
raise AssertionError()
170
names = [n.replace(b'/', b'//') for n in
171
(content_kind.encode('ascii'), revision_id, file_id) if n is not None]
172
return b'/'.join(names)
174
def _add_record(self, bytes, metadata, repo_kind, revision_id, file_id):
175
"""Add a bundle record to the container.
177
Most bundle records are recorded as header/body pairs, with the
178
body being nameless. Records with storage_kind 'header' have no
181
name = self.encode_name(repo_kind, revision_id, file_id)
182
encoded_metadata = bencode.bencode(metadata)
183
self._container.add_bytes_record(encoded_metadata, [(name, )])
184
if metadata[b'storage_kind'] != b'header':
185
self._container.add_bytes_record(bytes, [])
188
class BundleReader(object):
189
"""Reader for bundle-format files.
191
This serves roughly the same purpose as ContainerReader, but acts as a
192
layer on top of it, providing metadata, a semantic name, and a record
196
def __init__(self, fileobj, stream_input=True):
199
:param fileobj: a file containing a bzip-encoded container
200
:param stream_input: If True, the BundleReader stream input rather than
201
reading it all into memory at once. Reading it into memory all at
202
once is (currently) faster.
204
line = fileobj.readline()
207
self.patch_lines = []
209
source_file = iterablefile.IterableFile(self.iter_decode(fileobj))
211
source_file = BytesIO(bz2.decompress(fileobj.read()))
212
self._container_file = source_file
215
def iter_decode(fileobj):
216
"""Iterate through decoded fragments of the file"""
217
decompressor = bz2.BZ2Decompressor()
220
yield decompressor.decompress(line)
225
def decode_name(name):
226
"""Decode a name from its container form into a semantic form
228
:retval: content_kind, revision_id, file_id
230
segments = re.split(b'(//?)', name)
232
for segment in segments:
235
elif segment == b'/':
239
content_kind = names[0]
243
revision_id = names[1]
246
return content_kind.decode('ascii'), revision_id, file_id
248
def iter_records(self):
249
"""Iterate through bundle records
251
:return: a generator of (bytes, metadata, content_kind, revision_id,
254
iterator = pack.iter_records_from_file(self._container_file)
255
for names, bytes in iterator:
257
raise errors.BadBundle('Record has %d names instead of 1'
259
metadata = bencode.bdecode(bytes)
260
if metadata[b'storage_kind'] == b'header':
263
_unused, bytes = next(iterator)
264
yield (bytes, metadata) + self.decode_name(names[0][0])
267
class BundleSerializerV4(bundle_serializer.BundleSerializer):
268
"""Implement the high-level bundle interface"""
270
def write_bundle(self, repository, target, base, fileobj):
271
"""Write a bundle to a file object
273
:param repository: The repository to retrieve revision data from
274
:param target: The head revision to include ancestors of
275
:param base: The ancestor of the target to stop including acestors
277
:param fileobj: The file-like object to write to
279
write_op = BundleWriteOperation(base, target, repository, fileobj)
280
return write_op.do_write()
282
def read(self, file):
283
"""return a reader object for a given file"""
284
bundle = BundleInfoV4(file, self)
288
def get_source_serializer(info):
289
"""Retrieve the serializer for a given info object"""
290
return serializer.format_registry.get(info[b'serializer'].decode('ascii'))
293
class BundleWriteOperation(object):
294
"""Perform the operation of writing revisions to a bundle"""
296
def __init__(self, base, target, repository, fileobj, revision_ids=None):
299
self.repository = repository
300
bundle = BundleWriter(fileobj)
302
if revision_ids is not None:
303
self.revision_ids = revision_ids
305
graph = repository.get_graph()
306
revision_ids = graph.find_unique_ancestors(target, [base])
308
parents = graph.get_parent_map(revision_ids)
309
self.revision_ids = [r for r in revision_ids if r in parents]
310
self.revision_keys = {(revid,) for revid in self.revision_ids}
313
"""Write all data to the bundle"""
314
trace.note(ngettext('Bundling %d revision.', 'Bundling %d revisions.',
315
len(self.revision_ids)), len(self.revision_ids))
316
with self.repository.lock_read():
320
self.write_revisions()
322
return self.revision_ids
324
def write_info(self):
325
"""Write format info"""
326
serializer_format = self.repository.get_serializer_format()
327
supports_rich_root = {True: 1, False: 0}[
328
self.repository.supports_rich_root()]
329
self.bundle.add_info_record({b'serializer': serializer_format,
330
b'supports_rich_root': supports_rich_root})
332
def write_files(self):
333
"""Write bundle records for all revisions of all files"""
335
altered_fileids = self.repository.fileids_altered_by_revision_ids(
337
for file_id, revision_ids in viewitems(altered_fileids):
338
for revision_id in revision_ids:
339
text_keys.append((file_id, revision_id))
340
self._add_mp_records_keys('file', self.repository.texts, text_keys)
342
def write_revisions(self):
343
"""Write bundle records for all revisions and signatures"""
344
inv_vf = self.repository.inventories
345
topological_order = [key[-1] for key in multiparent.topo_iter_keys(
346
inv_vf, self.revision_keys)]
347
revision_order = topological_order
348
if self.target is not None and self.target in self.revision_ids:
349
# Make sure the target revision is always the last entry
350
revision_order = list(topological_order)
351
revision_order.remove(self.target)
352
revision_order.append(self.target)
353
if self.repository._serializer.support_altered_by_hack:
354
# Repositories that support_altered_by_hack means that
355
# inventories.make_mpdiffs() contains all the data about the tree
356
# shape. Formats without support_altered_by_hack require
357
# chk_bytes/etc, so we use a different code path.
358
self._add_mp_records_keys('inventory', inv_vf,
359
[(revid,) for revid in topological_order])
361
# Inventories should always be added in pure-topological order, so
362
# that we can apply the mpdiff for the child to the parent texts.
363
self._add_inventory_mpdiffs_from_serializer(topological_order)
364
self._add_revision_texts(revision_order)
366
def _add_inventory_mpdiffs_from_serializer(self, revision_order):
367
"""Generate mpdiffs by serializing inventories.
369
The current repository only has part of the tree shape information in
370
the 'inventories' vf. So we use serializer.write_inventory_to_string to
371
get a 'full' representation of the tree shape, and then generate
372
mpdiffs on that data stream. This stream can then be reconstructed on
375
inventory_key_order = [(r,) for r in revision_order]
376
generator = _MPDiffInventoryGenerator(self.repository,
378
for revision_id, parent_ids, sha1, diff in generator.iter_diffs():
379
text = b''.join(diff.to_patch())
380
self.bundle.add_multiparent_record(text, sha1, parent_ids,
381
'inventory', revision_id, None)
383
def _add_revision_texts(self, revision_order):
384
parent_map = self.repository.get_parent_map(revision_order)
385
revision_to_bytes = self.repository._serializer.write_revision_to_string
386
revisions = self.repository.get_revisions(revision_order)
387
for revision in revisions:
388
revision_id = revision.revision_id
389
parents = parent_map.get(revision_id, None)
390
revision_text = revision_to_bytes(revision)
391
self.bundle.add_fulltext_record(revision_text, parents,
392
'revision', revision_id)
394
self.bundle.add_fulltext_record(
395
self.repository.get_signature_text(
396
revision_id), parents, 'signature', revision_id)
397
except errors.NoSuchRevision:
401
def get_base_target(revision_ids, forced_bases, repository):
402
"""Determine the base and target from old-style revision ids"""
403
if len(revision_ids) == 0:
405
target = revision_ids[0]
406
base = forced_bases.get(target)
408
parents = repository.get_revision(target).parent_ids
409
if len(parents) == 0:
410
base = _mod_revision.NULL_REVISION
415
def _add_mp_records_keys(self, repo_kind, vf, keys):
416
"""Add multi-parent diff records to a bundle"""
417
ordered_keys = list(multiparent.topo_iter_keys(vf, keys))
418
mpdiffs = vf.make_mpdiffs(ordered_keys)
419
sha1s = vf.get_sha1s(ordered_keys)
420
parent_map = vf.get_parent_map(ordered_keys)
421
for mpdiff, item_key, in zip(mpdiffs, ordered_keys):
422
sha1 = sha1s[item_key]
423
parents = [key[-1] for key in parent_map[item_key]]
424
text = b''.join(mpdiff.to_patch())
425
# Infer file id records as appropriate.
426
if len(item_key) == 2:
427
file_id = item_key[0]
430
self.bundle.add_multiparent_record(text, sha1, parents, repo_kind,
431
item_key[-1], file_id)
434
class BundleInfoV4(object):
436
"""Provide (most of) the BundleInfo interface"""
437
def __init__(self, fileobj, serializer):
438
self._fileobj = fileobj
439
self._serializer = serializer
440
self.__real_revisions = None
441
self.__revisions = None
443
def install(self, repository):
444
return self.install_revisions(repository)
446
def install_revisions(self, repository, stream_input=True):
447
"""Install this bundle's revisions into the specified repository
449
:param target_repo: The repository to install into
450
:param stream_input: If True, will stream input rather than reading it
451
all into memory at once. Reading it into memory all at once is
454
with repository.lock_write():
455
ri = RevisionInstaller(self.get_bundle_reader(stream_input),
456
self._serializer, repository)
459
def get_merge_request(self, target_repo):
460
"""Provide data for performing a merge
462
Returns suggested base, suggested target, and patch verification status
464
return None, self.target, 'inapplicable'
466
def get_bundle_reader(self, stream_input=True):
467
"""Return a new BundleReader for the associated bundle
469
:param stream_input: If True, the BundleReader stream input rather than
470
reading it all into memory at once. Reading it into memory all at
471
once is (currently) faster.
473
self._fileobj.seek(0)
474
return BundleReader(self._fileobj, stream_input)
476
def _get_real_revisions(self):
477
if self.__real_revisions is None:
478
self.__real_revisions = []
479
bundle_reader = self.get_bundle_reader()
480
for bytes, metadata, repo_kind, revision_id, file_id in \
481
bundle_reader.iter_records():
482
if repo_kind == 'info':
484
self._serializer.get_source_serializer(metadata)
485
if repo_kind == 'revision':
486
rev = serializer.read_revision_from_string(bytes)
487
self.__real_revisions.append(rev)
488
return self.__real_revisions
489
real_revisions = property(_get_real_revisions)
491
def _get_revisions(self):
492
if self.__revisions is None:
493
self.__revisions = []
494
for revision in self.real_revisions:
495
self.__revisions.append(
496
bundle_data.RevisionInfo.from_revision(revision))
497
return self.__revisions
499
revisions = property(_get_revisions)
501
def _get_target(self):
502
return self.revisions[-1].revision_id
504
target = property(_get_target)
507
class RevisionInstaller(object):
508
"""Installs revisions into a repository"""
510
def __init__(self, container, serializer, repository):
511
self._container = container
512
self._serializer = serializer
513
self._repository = repository
517
"""Perform the installation.
519
Must be called with the Repository locked.
521
self._repository.start_write_group()
523
result = self._install_in_write_group()
525
self._repository.abort_write_group()
527
self._repository.commit_write_group()
530
def _install_in_write_group(self):
532
current_versionedfile = None
533
pending_file_records = []
535
pending_inventory_records = []
537
target_revision = None
538
for bytes, metadata, repo_kind, revision_id, file_id in\
539
self._container.iter_records():
540
if repo_kind == 'info':
541
if self._info is not None:
542
raise AssertionError()
543
self._handle_info(metadata)
544
if (pending_file_records and
545
(repo_kind, file_id) != ('file', current_file)):
546
# Flush the data for a single file - prevents memory
547
# spiking due to buffering all files in memory.
548
self._install_mp_records_keys(self._repository.texts,
549
pending_file_records)
551
del pending_file_records[:]
552
if len(pending_inventory_records) > 0 and repo_kind != 'inventory':
553
self._install_inventory_records(pending_inventory_records)
554
pending_inventory_records = []
555
if repo_kind == 'inventory':
556
pending_inventory_records.append(((revision_id,), metadata, bytes))
557
if repo_kind == 'revision':
558
target_revision = revision_id
559
self._install_revision(revision_id, metadata, bytes)
560
if repo_kind == 'signature':
561
self._install_signature(revision_id, metadata, bytes)
562
if repo_kind == 'file':
563
current_file = file_id
564
pending_file_records.append(((file_id, revision_id), metadata, bytes))
565
self._install_mp_records_keys(self._repository.texts, pending_file_records)
566
return target_revision
568
def _handle_info(self, info):
569
"""Extract data from an info record"""
571
self._source_serializer = self._serializer.get_source_serializer(info)
572
if (info[b'supports_rich_root'] == 0 and
573
self._repository.supports_rich_root()):
574
self.update_root = True
576
self.update_root = False
578
def _install_mp_records(self, versionedfile, records):
579
if len(records) == 0:
581
d_func = multiparent.MultiParent.from_patch
582
vf_records = [(r, m['parents'], m['sha1'], d_func(t)) for r, m, t in
583
records if r not in versionedfile]
584
versionedfile.add_mpdiffs(vf_records)
586
def _install_mp_records_keys(self, versionedfile, records):
587
d_func = multiparent.MultiParent.from_patch
589
for key, meta, text in records:
590
# Adapt to tuple interface: A length two key is a file_id,
591
# revision_id pair, a length 1 key is a
592
# revision/signature/inventory. We need to do this because
593
# the metadata extraction from the bundle has not yet been updated
594
# to use the consistent tuple interface itself.
599
parents = [prefix + (parent,) for parent in meta[b'parents']]
600
vf_records.append((key, parents, meta[b'sha1'], d_func(text)))
601
versionedfile.add_mpdiffs(vf_records)
603
def _get_parent_inventory_texts(self, inventory_text_cache,
604
inventory_cache, parent_ids):
605
cached_parent_texts = {}
606
remaining_parent_ids = []
607
for parent_id in parent_ids:
608
p_text = inventory_text_cache.get(parent_id, None)
610
remaining_parent_ids.append(parent_id)
612
cached_parent_texts[parent_id] = p_text
614
# TODO: Use inventory_cache to grab inventories we already have in
616
if remaining_parent_ids:
617
# first determine what keys are actually present in the local
618
# inventories object (don't use revisions as they haven't been
620
parent_keys = [(r,) for r in remaining_parent_ids]
621
present_parent_map = self._repository.inventories.get_parent_map(
623
present_parent_ids = []
625
for p_id in remaining_parent_ids:
626
if (p_id,) in present_parent_map:
627
present_parent_ids.append(p_id)
630
to_string = self._source_serializer.write_inventory_to_string
631
for parent_inv in self._repository.iter_inventories(
633
p_text = to_string(parent_inv)
634
inventory_cache[parent_inv.revision_id] = parent_inv
635
cached_parent_texts[parent_inv.revision_id] = p_text
636
inventory_text_cache[parent_inv.revision_id] = p_text
638
parent_texts = [cached_parent_texts[parent_id]
639
for parent_id in parent_ids
640
if parent_id not in ghosts]
643
def _install_inventory_records(self, records):
644
if (self._info[b'serializer'] == self._repository._serializer.format_num
645
and self._repository._serializer.support_altered_by_hack):
646
return self._install_mp_records_keys(self._repository.inventories,
648
# Use a 10MB text cache, since these are string xml inventories. Note
649
# that 10MB is fairly small for large projects (a single inventory can
650
# be >5MB). Another possibility is to cache 10-20 inventory texts
652
inventory_text_cache = lru_cache.LRUSizeCache(10*1024*1024)
653
# Also cache the in-memory representation. This allows us to create
654
# inventory deltas to apply rather than calling add_inventory from
656
inventory_cache = lru_cache.LRUCache(10)
657
with ui.ui_factory.nested_progress_bar() as pb:
658
num_records = len(records)
659
for idx, (key, metadata, bytes) in enumerate(records):
660
pb.update('installing inventory', idx, num_records)
661
revision_id = key[-1]
662
parent_ids = metadata[b'parents']
663
# Note: This assumes the local ghosts are identical to the
664
# ghosts in the source, as the Bundle serialization
665
# format doesn't record ghosts.
666
p_texts = self._get_parent_inventory_texts(inventory_text_cache,
669
# Why does to_lines() take strings as the source, it seems that
670
# it would have to cast to a list of lines, which we get back
671
# as lines and then cast back to a string.
672
target_lines = multiparent.MultiParent.from_patch(bytes
674
inv_text = b''.join(target_lines)
676
sha1 = osutils.sha_string(inv_text)
677
if sha1 != metadata[b'sha1']:
678
raise errors.BadBundle("Can't convert to target format")
679
# Add this to the cache so we don't have to extract it again.
680
inventory_text_cache[revision_id] = inv_text
681
target_inv = self._source_serializer.read_inventory_from_string(
683
self._handle_root(target_inv, parent_ids)
686
parent_inv = inventory_cache.get(parent_ids[0], None)
688
if parent_inv is None:
689
self._repository.add_inventory(revision_id, target_inv,
692
delta = target_inv._make_delta(parent_inv)
693
self._repository.add_inventory_by_delta(parent_ids[0],
694
delta, revision_id, parent_ids)
695
except errors.UnsupportedInventoryKind:
696
raise errors.IncompatibleRevision(repr(self._repository))
697
inventory_cache[revision_id] = target_inv
699
def _handle_root(self, target_inv, parent_ids):
700
revision_id = target_inv.revision_id
702
text_key = (target_inv.root.file_id, revision_id)
703
parent_keys = [(target_inv.root.file_id, parent) for
704
parent in parent_ids]
705
self._repository.texts.add_lines(text_key, parent_keys, [])
706
elif not self._repository.supports_rich_root():
707
if target_inv.root.revision != revision_id:
708
raise errors.IncompatibleRevision(repr(self._repository))
710
def _install_revision(self, revision_id, metadata, text):
711
if self._repository.has_revision(revision_id):
713
revision = self._source_serializer.read_revision_from_string(text)
714
self._repository.add_revision(revision.revision_id, revision)
716
def _install_signature(self, revision_id, metadata, text):
717
transaction = self._repository.get_transaction()
718
if self._repository.has_signature_for_revision_id(revision_id):
720
self._repository.add_signature_text(revision_id, text)
added
removed
breezy/bundle/serializer/v4.py
