2392
2350
:param revision_ids: The expected revision ids of the inventories.
2393
:param ordering: optional ordering, e.g. 'topological'. If not
2394
specified, the order of revision_ids will be preserved (by
2395
buffering if necessary).
2396
2351
:return: An iterator of inventories.
2398
2353
if ((None in revision_ids)
2399
2354
or (_mod_revision.NULL_REVISION in revision_ids)):
2400
2355
raise ValueError('cannot get null revision inventory')
2401
return self._iter_inventories(revision_ids, ordering)
2356
return self._iter_inventories(revision_ids)
2403
def _iter_inventories(self, revision_ids, ordering):
2358
def _iter_inventories(self, revision_ids):
2404
2359
"""single-document based inventory iteration."""
2405
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2406
for text, revision_id in inv_xmls:
2407
yield self._deserialise_inventory(revision_id, text)
2360
for text, revision_id in self._iter_inventory_xmls(revision_ids):
2361
yield self.deserialise_inventory(revision_id, text)
2409
def _iter_inventory_xmls(self, revision_ids, ordering):
2410
if ordering is None:
2411
order_as_requested = True
2412
ordering = 'unordered'
2414
order_as_requested = False
2363
def _iter_inventory_xmls(self, revision_ids):
2415
2364
keys = [(revision_id,) for revision_id in revision_ids]
2418
if order_as_requested:
2419
key_iter = iter(keys)
2420
next_key = key_iter.next()
2421
stream = self.inventories.get_record_stream(keys, ordering, True)
2365
stream = self.inventories.get_record_stream(keys, 'unordered', True)
2422
2366
text_chunks = {}
2423
2367
for record in stream:
2424
2368
if record.storage_kind != 'absent':
2425
chunks = record.get_bytes_as('chunked')
2426
if order_as_requested:
2427
text_chunks[record.key] = chunks
2429
yield ''.join(chunks), record.key[-1]
2369
text_chunks[record.key] = record.get_bytes_as('chunked')
2431
2371
raise errors.NoSuchRevision(self, record.key)
2432
if order_as_requested:
2433
# Yield as many results as we can while preserving order.
2434
while next_key in text_chunks:
2435
chunks = text_chunks.pop(next_key)
2436
yield ''.join(chunks), next_key[-1]
2438
next_key = key_iter.next()
2439
except StopIteration:
2440
# We still want to fully consume the get_record_stream,
2441
# just in case it is not actually finished at this point
2373
chunks = text_chunks.pop(key)
2374
yield ''.join(chunks), key[-1]
2445
def _deserialise_inventory(self, revision_id, xml):
2376
def deserialise_inventory(self, revision_id, xml):
2446
2377
"""Transform the xml into an inventory object.
2448
2379
:param revision_id: The expected revision id of the inventory.
2449
2380
:param xml: A serialised inventory.
2451
2382
result = self._serializer.read_inventory_from_string(xml, revision_id,
2452
entry_cache=self._inventory_entry_cache,
2453
return_from_cache=self._safe_to_return_from_cache)
2383
entry_cache=self._inventory_entry_cache)
2454
2384
if result.revision_id != revision_id:
2455
2385
raise AssertionError('revision id mismatch %s != %s' % (
2456
2386
result.revision_id, revision_id))
2389
def serialise_inventory(self, inv):
2390
return self._serializer.write_inventory_to_string(inv)
2392
def _serialise_inventory_to_lines(self, inv):
2393
return self._serializer.write_inventory_to_lines(inv)
2459
2395
def get_serializer_format(self):
2460
2396
return self._serializer.format_num
2462
2398
@needs_read_lock
2463
def _get_inventory_xml(self, revision_id):
2464
"""Get serialized inventory as a string."""
2465
texts = self._iter_inventory_xmls([revision_id], 'unordered')
2399
def get_inventory_xml(self, revision_id):
2400
"""Get inventory XML as a file object."""
2401
texts = self._iter_inventory_xmls([revision_id])
2467
2403
text, revision_id = texts.next()
2468
2404
except StopIteration:
2469
2405
raise errors.HistoryMissing(self, 'inventory', revision_id)
2409
def get_inventory_sha1(self, revision_id):
2410
"""Return the sha1 hash of the inventory entry
2412
return self.get_revision(revision_id).inventory_sha1
2472
2414
def get_rev_id_for_revno(self, revno, known_pair):
2473
2415
"""Return the revision id of a revno, given a later (revno, revid)
2474
2416
pair in the same history.
3753
3664
# This is redundant with format.check_conversion_target(), however that
3754
3665
# raises an exception, and we just want to say "False" as in we won't
3755
3666
# support converting between these formats.
3756
if 'IDS_never' in debug.debug_flags:
3758
3667
if source.supports_rich_root() and not target.supports_rich_root():
3760
3669
if (source._format.supports_tree_reference
3761
3670
and not target._format.supports_tree_reference):
3763
if target._fallback_repositories and target._format.supports_chks:
3764
# IDS doesn't know how to copy CHKs for the parent inventories it
3765
# adds to stacked repos.
3767
if 'IDS_always' in debug.debug_flags:
3769
# Only use this code path for local source and target. IDS does far
3770
# too much IO (both bandwidth and roundtrips) over a network.
3771
if not source.bzrdir.transport.base.startswith('file:///'):
3773
if not target.bzrdir.transport.base.startswith('file:///'):
3777
def _get_trees(self, revision_ids, cache):
3779
for rev_id in revision_ids:
3781
possible_trees.append((rev_id, cache[rev_id]))
3783
# Not cached, but inventory might be present anyway.
3785
tree = self.source.revision_tree(rev_id)
3786
except errors.NoSuchRevision:
3787
# Nope, parent is ghost.
3790
cache[rev_id] = tree
3791
possible_trees.append((rev_id, tree))
3792
return possible_trees
3794
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3674
def _get_delta_for_revision(self, tree, parent_ids, basis_id, cache):
3795
3675
"""Get the best delta and base for this revision.
3797
3677
:return: (basis_id, delta)
3679
possible_trees = [(parent_id, cache[parent_id])
3680
for parent_id in parent_ids
3681
if parent_id in cache]
3682
if len(possible_trees) == 0:
3683
# There either aren't any parents, or the parents aren't in the
3684
# cache, so just use the last converted tree
3685
possible_trees.append((basis_id, cache[basis_id]))
3800
# Generate deltas against each tree, to find the shortest.
3801
texts_possibly_new_in_tree = set()
3802
3687
for basis_id, basis_tree in possible_trees:
3803
3688
delta = tree.inventory._make_delta(basis_tree.inventory)
3804
for old_path, new_path, file_id, new_entry in delta:
3805
if new_path is None:
3806
# This file_id isn't present in the new rev, so we don't
3810
# Rich roots are handled elsewhere...
3812
kind = new_entry.kind
3813
if kind != 'directory' and kind != 'file':
3814
# No text record associated with this inventory entry.
3816
# This is a directory or file that has changed somehow.
3817
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3818
3689
deltas.append((len(delta), basis_id, delta))
3820
3691
return deltas[0][1:]
3822
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3823
"""Find all parent revisions that are absent, but for which the
3824
inventory is present, and copy those inventories.
3826
This is necessary to preserve correctness when the source is stacked
3827
without fallbacks configured. (Note that in cases like upgrade the
3828
source may be not have _fallback_repositories even though it is
3832
for parents in parent_map.values():
3833
parent_revs.update(parents)
3834
present_parents = self.source.get_parent_map(parent_revs)
3835
absent_parents = set(parent_revs).difference(present_parents)
3836
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3837
(rev_id,) for rev_id in absent_parents)
3838
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3839
for parent_tree in self.source.revision_trees(parent_inv_ids):
3840
current_revision_id = parent_tree.get_revision_id()
3841
parents_parents_keys = parent_invs_keys_for_stacking[
3842
(current_revision_id,)]
3843
parents_parents = [key[-1] for key in parents_parents_keys]
3844
basis_id = _mod_revision.NULL_REVISION
3845
basis_tree = self.source.revision_tree(basis_id)
3846
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3847
self.target.add_inventory_by_delta(
3848
basis_id, delta, current_revision_id, parents_parents)
3849
cache[current_revision_id] = parent_tree
3851
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3693
def _get_parent_keys(self, root_key, parent_map):
3694
"""Get the parent keys for a given root id."""
3695
root_id, rev_id = root_key
3696
# Include direct parents of the revision, but only if they used
3697
# the same root_id and are heads.
3699
for parent_id in parent_map[rev_id]:
3700
if parent_id == _mod_revision.NULL_REVISION:
3702
if parent_id not in self._revision_id_to_root_id:
3703
# We probably didn't read this revision, go spend the
3704
# extra effort to actually check
3706
tree = self.source.revision_tree(parent_id)
3707
except errors.NoSuchRevision:
3708
# Ghost, fill out _revision_id_to_root_id in case we
3709
# encounter this again.
3710
# But set parent_root_id to None since we don't really know
3711
parent_root_id = None
3713
parent_root_id = tree.get_root_id()
3714
self._revision_id_to_root_id[parent_id] = None
3716
parent_root_id = self._revision_id_to_root_id[parent_id]
3717
if root_id == parent_root_id:
3718
# With stacking we _might_ want to refer to a non-local
3719
# revision, but this code path only applies when we have the
3720
# full content available, so ghosts really are ghosts, not just
3721
# the edge of local data.
3722
parent_keys.append((parent_id,))
3724
# root_id may be in the parent anyway.
3726
tree = self.source.revision_tree(parent_id)
3727
except errors.NoSuchRevision:
3728
# ghost, can't refer to it.
3732
parent_keys.append((tree.inventory[root_id].revision,))
3733
except errors.NoSuchId:
3736
g = graph.Graph(self.source.revisions)
3737
heads = g.heads(parent_keys)
3739
for key in parent_keys:
3740
if key in heads and key not in selected_keys:
3741
selected_keys.append(key)
3742
return tuple([(root_id,)+ key for key in selected_keys])
3744
def _new_root_data_stream(self, root_keys_to_create, parent_map):
3745
for root_key in root_keys_to_create:
3746
parent_keys = self._get_parent_keys(root_key, parent_map)
3747
yield versionedfile.FulltextContentFactory(root_key,
3748
parent_keys, None, '')
3750
def _fetch_batch(self, revision_ids, basis_id, cache):
3852
3751
"""Fetch across a few revisions.
3854
3753
:param revision_ids: The revisions to copy
3855
3754
:param basis_id: The revision_id of a tree that must be in cache, used
3856
3755
as a basis for delta when no other base is available
3857
3756
:param cache: A cache of RevisionTrees that we can use.
3858
:param a_graph: A Graph object to determine the heads() of the
3859
rich-root data stream.
3860
3757
:return: The revision_id of the last converted tree. The RevisionTree
3861
3758
for it will be in cache
3868
3765
pending_deltas = []
3869
3766
pending_revisions = []
3870
3767
parent_map = self.source.get_parent_map(revision_ids)
3871
self._fetch_parent_invs_for_stacking(parent_map, cache)
3872
self.source._safe_to_return_from_cache = True
3873
3768
for tree in self.source.revision_trees(revision_ids):
3874
# Find a inventory delta for this revision.
3875
# Find text entries that need to be copied, too.
3876
3769
current_revision_id = tree.get_revision_id()
3877
3770
parent_ids = parent_map.get(current_revision_id, ())
3878
parent_trees = self._get_trees(parent_ids, cache)
3879
possible_trees = list(parent_trees)
3880
if len(possible_trees) == 0:
3881
# There either aren't any parents, or the parents are ghosts,
3882
# so just use the last converted tree.
3883
possible_trees.append((basis_id, cache[basis_id]))
3884
3771
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3886
revision = self.source.get_revision(current_revision_id)
3887
pending_deltas.append((basis_id, delta,
3888
current_revision_id, revision.parent_ids))
3889
3773
if self._converting_to_rich_root:
3890
3774
self._revision_id_to_root_id[current_revision_id] = \
3891
3775
tree.get_root_id()
3892
# Determine which texts are in present in this revision but not in
3893
# any of the available parents.
3894
texts_possibly_new_in_tree = set()
3776
# Find text entries that need to be copied
3895
3777
for old_path, new_path, file_id, entry in delta:
3896
if new_path is None:
3897
# This file_id isn't present in the new rev
3901
if not self.target.supports_rich_root():
3902
# The target doesn't support rich root, so we don't
3905
if self._converting_to_rich_root:
3906
# This can't be copied normally, we have to insert
3908
root_keys_to_create.add((file_id, entry.revision))
3911
texts_possibly_new_in_tree.add((file_id, entry.revision))
3912
for basis_id, basis_tree in possible_trees:
3913
basis_inv = basis_tree.inventory
3914
for file_key in list(texts_possibly_new_in_tree):
3915
file_id, file_revision = file_key
3917
entry = basis_inv[file_id]
3918
except errors.NoSuchId:
3920
if entry.revision == file_revision:
3921
texts_possibly_new_in_tree.remove(file_key)
3922
text_keys.update(texts_possibly_new_in_tree)
3778
if new_path is not None:
3781
if not self.target.supports_rich_root():
3782
# The target doesn't support rich root, so we don't
3785
if self._converting_to_rich_root:
3786
# This can't be copied normally, we have to insert
3788
root_keys_to_create.add((file_id, entry.revision))
3790
text_keys.add((file_id, entry.revision))
3791
revision = self.source.get_revision(current_revision_id)
3792
pending_deltas.append((basis_id, delta,
3793
current_revision_id, revision.parent_ids))
3923
3794
pending_revisions.append(revision)
3924
3795
cache[current_revision_id] = tree
3925
3796
basis_id = current_revision_id
3926
self.source._safe_to_return_from_cache = False
3927
3797
# Copy file texts
3928
3798
from_texts = self.source.texts
3929
3799
to_texts = self.target.texts
3930
3800
if root_keys_to_create:
3931
root_stream = _mod_fetch._new_root_data_stream(
3932
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3933
self.source, graph=a_graph)
3801
root_stream = self._new_root_data_stream(root_keys_to_create,
3934
3803
to_texts.insert_record_stream(root_stream)
3935
3804
to_texts.insert_record_stream(from_texts.get_record_stream(
3936
3805
text_keys, self.target._format._fetch_order,
4599
4412
return (not self.from_repository._format.rich_root_data and
4600
4413
self.to_format.rich_root_data)
4602
def _get_inventory_stream(self, revision_ids, missing=False):
4415
def _get_inventory_stream(self, revision_ids):
4603
4416
from_format = self.from_repository._format
4604
if (from_format.supports_chks and self.to_format.supports_chks and
4605
from_format.network_name() == self.to_format.network_name()):
4606
raise AssertionError(
4607
"this case should be handled by GroupCHKStreamSource")
4608
elif 'forceinvdeltas' in debug.debug_flags:
4609
return self._get_convertable_inventory_stream(revision_ids,
4610
delta_versus_null=missing)
4611
elif from_format.network_name() == self.to_format.network_name():
4613
return self._get_simple_inventory_stream(revision_ids,
4615
elif (not from_format.supports_chks and not self.to_format.supports_chks
4616
and from_format._serializer == self.to_format._serializer):
4617
# Essentially the same format.
4618
return self._get_simple_inventory_stream(revision_ids,
4417
if (from_format.supports_chks and self.to_format.supports_chks
4418
and (from_format._serializer == self.to_format._serializer)):
4419
# Both sides support chks, and they use the same serializer, so it
4420
# is safe to transmit the chk pages and inventory pages across
4422
return self._get_chk_inventory_stream(revision_ids)
4423
elif (not from_format.supports_chks):
4424
# Source repository doesn't support chks. So we can transmit the
4425
# inventories 'as-is' and either they are just accepted on the
4426
# target, or the Sink will properly convert it.
4427
return self._get_simple_inventory_stream(revision_ids)
4621
# Any time we switch serializations, we want to use an
4622
# inventory-delta based approach.
4623
return self._get_convertable_inventory_stream(revision_ids,
4624
delta_versus_null=missing)
4429
# XXX: Hack to make not-chk->chk fetch: copy the inventories as
4430
# inventories. Note that this should probably be done somehow
4431
# as part of bzrlib.repository.StreamSink. Except JAM couldn't
4432
# figure out how a non-chk repository could possibly handle
4433
# deserializing an inventory stream from a chk repo, as it
4434
# doesn't have a way to understand individual pages.
4435
return self._get_convertable_inventory_stream(revision_ids)
4626
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4627
# NB: This currently reopens the inventory weave in source;
4628
# using a single stream interface instead would avoid this.
4437
def _get_simple_inventory_stream(self, revision_ids):
4629
4438
from_weave = self.from_repository.inventories
4631
delta_closure = True
4633
delta_closure = not self.delta_on_metadata()
4634
4439
yield ('inventories', from_weave.get_record_stream(
4635
4440
[(rev_id,) for rev_id in revision_ids],
4636
self.inventory_fetch_order(), delta_closure))
4638
def _get_convertable_inventory_stream(self, revision_ids,
4639
delta_versus_null=False):
4640
# The two formats are sufficiently different that there is no fast
4641
# path, so we need to send just inventorydeltas, which any
4642
# sufficiently modern client can insert into any repository.
4643
# The StreamSink code expects to be able to
4644
# convert on the target, so we need to put bytes-on-the-wire that can
4645
# be converted. That means inventory deltas (if the remote is <1.19,
4646
# RemoteStreamSink will fallback to VFS to insert the deltas).
4647
yield ('inventory-deltas',
4648
self._stream_invs_as_deltas(revision_ids,
4649
delta_versus_null=delta_versus_null))
4651
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4652
"""Return a stream of inventory-deltas for the given rev ids.
4654
:param revision_ids: The list of inventories to transmit
4655
:param delta_versus_null: Don't try to find a minimal delta for this
4656
entry, instead compute the delta versus the NULL_REVISION. This
4657
effectively streams a complete inventory. Used for stuff like
4658
filling in missing parents, etc.
4441
self.inventory_fetch_order(),
4442
not self.delta_on_metadata()))
4444
def _get_chk_inventory_stream(self, revision_ids):
4445
"""Fetch the inventory texts, along with the associated chk maps."""
4446
# We want an inventory outside of the search set, so that we can filter
4447
# out uninteresting chk pages. For now we use
4448
# _find_revision_outside_set, but if we had a Search with cut_revs, we
4449
# could use that instead.
4450
start_rev_id = self.from_repository._find_revision_outside_set(
4452
start_rev_key = (start_rev_id,)
4453
inv_keys_to_fetch = [(rev_id,) for rev_id in revision_ids]
4454
if start_rev_id != _mod_revision.NULL_REVISION:
4455
inv_keys_to_fetch.append((start_rev_id,))
4456
# Any repo that supports chk_bytes must also support out-of-order
4457
# insertion. At least, that is how we expect it to work
4458
# We use get_record_stream instead of iter_inventories because we want
4459
# to be able to insert the stream as well. We could instead fetch
4460
# allowing deltas, and then iter_inventories, but we don't know whether
4461
# source or target is more 'local' anway.
4462
inv_stream = self.from_repository.inventories.get_record_stream(
4463
inv_keys_to_fetch, 'unordered',
4464
True) # We need them as full-texts so we can find their references
4465
uninteresting_chk_roots = set()
4466
interesting_chk_roots = set()
4467
def filter_inv_stream(inv_stream):
4468
for idx, record in enumerate(inv_stream):
4469
### child_pb.update('fetch inv', idx, len(inv_keys_to_fetch))
4470
bytes = record.get_bytes_as('fulltext')
4471
chk_inv = inventory.CHKInventory.deserialise(
4472
self.from_repository.chk_bytes, bytes, record.key)
4473
if record.key == start_rev_key:
4474
uninteresting_chk_roots.add(chk_inv.id_to_entry.key())
4475
p_id_map = chk_inv.parent_id_basename_to_file_id
4476
if p_id_map is not None:
4477
uninteresting_chk_roots.add(p_id_map.key())
4480
interesting_chk_roots.add(chk_inv.id_to_entry.key())
4481
p_id_map = chk_inv.parent_id_basename_to_file_id
4482
if p_id_map is not None:
4483
interesting_chk_roots.add(p_id_map.key())
4484
### pb.update('fetch inventory', 0, 2)
4485
yield ('inventories', filter_inv_stream(inv_stream))
4486
# Now that we have worked out all of the interesting root nodes, grab
4487
# all of the interesting pages and insert them
4488
### pb.update('fetch inventory', 1, 2)
4489
interesting = chk_map.iter_interesting_nodes(
4490
self.from_repository.chk_bytes, interesting_chk_roots,
4491
uninteresting_chk_roots)
4492
def to_stream_adapter():
4493
"""Adapt the iter_interesting_nodes result to a single stream.
4495
iter_interesting_nodes returns records as it processes them, along
4496
with keys. However, we only want to return the records themselves.
4498
for record, items in interesting:
4499
if record is not None:
4501
# XXX: We could instead call get_record_stream(records.keys())
4502
# ATM, this will always insert the records as fulltexts, and
4503
# requires that you can hang on to records once you have gone
4504
# on to the next one. Further, it causes the target to
4505
# recompress the data. Testing shows it to be faster than
4506
# requesting the records again, though.
4507
yield ('chk_bytes', to_stream_adapter())
4508
### pb.update('fetch inventory', 2, 2)
4510
def _get_convertable_inventory_stream(self, revision_ids):
4511
# XXX: One of source or target is using chks, and they don't have
4512
# compatible serializations. The StreamSink code expects to be
4513
# able to convert on the target, so we need to put
4514
# bytes-on-the-wire that can be converted
4515
yield ('inventories', self._stream_invs_as_fulltexts(revision_ids))
4517
def _stream_invs_as_fulltexts(self, revision_ids):
4660
4518
from_repo = self.from_repository
4519
from_serializer = from_repo._format._serializer
4661
4520
revision_keys = [(rev_id,) for rev_id in revision_ids]
4662
4521
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4663
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4665
inventories = self.from_repository.iter_inventories(
4666
revision_ids, 'topological')
4667
format = from_repo._format
4668
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4669
inventory_cache = lru_cache.LRUCache(50)
4670
null_inventory = from_repo.revision_tree(
4671
_mod_revision.NULL_REVISION).inventory
4672
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4673
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4674
# repo back into a non-rich-root repo ought to be allowed)
4675
serializer = inventory_delta.InventoryDeltaSerializer(
4676
versioned_root=format.rich_root_data,
4677
tree_references=format.supports_tree_reference)
4678
for inv in inventories:
4522
for inv in self.from_repository.iter_inventories(revision_ids):
4523
# XXX: This is a bit hackish, but it works. Basically,
4524
# CHKSerializer 'accidentally' supports
4525
# read/write_inventory_to_string, even though that is never
4526
# the format that is stored on disk. It *does* give us a
4527
# single string representation for an inventory, so live with
4529
# This would be far better if we had a 'serialized inventory
4530
# delta' form. Then we could use 'inventory._make_delta', and
4531
# transmit that. This would both be faster to generate, and
4532
# result in fewer bytes-on-the-wire.
4533
as_bytes = from_serializer.write_inventory_to_string(inv)
4679
4534
key = (inv.revision_id,)
4680
4535
parent_keys = parent_map.get(key, ())
4682
if not delta_versus_null and parent_keys:
4683
# The caller did not ask for complete inventories and we have
4684
# some parents that we can delta against. Make a delta against
4685
# each parent so that we can find the smallest.
4686
parent_ids = [parent_key[0] for parent_key in parent_keys]
4687
for parent_id in parent_ids:
4688
if parent_id not in invs_sent_so_far:
4689
# We don't know that the remote side has this basis, so
4692
if parent_id == _mod_revision.NULL_REVISION:
4693
parent_inv = null_inventory
4695
parent_inv = inventory_cache.get(parent_id, None)
4696
if parent_inv is None:
4697
parent_inv = from_repo.get_inventory(parent_id)
4698
candidate_delta = inv._make_delta(parent_inv)
4699
if (delta is None or
4700
len(delta) > len(candidate_delta)):
4701
delta = candidate_delta
4702
basis_id = parent_id
4704
# Either none of the parents ended up being suitable, or we
4705
# were asked to delta against NULL
4706
basis_id = _mod_revision.NULL_REVISION
4707
delta = inv._make_delta(null_inventory)
4708
invs_sent_so_far.add(inv.revision_id)
4709
inventory_cache[inv.revision_id] = inv
4710
delta_serialized = ''.join(
4711
serializer.delta_to_lines(basis_id, key[-1], delta))
4712
4536
yield versionedfile.FulltextContentFactory(
4713
key, parent_keys, None, delta_serialized)
4537
key, parent_keys, None, as_bytes)
4716
4540
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
added
removed
bzrlib/repository.py
