1154
1160
# The old API returned a list, should this actually be a set?
1155
1161
return parent_map.keys()
1163
def _check_inventories(self, checker):
1164
"""Check the inventories found from the revision scan.
1166
This is responsible for verifying the sha1 of inventories and
1167
creating a pending_keys set that covers data referenced by inventories.
1169
bar = ui.ui_factory.nested_progress_bar()
1171
self._do_check_inventories(checker, bar)
1175
def _do_check_inventories(self, checker, bar):
1176
"""Helper for _check_inventories."""
1178
keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1179
kinds = ['chk_bytes', 'texts']
1180
count = len(checker.pending_keys)
1181
bar.update("inventories", 0, 2)
1182
current_keys = checker.pending_keys
1183
checker.pending_keys = {}
1184
# Accumulate current checks.
1185
for key in current_keys:
1186
if key[0] != 'inventories' and key[0] not in kinds:
1187
checker._report_items.append('unknown key type %r' % (key,))
1188
keys[key[0]].add(key[1:])
1189
if keys['inventories']:
1190
# NB: output order *should* be roughly sorted - topo or
1191
# inverse topo depending on repository - either way decent
1192
# to just delta against. However, pre-CHK formats didn't
1193
# try to optimise inventory layout on disk. As such the
1194
# pre-CHK code path does not use inventory deltas.
1196
for record in self.inventories.check(keys=keys['inventories']):
1197
if record.storage_kind == 'absent':
1198
checker._report_items.append(
1199
'Missing inventory {%s}' % (record.key,))
1201
last_object = self._check_record('inventories', record,
1202
checker, last_object,
1203
current_keys[('inventories',) + record.key])
1204
del keys['inventories']
1207
bar.update("texts", 1)
1208
while (checker.pending_keys or keys['chk_bytes']
1210
# Something to check.
1211
current_keys = checker.pending_keys
1212
checker.pending_keys = {}
1213
# Accumulate current checks.
1214
for key in current_keys:
1215
if key[0] not in kinds:
1216
checker._report_items.append('unknown key type %r' % (key,))
1217
keys[key[0]].add(key[1:])
1218
# Check the outermost kind only - inventories || chk_bytes || texts
1222
for record in getattr(self, kind).check(keys=keys[kind]):
1223
if record.storage_kind == 'absent':
1224
checker._report_items.append(
1225
'Missing %s {%s}' % (kind, record.key,))
1227
last_object = self._check_record(kind, record,
1228
checker, last_object, current_keys[(kind,) + record.key])
1232
def _check_record(self, kind, record, checker, last_object, item_data):
1233
"""Check a single text from this repository."""
1234
if kind == 'inventories':
1235
rev_id = record.key[0]
1236
inv = self.deserialise_inventory(rev_id,
1237
record.get_bytes_as('fulltext'))
1238
if last_object is not None:
1239
delta = inv._make_delta(last_object)
1240
for old_path, path, file_id, ie in delta:
1243
ie.check(checker, rev_id, inv)
1245
for path, ie in inv.iter_entries():
1246
ie.check(checker, rev_id, inv)
1247
if self._format.fast_deltas:
1249
elif kind == 'chk_bytes':
1250
# No code written to check chk_bytes for this repo format.
1251
checker._report_items.append(
1252
'unsupported key type chk_bytes for %s' % (record.key,))
1253
elif kind == 'texts':
1254
self._check_text(record, checker, item_data)
1256
checker._report_items.append(
1257
'unknown key type %s for %s' % (kind, record.key))
1259
def _check_text(self, record, checker, item_data):
1260
"""Check a single text."""
1261
# Check it is extractable.
1262
# TODO: check length.
1263
if record.storage_kind == 'chunked':
1264
chunks = record.get_bytes_as(record.storage_kind)
1265
sha1 = osutils.sha_strings(chunks)
1266
length = sum(map(len, chunks))
1268
content = record.get_bytes_as('fulltext')
1269
sha1 = osutils.sha_string(content)
1270
length = len(content)
1271
if item_data and sha1 != item_data[1]:
1272
checker._report_items.append(
1273
'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1274
(record.key, sha1, item_data[1], item_data[2]))
1158
1277
def create(a_bzrdir):
1159
1278
"""Construct the current default format repository in a_bzrdir."""
2173
2366
:param revision_ids: The expected revision ids of the inventories.
2367
:param ordering: optional ordering, e.g. 'topological'. If not
2368
specified, the order of revision_ids will be preserved (by
2369
buffering if necessary).
2174
2370
:return: An iterator of inventories.
2176
2372
if ((None in revision_ids)
2177
2373
or (_mod_revision.NULL_REVISION in revision_ids)):
2178
2374
raise ValueError('cannot get null revision inventory')
2179
return self._iter_inventories(revision_ids)
2375
return self._iter_inventories(revision_ids, ordering)
2181
def _iter_inventories(self, revision_ids):
2377
def _iter_inventories(self, revision_ids, ordering):
2182
2378
"""single-document based inventory iteration."""
2183
for text, revision_id in self._iter_inventory_xmls(revision_ids):
2379
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2380
for text, revision_id in inv_xmls:
2184
2381
yield self.deserialise_inventory(revision_id, text)
2186
def _iter_inventory_xmls(self, revision_ids):
2383
def _iter_inventory_xmls(self, revision_ids, ordering):
2384
if ordering is None:
2385
order_as_requested = True
2386
ordering = 'unordered'
2388
order_as_requested = False
2187
2389
keys = [(revision_id,) for revision_id in revision_ids]
2188
stream = self.inventories.get_record_stream(keys, 'unordered', True)
2392
if order_as_requested:
2393
key_iter = iter(keys)
2394
next_key = key_iter.next()
2395
stream = self.inventories.get_record_stream(keys, ordering, True)
2189
2396
text_chunks = {}
2190
2397
for record in stream:
2191
2398
if record.storage_kind != 'absent':
2192
text_chunks[record.key] = record.get_bytes_as('chunked')
2399
chunks = record.get_bytes_as('chunked')
2400
if order_as_requested:
2401
text_chunks[record.key] = chunks
2403
yield ''.join(chunks), record.key[-1]
2194
2405
raise errors.NoSuchRevision(self, record.key)
2196
chunks = text_chunks.pop(key)
2197
yield ''.join(chunks), key[-1]
2406
if order_as_requested:
2407
# Yield as many results as we can while preserving order.
2408
while next_key in text_chunks:
2409
chunks = text_chunks.pop(next_key)
2410
yield ''.join(chunks), next_key[-1]
2412
next_key = key_iter.next()
2413
except StopIteration:
2414
# We still want to fully consume the get_record_stream,
2415
# just in case it is not actually finished at this point
2199
2419
def deserialise_inventory(self, revision_id, xml):
2200
2420
"""Transform the xml into an inventory object.
3418
3705
return self.source.revision_ids_to_search_result(result_set)
3421
class InterPackRepo(InterSameDataRepository):
3422
"""Optimised code paths between Pack based repositories."""
3425
def _get_repo_format_to_test(self):
3426
from bzrlib.repofmt import pack_repo
3427
return pack_repo.RepositoryFormatKnitPack6RichRoot()
3430
def is_compatible(source, target):
3431
"""Be compatible with known Pack formats.
3433
We don't test for the stores being of specific types because that
3434
could lead to confusing results, and there is no need to be
3437
InterPackRepo does not support CHK based repositories.
3439
from bzrlib.repofmt.pack_repo import RepositoryFormatPack
3440
from bzrlib.repofmt.groupcompress_repo import RepositoryFormatCHK1
3442
are_packs = (isinstance(source._format, RepositoryFormatPack) and
3443
isinstance(target._format, RepositoryFormatPack))
3444
not_packs = (isinstance(source._format, RepositoryFormatCHK1) or
3445
isinstance(target._format, RepositoryFormatCHK1))
3446
except AttributeError:
3448
if not_packs or not are_packs:
3450
return InterRepository._same_model(source, target)
3453
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
3455
"""See InterRepository.fetch()."""
3456
if (len(self.source._fallback_repositories) > 0 or
3457
len(self.target._fallback_repositories) > 0):
3458
# The pack layer is not aware of fallback repositories, so when
3459
# fetching from a stacked repository or into a stacked repository
3460
# we use the generic fetch logic which uses the VersionedFiles
3461
# attributes on repository.
3462
from bzrlib.fetch import RepoFetcher
3463
fetcher = RepoFetcher(self.target, self.source, revision_id,
3464
pb, find_ghosts, fetch_spec=fetch_spec)
3465
if fetch_spec is not None:
3466
if len(list(fetch_spec.heads)) != 1:
3467
raise AssertionError(
3468
"InterPackRepo.fetch doesn't support "
3469
"fetching multiple heads yet.")
3470
revision_id = list(fetch_spec.heads)[0]
3472
if revision_id is None:
3474
# everything to do - use pack logic
3475
# to fetch from all packs to one without
3476
# inventory parsing etc, IFF nothing to be copied is in the target.
3478
source_revision_ids = frozenset(self.source.all_revision_ids())
3479
revision_ids = source_revision_ids - \
3480
frozenset(self.target.get_parent_map(source_revision_ids))
3481
revision_keys = [(revid,) for revid in revision_ids]
3482
index = self.target._pack_collection.revision_index.combined_index
3483
present_revision_ids = set(item[1][0] for item in
3484
index.iter_entries(revision_keys))
3485
revision_ids = set(revision_ids) - present_revision_ids
3486
# implementing the TODO will involve:
3487
# - detecting when all of a pack is selected
3488
# - avoiding as much as possible pre-selection, so the
3489
# more-core routines such as create_pack_from_packs can filter in
3490
# a just-in-time fashion. (though having a HEADS list on a
3491
# repository might make this a lot easier, because we could
3492
# sensibly detect 'new revisions' without doing a full index scan.
3493
elif _mod_revision.is_null(revision_id):
3497
revision_ids = self.search_missing_revision_ids(revision_id,
3498
find_ghosts=find_ghosts).get_keys()
3499
if len(revision_ids) == 0:
3501
return self._pack(self.source, self.target, revision_ids)
3503
def _pack(self, source, target, revision_ids):
3504
from bzrlib.repofmt.pack_repo import Packer
3505
packs = source._pack_collection.all_packs()
3506
pack = Packer(self.target._pack_collection, packs, '.fetch',
3507
revision_ids).pack()
3508
if pack is not None:
3509
self.target._pack_collection._save_pack_names()
3510
copied_revs = pack.get_revision_count()
3511
# Trigger an autopack. This may duplicate effort as we've just done
3512
# a pack creation, but for now it is simpler to think about as
3513
# 'upload data, then repack if needed'.
3514
self.target._pack_collection.autopack()
3515
return (copied_revs, [])
3520
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
3521
"""See InterRepository.missing_revision_ids().
3523
:param find_ghosts: Find ghosts throughout the ancestry of
3526
if not find_ghosts and revision_id is not None:
3527
return self._walk_to_common_revisions([revision_id])
3528
elif revision_id is not None:
3529
# Find ghosts: search for revisions pointing from one repository to
3530
# the other, and vice versa, anywhere in the history of revision_id.
3531
graph = self.target.get_graph(other_repository=self.source)
3532
searcher = graph._make_breadth_first_searcher([revision_id])
3536
next_revs, ghosts = searcher.next_with_ghosts()
3537
except StopIteration:
3539
if revision_id in ghosts:
3540
raise errors.NoSuchRevision(self.source, revision_id)
3541
found_ids.update(next_revs)
3542
found_ids.update(ghosts)
3543
found_ids = frozenset(found_ids)
3544
# Double query here: should be able to avoid this by changing the
3545
# graph api further.
3546
result_set = found_ids - frozenset(
3547
self.target.get_parent_map(found_ids))
3549
source_ids = self.source.all_revision_ids()
3550
# source_ids is the worst possible case we may need to pull.
3551
# now we want to filter source_ids against what we actually
3552
# have in target, but don't try to check for existence where we know
3553
# we do not have a revision as that would be pointless.
3554
target_ids = set(self.target.all_revision_ids())
3555
result_set = set(source_ids).difference(target_ids)
3556
return self.source.revision_ids_to_search_result(result_set)
3559
3708
class InterDifferingSerializer(InterRepository):
3568
3717
# This is redundant with format.check_conversion_target(), however that
3569
3718
# raises an exception, and we just want to say "False" as in we won't
3570
3719
# support converting between these formats.
3720
if 'IDS_never' in debug.debug_flags:
3571
3722
if source.supports_rich_root() and not target.supports_rich_root():
3573
3724
if (source._format.supports_tree_reference
3574
3725
and not target._format.supports_tree_reference):
3727
if target._fallback_repositories and target._format.supports_chks:
3728
# IDS doesn't know how to copy CHKs for the parent inventories it
3729
# adds to stacked repos.
3731
if 'IDS_always' in debug.debug_flags:
3733
# Only use this code path for local source and target. IDS does far
3734
# too much IO (both bandwidth and roundtrips) over a network.
3735
if not source.bzrdir.transport.base.startswith('file:///'):
3737
if not target.bzrdir.transport.base.startswith('file:///'):
3578
def _get_delta_for_revision(self, tree, parent_ids, basis_id, cache):
3741
def _get_trees(self, revision_ids, cache):
3743
for rev_id in revision_ids:
3745
possible_trees.append((rev_id, cache[rev_id]))
3747
# Not cached, but inventory might be present anyway.
3749
tree = self.source.revision_tree(rev_id)
3750
except errors.NoSuchRevision:
3751
# Nope, parent is ghost.
3754
cache[rev_id] = tree
3755
possible_trees.append((rev_id, tree))
3756
return possible_trees
3758
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3579
3759
"""Get the best delta and base for this revision.
3581
3761
:return: (basis_id, delta)
3583
possible_trees = [(parent_id, cache[parent_id])
3584
for parent_id in parent_ids
3585
if parent_id in cache]
3586
if len(possible_trees) == 0:
3587
# There either aren't any parents, or the parents aren't in the
3588
# cache, so just use the last converted tree
3589
possible_trees.append((basis_id, cache[basis_id]))
3764
# Generate deltas against each tree, to find the shortest.
3765
texts_possibly_new_in_tree = set()
3591
3766
for basis_id, basis_tree in possible_trees:
3592
3767
delta = tree.inventory._make_delta(basis_tree.inventory)
3768
for old_path, new_path, file_id, new_entry in delta:
3769
if new_path is None:
3770
# This file_id isn't present in the new rev, so we don't
3774
# Rich roots are handled elsewhere...
3776
kind = new_entry.kind
3777
if kind != 'directory' and kind != 'file':
3778
# No text record associated with this inventory entry.
3780
# This is a directory or file that has changed somehow.
3781
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3593
3782
deltas.append((len(delta), basis_id, delta))
3595
3784
return deltas[0][1:]
3597
def _get_parent_keys(self, root_key, parent_map):
3598
"""Get the parent keys for a given root id."""
3599
root_id, rev_id = root_key
3600
# Include direct parents of the revision, but only if they used
3601
# the same root_id and are heads.
3603
for parent_id in parent_map[rev_id]:
3604
if parent_id == _mod_revision.NULL_REVISION:
3606
if parent_id not in self._revision_id_to_root_id:
3607
# We probably didn't read this revision, go spend the
3608
# extra effort to actually check
3610
tree = self.source.revision_tree(parent_id)
3611
except errors.NoSuchRevision:
3612
# Ghost, fill out _revision_id_to_root_id in case we
3613
# encounter this again.
3614
# But set parent_root_id to None since we don't really know
3615
parent_root_id = None
3617
parent_root_id = tree.get_root_id()
3618
self._revision_id_to_root_id[parent_id] = None
3620
parent_root_id = self._revision_id_to_root_id[parent_id]
3621
if root_id == parent_root_id:
3622
# With stacking we _might_ want to refer to a non-local
3623
# revision, but this code path only applies when we have the
3624
# full content available, so ghosts really are ghosts, not just
3625
# the edge of local data.
3626
parent_keys.append((parent_id,))
3628
# root_id may be in the parent anyway.
3630
tree = self.source.revision_tree(parent_id)
3631
except errors.NoSuchRevision:
3632
# ghost, can't refer to it.
3636
parent_keys.append((tree.inventory[root_id].revision,))
3637
except errors.NoSuchId:
3640
g = graph.Graph(self.source.revisions)
3641
heads = g.heads(parent_keys)
3643
for key in parent_keys:
3644
if key in heads and key not in selected_keys:
3645
selected_keys.append(key)
3646
return tuple([(root_id,)+ key for key in selected_keys])
3786
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3787
"""Find all parent revisions that are absent, but for which the
3788
inventory is present, and copy those inventories.
3648
def _new_root_data_stream(self, root_keys_to_create, parent_map):
3649
for root_key in root_keys_to_create:
3650
parent_keys = self._get_parent_keys(root_key, parent_map)
3651
yield versionedfile.FulltextContentFactory(root_key,
3652
parent_keys, None, '')
3790
This is necessary to preserve correctness when the source is stacked
3791
without fallbacks configured. (Note that in cases like upgrade the
3792
source may be not have _fallback_repositories even though it is
3796
for parents in parent_map.values():
3797
parent_revs.update(parents)
3798
present_parents = self.source.get_parent_map(parent_revs)
3799
absent_parents = set(parent_revs).difference(present_parents)
3800
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3801
(rev_id,) for rev_id in absent_parents)
3802
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3803
for parent_tree in self.source.revision_trees(parent_inv_ids):
3804
current_revision_id = parent_tree.get_revision_id()
3805
parents_parents_keys = parent_invs_keys_for_stacking[
3806
(current_revision_id,)]
3807
parents_parents = [key[-1] for key in parents_parents_keys]
3808
basis_id = _mod_revision.NULL_REVISION
3809
basis_tree = self.source.revision_tree(basis_id)
3810
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3811
self.target.add_inventory_by_delta(
3812
basis_id, delta, current_revision_id, parents_parents)
3813
cache[current_revision_id] = parent_tree
3654
3815
def _fetch_batch(self, revision_ids, basis_id, cache):
3655
3816
"""Fetch across a few revisions.
3669
3830
pending_deltas = []
3670
3831
pending_revisions = []
3671
3832
parent_map = self.source.get_parent_map(revision_ids)
3833
self._fetch_parent_invs_for_stacking(parent_map, cache)
3672
3834
for tree in self.source.revision_trees(revision_ids):
3835
# Find a inventory delta for this revision.
3836
# Find text entries that need to be copied, too.
3673
3837
current_revision_id = tree.get_revision_id()
3674
3838
parent_ids = parent_map.get(current_revision_id, ())
3839
parent_trees = self._get_trees(parent_ids, cache)
3840
possible_trees = list(parent_trees)
3841
if len(possible_trees) == 0:
3842
# There either aren't any parents, or the parents are ghosts,
3843
# so just use the last converted tree.
3844
possible_trees.append((basis_id, cache[basis_id]))
3675
3845
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3677
3847
if self._converting_to_rich_root:
3678
3848
self._revision_id_to_root_id[current_revision_id] = \
3679
3849
tree.get_root_id()
3680
# Find text entries that need to be copied
3850
# Determine which texts are in present in this revision but not in
3851
# any of the available parents.
3852
texts_possibly_new_in_tree = set()
3681
3853
for old_path, new_path, file_id, entry in delta:
3682
if new_path is not None:
3685
if not self.target.supports_rich_root():
3686
# The target doesn't support rich root, so we don't
3689
if self._converting_to_rich_root:
3690
# This can't be copied normally, we have to insert
3692
root_keys_to_create.add((file_id, entry.revision))
3694
text_keys.add((file_id, entry.revision))
3854
if new_path is None:
3855
# This file_id isn't present in the new rev
3859
if not self.target.supports_rich_root():
3860
# The target doesn't support rich root, so we don't
3863
if self._converting_to_rich_root:
3864
# This can't be copied normally, we have to insert
3866
root_keys_to_create.add((file_id, entry.revision))
3869
texts_possibly_new_in_tree.add((file_id, entry.revision))
3870
for basis_id, basis_tree in possible_trees:
3871
basis_inv = basis_tree.inventory
3872
for file_key in list(texts_possibly_new_in_tree):
3873
file_id, file_revision = file_key
3875
entry = basis_inv[file_id]
3876
except errors.NoSuchId:
3878
if entry.revision == file_revision:
3879
texts_possibly_new_in_tree.remove(file_key)
3880
text_keys.update(texts_possibly_new_in_tree)
3695
3881
revision = self.source.get_revision(current_revision_id)
3696
3882
pending_deltas.append((basis_id, delta,
3697
3883
current_revision_id, revision.parent_ids))
4115
4329
# missing keys can handle suspending a write group).
4116
4330
write_group_tokens = self.target_repo.suspend_write_group()
4117
4331
return write_group_tokens, missing_keys
4118
self.target_repo.commit_write_group()
4332
hint = self.target_repo.commit_write_group()
4333
if (to_serializer != src_serializer and
4334
self.target_repo._format.pack_compresses):
4335
self.target_repo.pack(hint=hint)
4119
4336
return [], set()
4121
def _extract_and_insert_inventories(self, substream, serializer):
4338
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4339
target_rich_root = self.target_repo._format.rich_root_data
4340
target_tree_refs = self.target_repo._format.supports_tree_reference
4341
for record in substream:
4342
# Insert the delta directly
4343
inventory_delta_bytes = record.get_bytes_as('fulltext')
4344
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4346
parse_result = deserialiser.parse_text_bytes(
4347
inventory_delta_bytes)
4348
except inventory_delta.IncompatibleInventoryDelta, err:
4349
trace.mutter("Incompatible delta: %s", err.msg)
4350
raise errors.IncompatibleRevision(self.target_repo._format)
4351
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4352
revision_id = new_id
4353
parents = [key[0] for key in record.parents]
4354
self.target_repo.add_inventory_by_delta(
4355
basis_id, inv_delta, revision_id, parents)
4357
def _extract_and_insert_inventories(self, substream, serializer,
4122
4359
"""Generate a new inventory versionedfile in target, converting data.
4124
4361
The inventory is retrieved from the source, (deserializing it), and
4125
4362
stored in the target (reserializing it in a different format).
4364
target_rich_root = self.target_repo._format.rich_root_data
4365
target_tree_refs = self.target_repo._format.supports_tree_reference
4127
4366
for record in substream:
4367
# It's not a delta, so it must be a fulltext in the source
4368
# serializer's format.
4128
4369
bytes = record.get_bytes_as('fulltext')
4129
4370
revision_id = record.key[0]
4130
4371
inv = serializer.read_inventory_from_string(bytes, revision_id)
4131
4372
parents = [key[0] for key in record.parents]
4132
4373
self.target_repo.add_inventory(revision_id, inv, parents)
4374
# No need to keep holding this full inv in memory when the rest of
4375
# the substream is likely to be all deltas.
4134
4378
def _extract_and_insert_revisions(self, substream, serializer):
4135
4379
for record in substream:
4293
4543
return (not self.from_repository._format.rich_root_data and
4294
4544
self.to_format.rich_root_data)
4296
def _get_inventory_stream(self, revision_ids):
4546
def _get_inventory_stream(self, revision_ids, missing=False):
4297
4547
from_format = self.from_repository._format
4298
if (from_format.supports_chks and self.to_format.supports_chks
4299
and (from_format._serializer == self.to_format._serializer)):
4300
# Both sides support chks, and they use the same serializer, so it
4301
# is safe to transmit the chk pages and inventory pages across
4303
return self._get_chk_inventory_stream(revision_ids)
4304
elif (not from_format.supports_chks):
4305
# Source repository doesn't support chks. So we can transmit the
4306
# inventories 'as-is' and either they are just accepted on the
4307
# target, or the Sink will properly convert it.
4308
return self._get_simple_inventory_stream(revision_ids)
4548
if (from_format.supports_chks and self.to_format.supports_chks and
4549
from_format.network_name() == self.to_format.network_name()):
4550
raise AssertionError(
4551
"this case should be handled by GroupCHKStreamSource")
4552
elif 'forceinvdeltas' in debug.debug_flags:
4553
return self._get_convertable_inventory_stream(revision_ids,
4554
delta_versus_null=missing)
4555
elif from_format.network_name() == self.to_format.network_name():
4557
return self._get_simple_inventory_stream(revision_ids,
4559
elif (not from_format.supports_chks and not self.to_format.supports_chks
4560
and from_format._serializer == self.to_format._serializer):
4561
# Essentially the same format.
4562
return self._get_simple_inventory_stream(revision_ids,
4310
# XXX: Hack to make not-chk->chk fetch: copy the inventories as
4311
# inventories. Note that this should probably be done somehow
4312
# as part of bzrlib.repository.StreamSink. Except JAM couldn't
4313
# figure out how a non-chk repository could possibly handle
4314
# deserializing an inventory stream from a chk repo, as it
4315
# doesn't have a way to understand individual pages.
4316
return self._get_convertable_inventory_stream(revision_ids)
4565
# Any time we switch serializations, we want to use an
4566
# inventory-delta based approach.
4567
return self._get_convertable_inventory_stream(revision_ids,
4568
delta_versus_null=missing)
4318
def _get_simple_inventory_stream(self, revision_ids):
4570
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4571
# NB: This currently reopens the inventory weave in source;
4572
# using a single stream interface instead would avoid this.
4319
4573
from_weave = self.from_repository.inventories
4575
delta_closure = True
4577
delta_closure = not self.delta_on_metadata()
4320
4578
yield ('inventories', from_weave.get_record_stream(
4321
4579
[(rev_id,) for rev_id in revision_ids],
4322
self.inventory_fetch_order(),
4323
not self.delta_on_metadata()))
4325
def _get_chk_inventory_stream(self, revision_ids):
4326
"""Fetch the inventory texts, along with the associated chk maps."""
4327
# We want an inventory outside of the search set, so that we can filter
4328
# out uninteresting chk pages. For now we use
4329
# _find_revision_outside_set, but if we had a Search with cut_revs, we
4330
# could use that instead.
4331
start_rev_id = self.from_repository._find_revision_outside_set(
4333
start_rev_key = (start_rev_id,)
4334
inv_keys_to_fetch = [(rev_id,) for rev_id in revision_ids]
4335
if start_rev_id != _mod_revision.NULL_REVISION:
4336
inv_keys_to_fetch.append((start_rev_id,))
4337
# Any repo that supports chk_bytes must also support out-of-order
4338
# insertion. At least, that is how we expect it to work
4339
# We use get_record_stream instead of iter_inventories because we want
4340
# to be able to insert the stream as well. We could instead fetch
4341
# allowing deltas, and then iter_inventories, but we don't know whether
4342
# source or target is more 'local' anway.
4343
inv_stream = self.from_repository.inventories.get_record_stream(
4344
inv_keys_to_fetch, 'unordered',
4345
True) # We need them as full-texts so we can find their references
4346
uninteresting_chk_roots = set()
4347
interesting_chk_roots = set()
4348
def filter_inv_stream(inv_stream):
4349
for idx, record in enumerate(inv_stream):
4350
### child_pb.update('fetch inv', idx, len(inv_keys_to_fetch))
4351
bytes = record.get_bytes_as('fulltext')
4352
chk_inv = inventory.CHKInventory.deserialise(
4353
self.from_repository.chk_bytes, bytes, record.key)
4354
if record.key == start_rev_key:
4355
uninteresting_chk_roots.add(chk_inv.id_to_entry.key())
4356
p_id_map = chk_inv.parent_id_basename_to_file_id
4357
if p_id_map is not None:
4358
uninteresting_chk_roots.add(p_id_map.key())
4361
interesting_chk_roots.add(chk_inv.id_to_entry.key())
4362
p_id_map = chk_inv.parent_id_basename_to_file_id
4363
if p_id_map is not None:
4364
interesting_chk_roots.add(p_id_map.key())
4365
### pb.update('fetch inventory', 0, 2)
4366
yield ('inventories', filter_inv_stream(inv_stream))
4367
# Now that we have worked out all of the interesting root nodes, grab
4368
# all of the interesting pages and insert them
4369
### pb.update('fetch inventory', 1, 2)
4370
interesting = chk_map.iter_interesting_nodes(
4371
self.from_repository.chk_bytes, interesting_chk_roots,
4372
uninteresting_chk_roots)
4373
def to_stream_adapter():
4374
"""Adapt the iter_interesting_nodes result to a single stream.
4376
iter_interesting_nodes returns records as it processes them, along
4377
with keys. However, we only want to return the records themselves.
4379
for record, items in interesting:
4380
if record is not None:
4382
# XXX: We could instead call get_record_stream(records.keys())
4383
# ATM, this will always insert the records as fulltexts, and
4384
# requires that you can hang on to records once you have gone
4385
# on to the next one. Further, it causes the target to
4386
# recompress the data. Testing shows it to be faster than
4387
# requesting the records again, though.
4388
yield ('chk_bytes', to_stream_adapter())
4389
### pb.update('fetch inventory', 2, 2)
4391
def _get_convertable_inventory_stream(self, revision_ids):
4392
# XXX: One of source or target is using chks, and they don't have
4393
# compatible serializations. The StreamSink code expects to be
4394
# able to convert on the target, so we need to put
4395
# bytes-on-the-wire that can be converted
4396
yield ('inventories', self._stream_invs_as_fulltexts(revision_ids))
4398
def _stream_invs_as_fulltexts(self, revision_ids):
4580
self.inventory_fetch_order(), delta_closure))
4582
def _get_convertable_inventory_stream(self, revision_ids,
4583
delta_versus_null=False):
4584
# The source is using CHKs, but the target either doesn't or it has a
4585
# different serializer. The StreamSink code expects to be able to
4586
# convert on the target, so we need to put bytes-on-the-wire that can
4587
# be converted. That means inventory deltas (if the remote is <1.19,
4588
# RemoteStreamSink will fallback to VFS to insert the deltas).
4589
yield ('inventory-deltas',
4590
self._stream_invs_as_deltas(revision_ids,
4591
delta_versus_null=delta_versus_null))
4593
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4594
"""Return a stream of inventory-deltas for the given rev ids.
4596
:param revision_ids: The list of inventories to transmit
4597
:param delta_versus_null: Don't try to find a minimal delta for this
4598
entry, instead compute the delta versus the NULL_REVISION. This
4599
effectively streams a complete inventory. Used for stuff like
4600
filling in missing parents, etc.
4399
4602
from_repo = self.from_repository
4400
from_serializer = from_repo._format._serializer
4401
4603
revision_keys = [(rev_id,) for rev_id in revision_ids]
4402
4604
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4403
for inv in self.from_repository.iter_inventories(revision_ids):
4404
# XXX: This is a bit hackish, but it works. Basically,
4405
# CHKSerializer 'accidentally' supports
4406
# read/write_inventory_to_string, even though that is never
4407
# the format that is stored on disk. It *does* give us a
4408
# single string representation for an inventory, so live with
4410
# This would be far better if we had a 'serialized inventory
4411
# delta' form. Then we could use 'inventory._make_delta', and
4412
# transmit that. This would both be faster to generate, and
4413
# result in fewer bytes-on-the-wire.
4414
as_bytes = from_serializer.write_inventory_to_string(inv)
4605
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4607
inventories = self.from_repository.iter_inventories(
4608
revision_ids, 'topological')
4609
format = from_repo._format
4610
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4611
inventory_cache = lru_cache.LRUCache(50)
4612
null_inventory = from_repo.revision_tree(
4613
_mod_revision.NULL_REVISION).inventory
4614
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4615
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4616
# repo back into a non-rich-root repo ought to be allowed)
4617
serializer = inventory_delta.InventoryDeltaSerializer(
4618
versioned_root=format.rich_root_data,
4619
tree_references=format.supports_tree_reference)
4620
for inv in inventories:
4415
4621
key = (inv.revision_id,)
4416
4622
parent_keys = parent_map.get(key, ())
4624
if not delta_versus_null and parent_keys:
4625
# The caller did not ask for complete inventories and we have
4626
# some parents that we can delta against. Make a delta against
4627
# each parent so that we can find the smallest.
4628
parent_ids = [parent_key[0] for parent_key in parent_keys]
4629
for parent_id in parent_ids:
4630
if parent_id not in invs_sent_so_far:
4631
# We don't know that the remote side has this basis, so
4634
if parent_id == _mod_revision.NULL_REVISION:
4635
parent_inv = null_inventory
4637
parent_inv = inventory_cache.get(parent_id, None)
4638
if parent_inv is None:
4639
parent_inv = from_repo.get_inventory(parent_id)
4640
candidate_delta = inv._make_delta(parent_inv)
4641
if (delta is None or
4642
len(delta) > len(candidate_delta)):
4643
delta = candidate_delta
4644
basis_id = parent_id
4646
# Either none of the parents ended up being suitable, or we
4647
# were asked to delta against NULL
4648
basis_id = _mod_revision.NULL_REVISION
4649
delta = inv._make_delta(null_inventory)
4650
invs_sent_so_far.add(inv.revision_id)
4651
inventory_cache[inv.revision_id] = inv
4652
delta_serialized = ''.join(
4653
serializer.delta_to_lines(basis_id, key[-1], delta))
4417
4654
yield versionedfile.FulltextContentFactory(
4418
key, parent_keys, None, as_bytes)
4655
key, parent_keys, None, delta_serialized)
4658
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4659
stop_revision=None):
4660
"""Extend the partial history to include a given index
4662
If a stop_index is supplied, stop when that index has been reached.
4663
If a stop_revision is supplied, stop when that revision is
4664
encountered. Otherwise, stop when the beginning of history is
4667
:param stop_index: The index which should be present. When it is
4668
present, history extension will stop.
4669
:param stop_revision: The revision id which should be present. When
4670
it is encountered, history extension will stop.
4672
start_revision = partial_history_cache[-1]
4673
iterator = repo.iter_reverse_revision_history(start_revision)
4675
#skip the last revision in the list
4678
if (stop_index is not None and
4679
len(partial_history_cache) > stop_index):
4681
if partial_history_cache[-1] == stop_revision:
4683
revision_id = iterator.next()
4684
partial_history_cache.append(revision_id)
4685
except StopIteration:
added
removed
bzrlib/repository.py
