1167
1150
# The old API returned a list, should this actually be a set?
1168
1151
return parent_map.keys()
1170
def _check_inventories(self, checker):
1171
"""Check the inventories found from the revision scan.
1173
This is responsible for verifying the sha1 of inventories and
1174
creating a pending_keys set that covers data referenced by inventories.
1176
bar = ui.ui_factory.nested_progress_bar()
1178
self._do_check_inventories(checker, bar)
1182
def _do_check_inventories(self, checker, bar):
1183
"""Helper for _check_inventories."""
1185
keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1186
kinds = ['chk_bytes', 'texts']
1187
count = len(checker.pending_keys)
1188
bar.update("inventories", 0, 2)
1189
current_keys = checker.pending_keys
1190
checker.pending_keys = {}
1191
# Accumulate current checks.
1192
for key in current_keys:
1193
if key[0] != 'inventories' and key[0] not in kinds:
1194
checker._report_items.append('unknown key type %r' % (key,))
1195
keys[key[0]].add(key[1:])
1196
if keys['inventories']:
1197
# NB: output order *should* be roughly sorted - topo or
1198
# inverse topo depending on repository - either way decent
1199
# to just delta against. However, pre-CHK formats didn't
1200
# try to optimise inventory layout on disk. As such the
1201
# pre-CHK code path does not use inventory deltas.
1203
for record in self.inventories.check(keys=keys['inventories']):
1204
if record.storage_kind == 'absent':
1205
checker._report_items.append(
1206
'Missing inventory {%s}' % (record.key,))
1208
last_object = self._check_record('inventories', record,
1209
checker, last_object,
1210
current_keys[('inventories',) + record.key])
1211
del keys['inventories']
1214
bar.update("texts", 1)
1215
while (checker.pending_keys or keys['chk_bytes']
1217
# Something to check.
1218
current_keys = checker.pending_keys
1219
checker.pending_keys = {}
1220
# Accumulate current checks.
1221
for key in current_keys:
1222
if key[0] not in kinds:
1223
checker._report_items.append('unknown key type %r' % (key,))
1224
keys[key[0]].add(key[1:])
1225
# Check the outermost kind only - inventories || chk_bytes || texts
1229
for record in getattr(self, kind).check(keys=keys[kind]):
1230
if record.storage_kind == 'absent':
1231
checker._report_items.append(
1232
'Missing %s {%s}' % (kind, record.key,))
1234
last_object = self._check_record(kind, record,
1235
checker, last_object, current_keys[(kind,) + record.key])
1239
def _check_record(self, kind, record, checker, last_object, item_data):
1240
"""Check a single text from this repository."""
1241
if kind == 'inventories':
1242
rev_id = record.key[0]
1243
inv = self._deserialise_inventory(rev_id,
1244
record.get_bytes_as('fulltext'))
1245
if last_object is not None:
1246
delta = inv._make_delta(last_object)
1247
for old_path, path, file_id, ie in delta:
1250
ie.check(checker, rev_id, inv)
1252
for path, ie in inv.iter_entries():
1253
ie.check(checker, rev_id, inv)
1254
if self._format.fast_deltas:
1256
elif kind == 'chk_bytes':
1257
# No code written to check chk_bytes for this repo format.
1258
checker._report_items.append(
1259
'unsupported key type chk_bytes for %s' % (record.key,))
1260
elif kind == 'texts':
1261
self._check_text(record, checker, item_data)
1263
checker._report_items.append(
1264
'unknown key type %s for %s' % (kind, record.key))
1266
def _check_text(self, record, checker, item_data):
1267
"""Check a single text."""
1268
# Check it is extractable.
1269
# TODO: check length.
1270
if record.storage_kind == 'chunked':
1271
chunks = record.get_bytes_as(record.storage_kind)
1272
sha1 = osutils.sha_strings(chunks)
1273
length = sum(map(len, chunks))
1275
content = record.get_bytes_as('fulltext')
1276
sha1 = osutils.sha_string(content)
1277
length = len(content)
1278
if item_data and sha1 != item_data[1]:
1279
checker._report_items.append(
1280
'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1281
(record.key, sha1, item_data[1], item_data[2]))
1284
1154
def create(a_bzrdir):
1285
1155
"""Construct the current default format repository in a_bzrdir."""
1858
1694
@needs_read_lock
1859
1695
def get_revisions(self, revision_ids):
1860
"""Get many revisions at once.
1862
Repositories that need to check data on every revision read should
1863
subclass this method.
1696
"""Get many revisions at once."""
1865
1697
return self._get_revisions(revision_ids)
1867
1699
@needs_read_lock
1868
1700
def _get_revisions(self, revision_ids):
1869
1701
"""Core work logic to get many revisions without sanity checks."""
1702
for rev_id in revision_ids:
1703
if not rev_id or not isinstance(rev_id, basestring):
1704
raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
1705
keys = [(key,) for key in revision_ids]
1706
stream = self.revisions.get_record_stream(keys, 'unordered', True)
1871
for revid, rev in self._iter_revisions(revision_ids):
1873
raise errors.NoSuchRevision(self, revid)
1708
for record in stream:
1709
if record.storage_kind == 'absent':
1710
raise errors.NoSuchRevision(self, record.key[0])
1711
text = record.get_bytes_as('fulltext')
1712
rev = self._serializer.read_revision_from_string(text)
1713
revs[record.key[0]] = rev
1875
1714
return [revs[revid] for revid in revision_ids]
1877
def _iter_revisions(self, revision_ids):
1878
"""Iterate over revision objects.
1880
:param revision_ids: An iterable of revisions to examine. None may be
1881
passed to request all revisions known to the repository. Note that
1882
not all repositories can find unreferenced revisions; for those
1883
repositories only referenced ones will be returned.
1884
:return: An iterator of (revid, revision) tuples. Absent revisions (
1885
those asked for but not available) are returned as (revid, None).
1887
if revision_ids is None:
1888
revision_ids = self.all_revision_ids()
1890
for rev_id in revision_ids:
1891
if not rev_id or not isinstance(rev_id, basestring):
1892
raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
1893
keys = [(key,) for key in revision_ids]
1894
stream = self.revisions.get_record_stream(keys, 'unordered', True)
1895
for record in stream:
1896
revid = record.key[0]
1897
if record.storage_kind == 'absent':
1900
text = record.get_bytes_as('fulltext')
1901
rev = self._serializer.read_revision_from_string(text)
1904
1716
@needs_read_lock
1905
1717
def get_revision_xml(self, revision_id):
1906
1718
# TODO: jam 20070210 This shouldn't be necessary since get_revision
2376
2166
:param revision_ids: The expected revision ids of the inventories.
2377
:param ordering: optional ordering, e.g. 'topological'. If not
2378
specified, the order of revision_ids will be preserved (by
2379
buffering if necessary).
2380
2167
:return: An iterator of inventories.
2382
2169
if ((None in revision_ids)
2383
2170
or (_mod_revision.NULL_REVISION in revision_ids)):
2384
2171
raise ValueError('cannot get null revision inventory')
2385
return self._iter_inventories(revision_ids, ordering)
2172
return self._iter_inventories(revision_ids)
2387
def _iter_inventories(self, revision_ids, ordering):
2174
def _iter_inventories(self, revision_ids):
2388
2175
"""single-document based inventory iteration."""
2389
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2390
for text, revision_id in inv_xmls:
2391
yield self._deserialise_inventory(revision_id, text)
2176
for text, revision_id in self._iter_inventory_xmls(revision_ids):
2177
yield self.deserialise_inventory(revision_id, text)
2393
def _iter_inventory_xmls(self, revision_ids, ordering):
2394
if ordering is None:
2395
order_as_requested = True
2396
ordering = 'unordered'
2398
order_as_requested = False
2179
def _iter_inventory_xmls(self, revision_ids):
2399
2180
keys = [(revision_id,) for revision_id in revision_ids]
2402
if order_as_requested:
2403
key_iter = iter(keys)
2404
next_key = key_iter.next()
2405
stream = self.inventories.get_record_stream(keys, ordering, True)
2181
stream = self.inventories.get_record_stream(keys, 'unordered', True)
2406
2182
text_chunks = {}
2407
2183
for record in stream:
2408
2184
if record.storage_kind != 'absent':
2409
chunks = record.get_bytes_as('chunked')
2410
if order_as_requested:
2411
text_chunks[record.key] = chunks
2413
yield ''.join(chunks), record.key[-1]
2185
text_chunks[record.key] = record.get_bytes_as('chunked')
2415
2187
raise errors.NoSuchRevision(self, record.key)
2416
if order_as_requested:
2417
# Yield as many results as we can while preserving order.
2418
while next_key in text_chunks:
2419
chunks = text_chunks.pop(next_key)
2420
yield ''.join(chunks), next_key[-1]
2422
next_key = key_iter.next()
2423
except StopIteration:
2424
# We still want to fully consume the get_record_stream,
2425
# just in case it is not actually finished at this point
2189
chunks = text_chunks.pop(key)
2190
yield ''.join(chunks), key[-1]
2429
def _deserialise_inventory(self, revision_id, xml):
2192
def deserialise_inventory(self, revision_id, xml):
2430
2193
"""Transform the xml into an inventory object.
2432
2195
:param revision_id: The expected revision id of the inventory.
2433
2196
:param xml: A serialised inventory.
2435
2198
result = self._serializer.read_inventory_from_string(xml, revision_id,
2436
entry_cache=self._inventory_entry_cache,
2437
return_from_cache=self._safe_to_return_from_cache)
2199
entry_cache=self._inventory_entry_cache)
2438
2200
if result.revision_id != revision_id:
2439
2201
raise AssertionError('revision id mismatch %s != %s' % (
2440
2202
result.revision_id, revision_id))
2443
def _serialise_inventory(self, inv):
2205
def serialise_inventory(self, inv):
2444
2206
return self._serializer.write_inventory_to_string(inv)
2446
2208
def _serialise_inventory_to_lines(self, inv):
2450
2212
return self._serializer.format_num
2452
2214
@needs_read_lock
2453
def _get_inventory_xml(self, revision_id):
2454
"""Get serialized inventory as a string."""
2455
texts = self._iter_inventory_xmls([revision_id], 'unordered')
2215
def get_inventory_xml(self, revision_id):
2216
"""Get inventory XML as a file object."""
2217
texts = self._iter_inventory_xmls([revision_id])
2457
2219
text, revision_id = texts.next()
2458
2220
except StopIteration:
2459
2221
raise errors.HistoryMissing(self, 'inventory', revision_id)
2462
def get_rev_id_for_revno(self, revno, known_pair):
2463
"""Return the revision id of a revno, given a later (revno, revid)
2464
pair in the same history.
2466
:return: if found (True, revid). If the available history ran out
2467
before reaching the revno, then this returns
2468
(False, (closest_revno, closest_revid)).
2225
def get_inventory_sha1(self, revision_id):
2226
"""Return the sha1 hash of the inventory entry
2470
known_revno, known_revid = known_pair
2471
partial_history = [known_revid]
2472
distance_from_known = known_revno - revno
2473
if distance_from_known < 0:
2475
'requested revno (%d) is later than given known revno (%d)'
2476
% (revno, known_revno))
2479
self, partial_history, stop_index=distance_from_known)
2480
except errors.RevisionNotPresent, err:
2481
if err.revision_id == known_revid:
2482
# The start revision (known_revid) wasn't found.
2484
# This is a stacked repository with no fallbacks, or a there's a
2485
# left-hand ghost. Either way, even though the revision named in
2486
# the error isn't in this repo, we know it's the next step in this
2487
# left-hand history.
2488
partial_history.append(err.revision_id)
2489
if len(partial_history) <= distance_from_known:
2490
# Didn't find enough history to get a revid for the revno.
2491
earliest_revno = known_revno - len(partial_history) + 1
2492
return (False, (earliest_revno, partial_history[-1]))
2493
if len(partial_history) - 1 > distance_from_known:
2494
raise AssertionError('_iter_for_revno returned too much history')
2495
return (True, partial_history[-1])
2228
return self.get_revision(revision_id).inventory_sha1
2497
2230
def iter_reverse_revision_history(self, revision_id):
2498
2231
"""Iterate backwards through revision ids in the lefthand history
3718
3401
return self.source.revision_ids_to_search_result(result_set)
3404
class InterPackRepo(InterSameDataRepository):
3405
"""Optimised code paths between Pack based repositories."""
3408
def _get_repo_format_to_test(self):
3409
from bzrlib.repofmt import pack_repo
3410
return pack_repo.RepositoryFormatKnitPack6RichRoot()
3413
def is_compatible(source, target):
3414
"""Be compatible with known Pack formats.
3416
We don't test for the stores being of specific types because that
3417
could lead to confusing results, and there is no need to be
3420
InterPackRepo does not support CHK based repositories.
3422
from bzrlib.repofmt.pack_repo import RepositoryFormatPack
3423
from bzrlib.repofmt.groupcompress_repo import RepositoryFormatCHK1
3425
are_packs = (isinstance(source._format, RepositoryFormatPack) and
3426
isinstance(target._format, RepositoryFormatPack))
3427
not_packs = (isinstance(source._format, RepositoryFormatCHK1) or
3428
isinstance(target._format, RepositoryFormatCHK1))
3429
except AttributeError:
3431
if not_packs or not are_packs:
3433
return InterRepository._same_model(source, target)
3436
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
3438
"""See InterRepository.fetch()."""
3439
if (len(self.source._fallback_repositories) > 0 or
3440
len(self.target._fallback_repositories) > 0):
3441
# The pack layer is not aware of fallback repositories, so when
3442
# fetching from a stacked repository or into a stacked repository
3443
# we use the generic fetch logic which uses the VersionedFiles
3444
# attributes on repository.
3445
from bzrlib.fetch import RepoFetcher
3446
fetcher = RepoFetcher(self.target, self.source, revision_id,
3447
pb, find_ghosts, fetch_spec=fetch_spec)
3448
if fetch_spec is not None:
3449
if len(list(fetch_spec.heads)) != 1:
3450
raise AssertionError(
3451
"InterPackRepo.fetch doesn't support "
3452
"fetching multiple heads yet.")
3453
revision_id = list(fetch_spec.heads)[0]
3455
if revision_id is None:
3457
# everything to do - use pack logic
3458
# to fetch from all packs to one without
3459
# inventory parsing etc, IFF nothing to be copied is in the target.
3461
source_revision_ids = frozenset(self.source.all_revision_ids())
3462
revision_ids = source_revision_ids - \
3463
frozenset(self.target.get_parent_map(source_revision_ids))
3464
revision_keys = [(revid,) for revid in revision_ids]
3465
index = self.target._pack_collection.revision_index.combined_index
3466
present_revision_ids = set(item[1][0] for item in
3467
index.iter_entries(revision_keys))
3468
revision_ids = set(revision_ids) - present_revision_ids
3469
# implementing the TODO will involve:
3470
# - detecting when all of a pack is selected
3471
# - avoiding as much as possible pre-selection, so the
3472
# more-core routines such as create_pack_from_packs can filter in
3473
# a just-in-time fashion. (though having a HEADS list on a
3474
# repository might make this a lot easier, because we could
3475
# sensibly detect 'new revisions' without doing a full index scan.
3476
elif _mod_revision.is_null(revision_id):
3480
revision_ids = self.search_missing_revision_ids(revision_id,
3481
find_ghosts=find_ghosts).get_keys()
3482
if len(revision_ids) == 0:
3484
return self._pack(self.source, self.target, revision_ids)
3486
def _pack(self, source, target, revision_ids):
3487
from bzrlib.repofmt.pack_repo import Packer
3488
packs = source._pack_collection.all_packs()
3489
pack = Packer(self.target._pack_collection, packs, '.fetch',
3490
revision_ids).pack()
3491
if pack is not None:
3492
self.target._pack_collection._save_pack_names()
3493
copied_revs = pack.get_revision_count()
3494
# Trigger an autopack. This may duplicate effort as we've just done
3495
# a pack creation, but for now it is simpler to think about as
3496
# 'upload data, then repack if needed'.
3497
self.target._pack_collection.autopack()
3498
return (copied_revs, [])
3503
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
3504
"""See InterRepository.missing_revision_ids().
3506
:param find_ghosts: Find ghosts throughout the ancestry of
3509
if not find_ghosts and revision_id is not None:
3510
return self._walk_to_common_revisions([revision_id])
3511
elif revision_id is not None:
3512
# Find ghosts: search for revisions pointing from one repository to
3513
# the other, and vice versa, anywhere in the history of revision_id.
3514
graph = self.target.get_graph(other_repository=self.source)
3515
searcher = graph._make_breadth_first_searcher([revision_id])
3519
next_revs, ghosts = searcher.next_with_ghosts()
3520
except StopIteration:
3522
if revision_id in ghosts:
3523
raise errors.NoSuchRevision(self.source, revision_id)
3524
found_ids.update(next_revs)
3525
found_ids.update(ghosts)
3526
found_ids = frozenset(found_ids)
3527
# Double query here: should be able to avoid this by changing the
3528
# graph api further.
3529
result_set = found_ids - frozenset(
3530
self.target.get_parent_map(found_ids))
3532
source_ids = self.source.all_revision_ids()
3533
# source_ids is the worst possible case we may need to pull.
3534
# now we want to filter source_ids against what we actually
3535
# have in target, but don't try to check for existence where we know
3536
# we do not have a revision as that would be pointless.
3537
target_ids = set(self.target.all_revision_ids())
3538
result_set = set(source_ids).difference(target_ids)
3539
return self.source.revision_ids_to_search_result(result_set)
3721
3542
class InterDifferingSerializer(InterRepository):
3730
3551
# This is redundant with format.check_conversion_target(), however that
3731
3552
# raises an exception, and we just want to say "False" as in we won't
3732
3553
# support converting between these formats.
3733
if 'IDS_never' in debug.debug_flags:
3735
3554
if source.supports_rich_root() and not target.supports_rich_root():
3737
3556
if (source._format.supports_tree_reference
3738
3557
and not target._format.supports_tree_reference):
3740
if target._fallback_repositories and target._format.supports_chks:
3741
# IDS doesn't know how to copy CHKs for the parent inventories it
3742
# adds to stacked repos.
3744
if 'IDS_always' in debug.debug_flags:
3746
# Only use this code path for local source and target. IDS does far
3747
# too much IO (both bandwidth and roundtrips) over a network.
3748
if not source.bzrdir.transport.base.startswith('file:///'):
3750
if not target.bzrdir.transport.base.startswith('file:///'):
3754
def _get_trees(self, revision_ids, cache):
3756
for rev_id in revision_ids:
3758
possible_trees.append((rev_id, cache[rev_id]))
3760
# Not cached, but inventory might be present anyway.
3762
tree = self.source.revision_tree(rev_id)
3763
except errors.NoSuchRevision:
3764
# Nope, parent is ghost.
3767
cache[rev_id] = tree
3768
possible_trees.append((rev_id, tree))
3769
return possible_trees
3771
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3561
def _get_delta_for_revision(self, tree, parent_ids, basis_id, cache):
3772
3562
"""Get the best delta and base for this revision.
3774
3564
:return: (basis_id, delta)
3566
possible_trees = [(parent_id, cache[parent_id])
3567
for parent_id in parent_ids
3568
if parent_id in cache]
3569
if len(possible_trees) == 0:
3570
# There either aren't any parents, or the parents aren't in the
3571
# cache, so just use the last converted tree
3572
possible_trees.append((basis_id, cache[basis_id]))
3777
# Generate deltas against each tree, to find the shortest.
3778
texts_possibly_new_in_tree = set()
3779
3574
for basis_id, basis_tree in possible_trees:
3780
3575
delta = tree.inventory._make_delta(basis_tree.inventory)
3781
for old_path, new_path, file_id, new_entry in delta:
3782
if new_path is None:
3783
# This file_id isn't present in the new rev, so we don't
3787
# Rich roots are handled elsewhere...
3789
kind = new_entry.kind
3790
if kind != 'directory' and kind != 'file':
3791
# No text record associated with this inventory entry.
3793
# This is a directory or file that has changed somehow.
3794
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3795
3576
deltas.append((len(delta), basis_id, delta))
3797
3578
return deltas[0][1:]
3799
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3800
"""Find all parent revisions that are absent, but for which the
3801
inventory is present, and copy those inventories.
3803
This is necessary to preserve correctness when the source is stacked
3804
without fallbacks configured. (Note that in cases like upgrade the
3805
source may be not have _fallback_repositories even though it is
3809
for parents in parent_map.values():
3810
parent_revs.update(parents)
3811
present_parents = self.source.get_parent_map(parent_revs)
3812
absent_parents = set(parent_revs).difference(present_parents)
3813
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3814
(rev_id,) for rev_id in absent_parents)
3815
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3816
for parent_tree in self.source.revision_trees(parent_inv_ids):
3817
current_revision_id = parent_tree.get_revision_id()
3818
parents_parents_keys = parent_invs_keys_for_stacking[
3819
(current_revision_id,)]
3820
parents_parents = [key[-1] for key in parents_parents_keys]
3821
basis_id = _mod_revision.NULL_REVISION
3822
basis_tree = self.source.revision_tree(basis_id)
3823
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3824
self.target.add_inventory_by_delta(
3825
basis_id, delta, current_revision_id, parents_parents)
3826
cache[current_revision_id] = parent_tree
3828
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3580
def _get_parent_keys(self, root_key, parent_map):
3581
"""Get the parent keys for a given root id."""
3582
root_id, rev_id = root_key
3583
# Include direct parents of the revision, but only if they used
3584
# the same root_id and are heads.
3586
for parent_id in parent_map[rev_id]:
3587
if parent_id == _mod_revision.NULL_REVISION:
3589
if parent_id not in self._revision_id_to_root_id:
3590
# We probably didn't read this revision, go spend the
3591
# extra effort to actually check
3593
tree = self.source.revision_tree(parent_id)
3594
except errors.NoSuchRevision:
3595
# Ghost, fill out _revision_id_to_root_id in case we
3596
# encounter this again.
3597
# But set parent_root_id to None since we don't really know
3598
parent_root_id = None
3600
parent_root_id = tree.get_root_id()
3601
self._revision_id_to_root_id[parent_id] = None
3603
parent_root_id = self._revision_id_to_root_id[parent_id]
3604
if root_id == parent_root_id:
3605
# With stacking we _might_ want to refer to a non-local
3606
# revision, but this code path only applies when we have the
3607
# full content available, so ghosts really are ghosts, not just
3608
# the edge of local data.
3609
parent_keys.append((parent_id,))
3611
# root_id may be in the parent anyway.
3613
tree = self.source.revision_tree(parent_id)
3614
except errors.NoSuchRevision:
3615
# ghost, can't refer to it.
3619
parent_keys.append((tree.inventory[root_id].revision,))
3620
except errors.NoSuchId:
3623
g = graph.Graph(self.source.revisions)
3624
heads = g.heads(parent_keys)
3626
for key in parent_keys:
3627
if key in heads and key not in selected_keys:
3628
selected_keys.append(key)
3629
return tuple([(root_id,)+ key for key in selected_keys])
3631
def _new_root_data_stream(self, root_keys_to_create, parent_map):
3632
for root_key in root_keys_to_create:
3633
parent_keys = self._get_parent_keys(root_key, parent_map)
3634
yield versionedfile.FulltextContentFactory(root_key,
3635
parent_keys, None, '')
3637
def _fetch_batch(self, revision_ids, basis_id, cache):
3829
3638
"""Fetch across a few revisions.
3831
3640
:param revision_ids: The revisions to copy
3832
3641
:param basis_id: The revision_id of a tree that must be in cache, used
3833
3642
as a basis for delta when no other base is available
3834
3643
:param cache: A cache of RevisionTrees that we can use.
3835
:param a_graph: A Graph object to determine the heads() of the
3836
rich-root data stream.
3837
3644
:return: The revision_id of the last converted tree. The RevisionTree
3838
3645
for it will be in cache
3845
3652
pending_deltas = []
3846
3653
pending_revisions = []
3847
3654
parent_map = self.source.get_parent_map(revision_ids)
3848
self._fetch_parent_invs_for_stacking(parent_map, cache)
3849
self.source._safe_to_return_from_cache = True
3850
3655
for tree in self.source.revision_trees(revision_ids):
3851
# Find a inventory delta for this revision.
3852
# Find text entries that need to be copied, too.
3853
3656
current_revision_id = tree.get_revision_id()
3854
3657
parent_ids = parent_map.get(current_revision_id, ())
3855
parent_trees = self._get_trees(parent_ids, cache)
3856
possible_trees = list(parent_trees)
3857
if len(possible_trees) == 0:
3858
# There either aren't any parents, or the parents are ghosts,
3859
# so just use the last converted tree.
3860
possible_trees.append((basis_id, cache[basis_id]))
3861
3658
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3863
revision = self.source.get_revision(current_revision_id)
3864
pending_deltas.append((basis_id, delta,
3865
current_revision_id, revision.parent_ids))
3866
3660
if self._converting_to_rich_root:
3867
3661
self._revision_id_to_root_id[current_revision_id] = \
3868
3662
tree.get_root_id()
3869
# Determine which texts are in present in this revision but not in
3870
# any of the available parents.
3871
texts_possibly_new_in_tree = set()
3663
# Find text entries that need to be copied
3872
3664
for old_path, new_path, file_id, entry in delta:
3873
if new_path is None:
3874
# This file_id isn't present in the new rev
3878
if not self.target.supports_rich_root():
3879
# The target doesn't support rich root, so we don't
3882
if self._converting_to_rich_root:
3883
# This can't be copied normally, we have to insert
3885
root_keys_to_create.add((file_id, entry.revision))
3888
texts_possibly_new_in_tree.add((file_id, entry.revision))
3889
for basis_id, basis_tree in possible_trees:
3890
basis_inv = basis_tree.inventory
3891
for file_key in list(texts_possibly_new_in_tree):
3892
file_id, file_revision = file_key
3894
entry = basis_inv[file_id]
3895
except errors.NoSuchId:
3897
if entry.revision == file_revision:
3898
texts_possibly_new_in_tree.remove(file_key)
3899
text_keys.update(texts_possibly_new_in_tree)
3665
if new_path is not None:
3668
if not self.target.supports_rich_root():
3669
# The target doesn't support rich root, so we don't
3672
if self._converting_to_rich_root:
3673
# This can't be copied normally, we have to insert
3675
root_keys_to_create.add((file_id, entry.revision))
3677
text_keys.add((file_id, entry.revision))
3678
revision = self.source.get_revision(current_revision_id)
3679
pending_deltas.append((basis_id, delta,
3680
current_revision_id, revision.parent_ids))
3900
3681
pending_revisions.append(revision)
3901
3682
cache[current_revision_id] = tree
3902
3683
basis_id = current_revision_id
3903
self.source._safe_to_return_from_cache = False
3904
3684
# Copy file texts
3905
3685
from_texts = self.source.texts
3906
3686
to_texts = self.target.texts
3907
3687
if root_keys_to_create:
3908
root_stream = _mod_fetch._new_root_data_stream(
3909
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3910
self.source, graph=a_graph)
3688
root_stream = self._new_root_data_stream(root_keys_to_create,
3911
3690
to_texts.insert_record_stream(root_stream)
3912
3691
to_texts.insert_record_stream(from_texts.get_record_stream(
3913
3692
text_keys, self.target._format._fetch_order,
4368
4092
# missing keys can handle suspending a write group).
4369
4093
write_group_tokens = self.target_repo.suspend_write_group()
4370
4094
return write_group_tokens, missing_keys
4371
hint = self.target_repo.commit_write_group()
4372
if (to_serializer != src_serializer and
4373
self.target_repo._format.pack_compresses):
4374
self.target_repo.pack(hint=hint)
4095
self.target_repo.commit_write_group()
4375
4096
return [], set()
4377
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4378
target_rich_root = self.target_repo._format.rich_root_data
4379
target_tree_refs = self.target_repo._format.supports_tree_reference
4380
for record in substream:
4381
# Insert the delta directly
4382
inventory_delta_bytes = record.get_bytes_as('fulltext')
4383
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4385
parse_result = deserialiser.parse_text_bytes(
4386
inventory_delta_bytes)
4387
except inventory_delta.IncompatibleInventoryDelta, err:
4388
trace.mutter("Incompatible delta: %s", err.msg)
4389
raise errors.IncompatibleRevision(self.target_repo._format)
4390
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4391
revision_id = new_id
4392
parents = [key[0] for key in record.parents]
4393
self.target_repo.add_inventory_by_delta(
4394
basis_id, inv_delta, revision_id, parents)
4396
def _extract_and_insert_inventories(self, substream, serializer,
4098
def _extract_and_insert_inventories(self, substream, serializer):
4398
4099
"""Generate a new inventory versionedfile in target, converting data.
4400
4101
The inventory is retrieved from the source, (deserializing it), and
4401
4102
stored in the target (reserializing it in a different format).
4403
target_rich_root = self.target_repo._format.rich_root_data
4404
target_tree_refs = self.target_repo._format.supports_tree_reference
4405
4104
for record in substream:
4406
# It's not a delta, so it must be a fulltext in the source
4407
# serializer's format.
4408
4105
bytes = record.get_bytes_as('fulltext')
4409
4106
revision_id = record.key[0]
4410
4107
inv = serializer.read_inventory_from_string(bytes, revision_id)
4411
4108
parents = [key[0] for key in record.parents]
4412
4109
self.target_repo.add_inventory(revision_id, inv, parents)
4413
# No need to keep holding this full inv in memory when the rest of
4414
# the substream is likely to be all deltas.
4417
4111
def _extract_and_insert_revisions(self, substream, serializer):
4418
4112
for record in substream:
4581
4258
return (not self.from_repository._format.rich_root_data and
4582
4259
self.to_format.rich_root_data)
4584
def _get_inventory_stream(self, revision_ids, missing=False):
4261
def _get_inventory_stream(self, revision_ids):
4585
4262
from_format = self.from_repository._format
4586
if (from_format.supports_chks and self.to_format.supports_chks and
4587
from_format.network_name() == self.to_format.network_name()):
4588
raise AssertionError(
4589
"this case should be handled by GroupCHKStreamSource")
4590
elif 'forceinvdeltas' in debug.debug_flags:
4591
return self._get_convertable_inventory_stream(revision_ids,
4592
delta_versus_null=missing)
4593
elif from_format.network_name() == self.to_format.network_name():
4595
return self._get_simple_inventory_stream(revision_ids,
4597
elif (not from_format.supports_chks and not self.to_format.supports_chks
4598
and from_format._serializer == self.to_format._serializer):
4599
# Essentially the same format.
4600
return self._get_simple_inventory_stream(revision_ids,
4263
if (from_format.supports_chks and self.to_format.supports_chks
4264
and (from_format._serializer == self.to_format._serializer)):
4265
# Both sides support chks, and they use the same serializer, so it
4266
# is safe to transmit the chk pages and inventory pages across
4268
return self._get_chk_inventory_stream(revision_ids)
4269
elif (not from_format.supports_chks):
4270
# Source repository doesn't support chks. So we can transmit the
4271
# inventories 'as-is' and either they are just accepted on the
4272
# target, or the Sink will properly convert it.
4273
return self._get_simple_inventory_stream(revision_ids)
4603
# Any time we switch serializations, we want to use an
4604
# inventory-delta based approach.
4605
return self._get_convertable_inventory_stream(revision_ids,
4606
delta_versus_null=missing)
4275
# XXX: Hack to make not-chk->chk fetch: copy the inventories as
4276
# inventories. Note that this should probably be done somehow
4277
# as part of bzrlib.repository.StreamSink. Except JAM couldn't
4278
# figure out how a non-chk repository could possibly handle
4279
# deserializing an inventory stream from a chk repo, as it
4280
# doesn't have a way to understand individual pages.
4281
return self._get_convertable_inventory_stream(revision_ids)
4608
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4609
# NB: This currently reopens the inventory weave in source;
4610
# using a single stream interface instead would avoid this.
4283
def _get_simple_inventory_stream(self, revision_ids):
4611
4284
from_weave = self.from_repository.inventories
4613
delta_closure = True
4615
delta_closure = not self.delta_on_metadata()
4616
4285
yield ('inventories', from_weave.get_record_stream(
4617
4286
[(rev_id,) for rev_id in revision_ids],
4618
self.inventory_fetch_order(), delta_closure))
4620
def _get_convertable_inventory_stream(self, revision_ids,
4621
delta_versus_null=False):
4622
# The two formats are sufficiently different that there is no fast
4623
# path, so we need to send just inventorydeltas, which any
4624
# sufficiently modern client can insert into any repository.
4625
# The StreamSink code expects to be able to
4626
# convert on the target, so we need to put bytes-on-the-wire that can
4627
# be converted. That means inventory deltas (if the remote is <1.19,
4628
# RemoteStreamSink will fallback to VFS to insert the deltas).
4629
yield ('inventory-deltas',
4630
self._stream_invs_as_deltas(revision_ids,
4631
delta_versus_null=delta_versus_null))
4633
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4634
"""Return a stream of inventory-deltas for the given rev ids.
4636
:param revision_ids: The list of inventories to transmit
4637
:param delta_versus_null: Don't try to find a minimal delta for this
4638
entry, instead compute the delta versus the NULL_REVISION. This
4639
effectively streams a complete inventory. Used for stuff like
4640
filling in missing parents, etc.
4287
self.inventory_fetch_order(),
4288
not self.delta_on_metadata()))
4290
def _get_chk_inventory_stream(self, revision_ids):
4291
"""Fetch the inventory texts, along with the associated chk maps."""
4292
# We want an inventory outside of the search set, so that we can filter
4293
# out uninteresting chk pages. For now we use
4294
# _find_revision_outside_set, but if we had a Search with cut_revs, we
4295
# could use that instead.
4296
start_rev_id = self.from_repository._find_revision_outside_set(
4298
start_rev_key = (start_rev_id,)
4299
inv_keys_to_fetch = [(rev_id,) for rev_id in revision_ids]
4300
if start_rev_id != _mod_revision.NULL_REVISION:
4301
inv_keys_to_fetch.append((start_rev_id,))
4302
# Any repo that supports chk_bytes must also support out-of-order
4303
# insertion. At least, that is how we expect it to work
4304
# We use get_record_stream instead of iter_inventories because we want
4305
# to be able to insert the stream as well. We could instead fetch
4306
# allowing deltas, and then iter_inventories, but we don't know whether
4307
# source or target is more 'local' anway.
4308
inv_stream = self.from_repository.inventories.get_record_stream(
4309
inv_keys_to_fetch, 'unordered',
4310
True) # We need them as full-texts so we can find their references
4311
uninteresting_chk_roots = set()
4312
interesting_chk_roots = set()
4313
def filter_inv_stream(inv_stream):
4314
for idx, record in enumerate(inv_stream):
4315
### child_pb.update('fetch inv', idx, len(inv_keys_to_fetch))
4316
bytes = record.get_bytes_as('fulltext')
4317
chk_inv = inventory.CHKInventory.deserialise(
4318
self.from_repository.chk_bytes, bytes, record.key)
4319
if record.key == start_rev_key:
4320
uninteresting_chk_roots.add(chk_inv.id_to_entry.key())
4321
p_id_map = chk_inv.parent_id_basename_to_file_id
4322
if p_id_map is not None:
4323
uninteresting_chk_roots.add(p_id_map.key())
4326
interesting_chk_roots.add(chk_inv.id_to_entry.key())
4327
p_id_map = chk_inv.parent_id_basename_to_file_id
4328
if p_id_map is not None:
4329
interesting_chk_roots.add(p_id_map.key())
4330
### pb.update('fetch inventory', 0, 2)
4331
yield ('inventories', filter_inv_stream(inv_stream))
4332
# Now that we have worked out all of the interesting root nodes, grab
4333
# all of the interesting pages and insert them
4334
### pb.update('fetch inventory', 1, 2)
4335
interesting = chk_map.iter_interesting_nodes(
4336
self.from_repository.chk_bytes, interesting_chk_roots,
4337
uninteresting_chk_roots)
4338
def to_stream_adapter():
4339
"""Adapt the iter_interesting_nodes result to a single stream.
4341
iter_interesting_nodes returns records as it processes them, along
4342
with keys. However, we only want to return the records themselves.
4344
for record, items in interesting:
4345
if record is not None:
4347
# XXX: We could instead call get_record_stream(records.keys())
4348
# ATM, this will always insert the records as fulltexts, and
4349
# requires that you can hang on to records once you have gone
4350
# on to the next one. Further, it causes the target to
4351
# recompress the data. Testing shows it to be faster than
4352
# requesting the records again, though.
4353
yield ('chk_bytes', to_stream_adapter())
4354
### pb.update('fetch inventory', 2, 2)
4356
def _get_convertable_inventory_stream(self, revision_ids):
4357
# XXX: One of source or target is using chks, and they don't have
4358
# compatible serializations. The StreamSink code expects to be
4359
# able to convert on the target, so we need to put
4360
# bytes-on-the-wire that can be converted
4361
yield ('inventories', self._stream_invs_as_fulltexts(revision_ids))
4363
def _stream_invs_as_fulltexts(self, revision_ids):
4642
4364
from_repo = self.from_repository
4365
from_serializer = from_repo._format._serializer
4643
4366
revision_keys = [(rev_id,) for rev_id in revision_ids]
4644
4367
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4645
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4647
inventories = self.from_repository.iter_inventories(
4648
revision_ids, 'topological')
4649
format = from_repo._format
4650
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4651
inventory_cache = lru_cache.LRUCache(50)
4652
null_inventory = from_repo.revision_tree(
4653
_mod_revision.NULL_REVISION).inventory
4654
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4655
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4656
# repo back into a non-rich-root repo ought to be allowed)
4657
serializer = inventory_delta.InventoryDeltaSerializer(
4658
versioned_root=format.rich_root_data,
4659
tree_references=format.supports_tree_reference)
4660
for inv in inventories:
4368
for inv in self.from_repository.iter_inventories(revision_ids):
4369
# XXX: This is a bit hackish, but it works. Basically,
4370
# CHKSerializer 'accidentally' supports
4371
# read/write_inventory_to_string, even though that is never
4372
# the format that is stored on disk. It *does* give us a
4373
# single string representation for an inventory, so live with
4375
# This would be far better if we had a 'serialized inventory
4376
# delta' form. Then we could use 'inventory._make_delta', and
4377
# transmit that. This would both be faster to generate, and
4378
# result in fewer bytes-on-the-wire.
4379
as_bytes = from_serializer.write_inventory_to_string(inv)
4661
4380
key = (inv.revision_id,)
4662
4381
parent_keys = parent_map.get(key, ())
4664
if not delta_versus_null and parent_keys:
4665
# The caller did not ask for complete inventories and we have
4666
# some parents that we can delta against. Make a delta against
4667
# each parent so that we can find the smallest.
4668
parent_ids = [parent_key[0] for parent_key in parent_keys]
4669
for parent_id in parent_ids:
4670
if parent_id not in invs_sent_so_far:
4671
# We don't know that the remote side has this basis, so
4674
if parent_id == _mod_revision.NULL_REVISION:
4675
parent_inv = null_inventory
4677
parent_inv = inventory_cache.get(parent_id, None)
4678
if parent_inv is None:
4679
parent_inv = from_repo.get_inventory(parent_id)
4680
candidate_delta = inv._make_delta(parent_inv)
4681
if (delta is None or
4682
len(delta) > len(candidate_delta)):
4683
delta = candidate_delta
4684
basis_id = parent_id
4686
# Either none of the parents ended up being suitable, or we
4687
# were asked to delta against NULL
4688
basis_id = _mod_revision.NULL_REVISION
4689
delta = inv._make_delta(null_inventory)
4690
invs_sent_so_far.add(inv.revision_id)
4691
inventory_cache[inv.revision_id] = inv
4692
delta_serialized = ''.join(
4693
serializer.delta_to_lines(basis_id, key[-1], delta))
4694
4382
yield versionedfile.FulltextContentFactory(
4695
key, parent_keys, None, delta_serialized)
4698
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4699
stop_revision=None):
4700
"""Extend the partial history to include a given index
4702
If a stop_index is supplied, stop when that index has been reached.
4703
If a stop_revision is supplied, stop when that revision is
4704
encountered. Otherwise, stop when the beginning of history is
4707
:param stop_index: The index which should be present. When it is
4708
present, history extension will stop.
4709
:param stop_revision: The revision id which should be present. When
4710
it is encountered, history extension will stop.
4712
start_revision = partial_history_cache[-1]
4713
iterator = repo.iter_reverse_revision_history(start_revision)
4715
#skip the last revision in the list
4718
if (stop_index is not None and
4719
len(partial_history_cache) > stop_index):
4721
if partial_history_cache[-1] == stop_revision:
4723
revision_id = iterator.next()
4724
partial_history_cache.append(revision_id)
4725
except StopIteration:
4383
key, parent_keys, None, as_bytes)
added
removed
bzrlib/repository.py
