391
208
commit to be valid, deletes against the basis MUST be recorded via
392
209
builder.record_delete().
394
self._recording_deletes = True
396
basis_id = self.parents[0]
398
basis_id = _mod_revision.NULL_REVISION
399
self.basis_delta_revision = basis_id
401
def record_entry_contents(self, ie, parent_invs, path, tree,
403
"""Record the content of ie from tree into the commit if needed.
405
Side effect: sets ie.revision when unchanged
407
:param ie: An inventory entry present in the commit.
408
:param parent_invs: The inventories of the parent revisions of the
410
:param path: The path the entry is at in the tree.
411
:param tree: The tree which contains this entry and should be used to
413
:param content_summary: Summary data from the tree about the paths
414
content - stat, length, exec, sha/link target. This is only
415
accessed when the entry has a revision of None - that is when it is
416
a candidate to commit.
417
:return: A tuple (change_delta, version_recorded, fs_hash).
418
change_delta is an inventory_delta change for this entry against
419
the basis tree of the commit, or None if no change occured against
421
version_recorded is True if a new version of the entry has been
422
recorded. For instance, committing a merge where a file was only
423
changed on the other side will return (delta, False).
424
fs_hash is either None, or the hash details for the path (currently
425
a tuple of the contents sha1 and the statvalue returned by
426
tree.get_file_with_stat()).
428
if self.new_inventory.root is None:
429
if ie.parent_id is not None:
430
raise errors.RootMissing()
431
self._check_root(ie, parent_invs, tree)
432
if ie.revision is None:
433
kind = content_summary[0]
435
# ie is carried over from a prior commit
437
# XXX: repository specific check for nested tree support goes here - if
438
# the repo doesn't want nested trees we skip it ?
439
if (kind == 'tree-reference' and
440
not self.repository._format.supports_tree_reference):
441
# mismatch between commit builder logic and repository:
442
# this needs the entry creation pushed down into the builder.
443
raise NotImplementedError('Missing repository subtree support.')
444
self.new_inventory.add(ie)
446
# TODO: slow, take it out of the inner loop.
448
basis_inv = parent_invs[0]
450
basis_inv = Inventory(root_id=None)
452
# ie.revision is always None if the InventoryEntry is considered
453
# for committing. We may record the previous parents revision if the
454
# content is actually unchanged against a sole head.
455
if ie.revision is not None:
456
if not self._versioned_root and path == '':
457
# repositories that do not version the root set the root's
458
# revision to the new commit even when no change occurs (more
459
# specifically, they do not record a revision on the root; and
460
# the rev id is assigned to the root during deserialisation -
461
# this masks when a change may have occurred against the basis.
462
# To match this we always issue a delta, because the revision
463
# of the root will always be changing.
464
if ie.file_id in basis_inv:
465
delta = (basis_inv.id2path(ie.file_id), path,
469
delta = (None, path, ie.file_id, ie)
470
self._basis_delta.append(delta)
471
return delta, False, None
473
# we don't need to commit this, because the caller already
474
# determined that an existing revision of this file is
475
# appropriate. If it's not being considered for committing then
476
# it and all its parents to the root must be unaltered so
477
# no-change against the basis.
478
if ie.revision == self._new_revision_id:
479
raise AssertionError("Impossible situation, a skipped "
480
"inventory entry (%r) claims to be modified in this "
481
"commit (%r).", (ie, self._new_revision_id))
482
return None, False, None
483
# XXX: Friction: parent_candidates should return a list not a dict
484
# so that we don't have to walk the inventories again.
485
parent_candiate_entries = ie.parent_candidates(parent_invs)
486
head_set = self._heads(ie.file_id, parent_candiate_entries.keys())
488
for inv in parent_invs:
489
if ie.file_id in inv:
490
old_rev = inv[ie.file_id].revision
491
if old_rev in head_set:
492
heads.append(inv[ie.file_id].revision)
493
head_set.remove(inv[ie.file_id].revision)
496
# now we check to see if we need to write a new record to the
498
# We write a new entry unless there is one head to the ancestors, and
499
# the kind-derived content is unchanged.
501
# Cheapest check first: no ancestors, or more the one head in the
502
# ancestors, we write a new node.
506
# There is a single head, look it up for comparison
507
parent_entry = parent_candiate_entries[heads[0]]
508
# if the non-content specific data has changed, we'll be writing a
510
if (parent_entry.parent_id != ie.parent_id or
511
parent_entry.name != ie.name):
513
# now we need to do content specific checks:
515
# if the kind changed the content obviously has
516
if kind != parent_entry.kind:
518
# Stat cache fingerprint feedback for the caller - None as we usually
519
# don't generate one.
522
if content_summary[2] is None:
523
raise ValueError("Files must not have executable = None")
525
# We can't trust a check of the file length because of content
527
if (# if the exec bit has changed we have to store:
528
parent_entry.executable != content_summary[2]):
530
elif parent_entry.text_sha1 == content_summary[3]:
531
# all meta and content is unchanged (using a hash cache
532
# hit to check the sha)
533
ie.revision = parent_entry.revision
534
ie.text_size = parent_entry.text_size
535
ie.text_sha1 = parent_entry.text_sha1
536
ie.executable = parent_entry.executable
537
return self._get_delta(ie, basis_inv, path), False, None
539
# Either there is only a hash change(no hash cache entry,
540
# or same size content change), or there is no change on
542
# Provide the parent's hash to the store layer, so that the
543
# content is unchanged we will not store a new node.
544
nostore_sha = parent_entry.text_sha1
546
# We want to record a new node regardless of the presence or
547
# absence of a content change in the file.
549
ie.executable = content_summary[2]
550
file_obj, stat_value = tree.get_file_with_stat(ie.file_id, path)
552
text = file_obj.read()
556
ie.text_sha1, ie.text_size = self._add_text_to_weave(
557
ie.file_id, text, heads, nostore_sha)
558
# Let the caller know we generated a stat fingerprint.
559
fingerprint = (ie.text_sha1, stat_value)
560
except errors.ExistingContent:
561
# Turns out that the file content was unchanged, and we were
562
# only going to store a new node if it was changed. Carry over
564
ie.revision = parent_entry.revision
565
ie.text_size = parent_entry.text_size
566
ie.text_sha1 = parent_entry.text_sha1
567
ie.executable = parent_entry.executable
568
return self._get_delta(ie, basis_inv, path), False, None
569
elif kind == 'directory':
571
# all data is meta here, nothing specific to directory, so
573
ie.revision = parent_entry.revision
574
return self._get_delta(ie, basis_inv, path), False, None
575
self._add_text_to_weave(ie.file_id, '', heads, None)
576
elif kind == 'symlink':
577
current_link_target = content_summary[3]
579
# symlink target is not generic metadata, check if it has
581
if current_link_target != parent_entry.symlink_target:
584
# unchanged, carry over.
585
ie.revision = parent_entry.revision
586
ie.symlink_target = parent_entry.symlink_target
587
return self._get_delta(ie, basis_inv, path), False, None
588
ie.symlink_target = current_link_target
589
self._add_text_to_weave(ie.file_id, '', heads, None)
590
elif kind == 'tree-reference':
592
if content_summary[3] != parent_entry.reference_revision:
595
# unchanged, carry over.
596
ie.reference_revision = parent_entry.reference_revision
597
ie.revision = parent_entry.revision
598
return self._get_delta(ie, basis_inv, path), False, None
599
ie.reference_revision = content_summary[3]
600
if ie.reference_revision is None:
601
raise AssertionError("invalid content_summary for nested tree: %r"
602
% (content_summary,))
603
self._add_text_to_weave(ie.file_id, '', heads, None)
605
raise NotImplementedError('unknown kind')
606
ie.revision = self._new_revision_id
607
self._any_changes = True
608
return self._get_delta(ie, basis_inv, path), True, fingerprint
610
def record_iter_changes(self, tree, basis_revision_id, iter_changes,
611
_entry_factory=entry_factory):
211
raise NotImplementedError(self.will_record_deletes)
213
def record_iter_changes(self, tree, basis_revision_id, iter_changes):
612
214
"""Record a new tree via iter_changes.
614
216
:param tree: The tree to obtain text contents from for changed objects.
619
221
to basis_revision_id. The iterator must not include any items with
620
222
a current kind of None - missing items must be either filtered out
621
223
or errored-on beefore record_iter_changes sees the item.
622
:param _entry_factory: Private method to bind entry_factory locally for
624
224
:return: A generator of (file_id, relpath, fs_hash) tuples for use with
625
225
tree._observed_sha1.
627
# Create an inventory delta based on deltas between all the parents and
628
# deltas between all the parent inventories. We use inventory delta's
629
# between the inventory objects because iter_changes masks
630
# last-changed-field only changes.
632
# file_id -> change map, change is fileid, paths, changed, versioneds,
633
# parents, names, kinds, executables
635
# {file_id -> revision_id -> inventory entry, for entries in parent
636
# trees that are not parents[0]
640
revtrees = list(self.repository.revision_trees(self.parents))
641
except errors.NoSuchRevision:
642
# one or more ghosts, slow path.
644
for revision_id in self.parents:
646
revtrees.append(self.repository.revision_tree(revision_id))
647
except errors.NoSuchRevision:
649
basis_revision_id = _mod_revision.NULL_REVISION
651
revtrees.append(self.repository.revision_tree(
652
_mod_revision.NULL_REVISION))
653
# The basis inventory from a repository
655
basis_inv = revtrees[0].inventory
657
basis_inv = self.repository.revision_tree(
658
_mod_revision.NULL_REVISION).inventory
659
if len(self.parents) > 0:
660
if basis_revision_id != self.parents[0] and not ghost_basis:
662
"arbitrary basis parents not yet supported with merges")
663
for revtree in revtrees[1:]:
664
for change in revtree.inventory._make_delta(basis_inv):
665
if change[1] is None:
666
# Not present in this parent.
668
if change[2] not in merged_ids:
669
if change[0] is not None:
670
basis_entry = basis_inv[change[2]]
671
merged_ids[change[2]] = [
673
basis_entry.revision,
676
parent_entries[change[2]] = {
678
basis_entry.revision:basis_entry,
680
change[3].revision:change[3],
683
merged_ids[change[2]] = [change[3].revision]
684
parent_entries[change[2]] = {change[3].revision:change[3]}
686
merged_ids[change[2]].append(change[3].revision)
687
parent_entries[change[2]][change[3].revision] = change[3]
690
# Setup the changes from the tree:
691
# changes maps file_id -> (change, [parent revision_ids])
693
for change in iter_changes:
694
# This probably looks up in basis_inv way to much.
695
if change[1][0] is not None:
696
head_candidate = [basis_inv[change[0]].revision]
699
changes[change[0]] = change, merged_ids.get(change[0],
701
unchanged_merged = set(merged_ids) - set(changes)
702
# Extend the changes dict with synthetic changes to record merges of
704
for file_id in unchanged_merged:
705
# Record a merged version of these items that did not change vs the
706
# basis. This can be either identical parallel changes, or a revert
707
# of a specific file after a merge. The recorded content will be
708
# that of the current tree (which is the same as the basis), but
709
# the per-file graph will reflect a merge.
710
# NB:XXX: We are reconstructing path information we had, this
711
# should be preserved instead.
712
# inv delta change: (file_id, (path_in_source, path_in_target),
713
# changed_content, versioned, parent, name, kind,
716
basis_entry = basis_inv[file_id]
717
except errors.NoSuchId:
718
# a change from basis->some_parents but file_id isn't in basis
719
# so was new in the merge, which means it must have changed
720
# from basis -> current, and as it hasn't the add was reverted
721
# by the user. So we discard this change.
725
(basis_inv.id2path(file_id), tree.id2path(file_id)),
727
(basis_entry.parent_id, basis_entry.parent_id),
728
(basis_entry.name, basis_entry.name),
729
(basis_entry.kind, basis_entry.kind),
730
(basis_entry.executable, basis_entry.executable))
731
changes[file_id] = (change, merged_ids[file_id])
732
# changes contains tuples with the change and a set of inventory
733
# candidates for the file.
735
# old_path, new_path, file_id, new_inventory_entry
736
seen_root = False # Is the root in the basis delta?
737
inv_delta = self._basis_delta
738
modified_rev = self._new_revision_id
739
for change, head_candidates in changes.values():
740
if change[3][1]: # versioned in target.
741
# Several things may be happening here:
742
# We may have a fork in the per-file graph
743
# - record a change with the content from tree
744
# We may have a change against < all trees
745
# - carry over the tree that hasn't changed
746
# We may have a change against all trees
747
# - record the change with the content from tree
750
entry = _entry_factory[kind](file_id, change[5][1],
752
head_set = self._heads(change[0], set(head_candidates))
755
for head_candidate in head_candidates:
756
if head_candidate in head_set:
757
heads.append(head_candidate)
758
head_set.remove(head_candidate)
761
# Could be a carry-over situation:
762
parent_entry_revs = parent_entries.get(file_id, None)
763
if parent_entry_revs:
764
parent_entry = parent_entry_revs.get(heads[0], None)
767
if parent_entry is None:
768
# The parent iter_changes was called against is the one
769
# that is the per-file head, so any change is relevant
770
# iter_changes is valid.
771
carry_over_possible = False
773
# could be a carry over situation
774
# A change against the basis may just indicate a merge,
775
# we need to check the content against the source of the
776
# merge to determine if it was changed after the merge
778
if (parent_entry.kind != entry.kind or
779
parent_entry.parent_id != entry.parent_id or
780
parent_entry.name != entry.name):
781
# Metadata common to all entries has changed
782
# against per-file parent
783
carry_over_possible = False
785
carry_over_possible = True
786
# per-type checks for changes against the parent_entry
789
# Cannot be a carry-over situation
790
carry_over_possible = False
791
# Populate the entry in the delta
793
# XXX: There is still a small race here: If someone reverts the content of a file
794
# after iter_changes examines and decides it has changed,
795
# we will unconditionally record a new version even if some
796
# other process reverts it while commit is running (with
797
# the revert happening after iter_changes did its
800
entry.executable = True
802
entry.executable = False
803
if (carry_over_possible and
804
parent_entry.executable == entry.executable):
805
# Check the file length, content hash after reading
807
nostore_sha = parent_entry.text_sha1
810
file_obj, stat_value = tree.get_file_with_stat(file_id, change[1][1])
812
text = file_obj.read()
816
entry.text_sha1, entry.text_size = self._add_text_to_weave(
817
file_id, text, heads, nostore_sha)
818
yield file_id, change[1][1], (entry.text_sha1, stat_value)
819
except errors.ExistingContent:
820
# No content change against a carry_over parent
821
# Perhaps this should also yield a fs hash update?
823
entry.text_size = parent_entry.text_size
824
entry.text_sha1 = parent_entry.text_sha1
825
elif kind == 'symlink':
827
entry.symlink_target = tree.get_symlink_target(file_id)
828
if (carry_over_possible and
829
parent_entry.symlink_target == entry.symlink_target):
832
self._add_text_to_weave(change[0], '', heads, None)
833
elif kind == 'directory':
834
if carry_over_possible:
837
# Nothing to set on the entry.
838
# XXX: split into the Root and nonRoot versions.
839
if change[1][1] != '' or self.repository.supports_rich_root():
840
self._add_text_to_weave(change[0], '', heads, None)
841
elif kind == 'tree-reference':
842
if not self.repository._format.supports_tree_reference:
843
# This isn't quite sane as an error, but we shouldn't
844
# ever see this code path in practice: tree's don't
845
# permit references when the repo doesn't support tree
847
raise errors.UnsupportedOperation(tree.add_reference,
849
reference_revision = tree.get_reference_revision(change[0])
850
entry.reference_revision = reference_revision
851
if (carry_over_possible and
852
parent_entry.reference_revision == reference_revision):
855
self._add_text_to_weave(change[0], '', heads, None)
857
raise AssertionError('unknown kind %r' % kind)
859
entry.revision = modified_rev
861
entry.revision = parent_entry.revision
864
new_path = change[1][1]
865
inv_delta.append((change[1][0], new_path, change[0], entry))
868
self.new_inventory = None
870
# This should perhaps be guarded by a check that the basis we
871
# commit against is the basis for the commit and if not do a delta
873
self._any_changes = True
875
# housekeeping root entry changes do not affect no-change commits.
876
self._require_root_change(tree)
877
self.basis_delta_revision = basis_revision_id
879
def _add_text_to_weave(self, file_id, new_text, parents, nostore_sha):
880
parent_keys = tuple([(file_id, parent) for parent in parents])
881
return self.repository.texts._add_text(
882
(file_id, self._new_revision_id), parent_keys, new_text,
883
nostore_sha=nostore_sha, random_id=self.random_revid)[0:2]
886
class RootCommitBuilder(CommitBuilder):
887
"""This commitbuilder actually records the root id"""
889
# the root entry gets versioned properly by this builder.
890
_versioned_root = True
892
def _check_root(self, ie, parent_invs, tree):
893
"""Helper for record_entry_contents.
895
:param ie: An entry being added.
896
:param parent_invs: The inventories of the parent revisions of the
898
:param tree: The tree that is being committed.
901
def _require_root_change(self, tree):
902
"""Enforce an appropriate root object change.
904
This is called once when record_iter_changes is called, if and only if
905
the root was not in the delta calculated by record_iter_changes.
907
:param tree: The tree which is being committed.
909
# versioned roots do not change unless the tree found a change.
227
raise NotImplementedError(self.record_iter_changes)
912
230
class RepositoryWriteLockResult(LogicalLockResult):
1061
319
return InterRepository._assert_same_model(self, repository)
1063
def add_inventory(self, revision_id, inv, parents):
1064
"""Add the inventory inv to the repository as revision_id.
1066
:param parents: The revision ids of the parents that revision_id
1067
is known to have and are in the repository already.
1069
:returns: The validator(which is a sha1 digest, though what is sha'd is
1070
repository format specific) of the serialized inventory.
1072
if not self.is_in_write_group():
1073
raise AssertionError("%r not in write group" % (self,))
1074
_mod_revision.check_not_reserved_id(revision_id)
1075
if not (inv.revision_id is None or inv.revision_id == revision_id):
1076
raise AssertionError(
1077
"Mismatch between inventory revision"
1078
" id and insertion revid (%r, %r)"
1079
% (inv.revision_id, revision_id))
1080
if inv.root is None:
1081
raise errors.RootMissing()
1082
return self._add_inventory_checked(revision_id, inv, parents)
1084
def _add_inventory_checked(self, revision_id, inv, parents):
1085
"""Add inv to the repository after checking the inputs.
1087
This function can be overridden to allow different inventory styles.
1089
:seealso: add_inventory, for the contract.
1091
inv_lines = self._serializer.write_inventory_to_lines(inv)
1092
return self._inventory_add_lines(revision_id, parents,
1093
inv_lines, check_content=False)
1095
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1096
parents, basis_inv=None, propagate_caches=False):
1097
"""Add a new inventory expressed as a delta against another revision.
1099
See the inventory developers documentation for the theory behind
1102
:param basis_revision_id: The inventory id the delta was created
1103
against. (This does not have to be a direct parent.)
1104
:param delta: The inventory delta (see Inventory.apply_delta for
1106
:param new_revision_id: The revision id that the inventory is being
1108
:param parents: The revision ids of the parents that revision_id is
1109
known to have and are in the repository already. These are supplied
1110
for repositories that depend on the inventory graph for revision
1111
graph access, as well as for those that pun ancestry with delta
1113
:param basis_inv: The basis inventory if it is already known,
1115
:param propagate_caches: If True, the caches for this inventory are
1116
copied to and updated for the result if possible.
1118
:returns: (validator, new_inv)
1119
The validator(which is a sha1 digest, though what is sha'd is
1120
repository format specific) of the serialized inventory, and the
1121
resulting inventory.
1123
if not self.is_in_write_group():
1124
raise AssertionError("%r not in write group" % (self,))
1125
_mod_revision.check_not_reserved_id(new_revision_id)
1126
basis_tree = self.revision_tree(basis_revision_id)
1127
basis_tree.lock_read()
1129
# Note that this mutates the inventory of basis_tree, which not all
1130
# inventory implementations may support: A better idiom would be to
1131
# return a new inventory, but as there is no revision tree cache in
1132
# repository this is safe for now - RBC 20081013
1133
if basis_inv is None:
1134
basis_inv = basis_tree.inventory
1135
basis_inv.apply_delta(delta)
1136
basis_inv.revision_id = new_revision_id
1137
return (self.add_inventory(new_revision_id, basis_inv, parents),
1142
def _inventory_add_lines(self, revision_id, parents, lines,
1143
check_content=True):
1144
"""Store lines in inv_vf and return the sha1 of the inventory."""
1145
parents = [(parent,) for parent in parents]
1146
result = self.inventories.add_lines((revision_id,), parents, lines,
1147
check_content=check_content)[0]
1148
self.inventories._access.flush()
1151
def add_revision(self, revision_id, rev, inv=None, config=None):
1152
"""Add rev to the revision store as revision_id.
1154
:param revision_id: the revision id to use.
1155
:param rev: The revision object.
1156
:param inv: The inventory for the revision. if None, it will be looked
1157
up in the inventory storer
1158
:param config: If None no digital signature will be created.
1159
If supplied its signature_needed method will be used
1160
to determine if a signature should be made.
1162
# TODO: jam 20070210 Shouldn't we check rev.revision_id and
1164
_mod_revision.check_not_reserved_id(revision_id)
1165
if config is not None and config.signature_needed():
1167
inv = self.get_inventory(revision_id)
1168
plaintext = Testament(rev, inv).as_short_text()
1169
self.store_revision_signature(
1170
gpg.GPGStrategy(config), plaintext, revision_id)
1171
# check inventory present
1172
if not self.inventories.get_parent_map([(revision_id,)]):
1174
raise errors.WeaveRevisionNotPresent(revision_id,
1177
# yes, this is not suitable for adding with ghosts.
1178
rev.inventory_sha1 = self.add_inventory(revision_id, inv,
1181
key = (revision_id,)
1182
rev.inventory_sha1 = self.inventories.get_sha1s([key])[key]
1183
self._add_revision(rev)
1185
def _add_revision(self, revision):
1186
text = self._serializer.write_revision_to_string(revision)
1187
key = (revision.revision_id,)
1188
parents = tuple((parent,) for parent in revision.parent_ids)
1189
self.revisions.add_lines(key, parents, osutils.split_lines(text))
1191
321
def all_revision_ids(self):
1192
322
"""Returns a list of all the revision ids in the repository.
1217
347
self.control_files.break_lock()
1220
def _eliminate_revisions_not_present(self, revision_ids):
1221
"""Check every revision id in revision_ids to see if we have it.
1223
Returns a set of the present revisions.
1226
graph = self.get_graph()
1227
parent_map = graph.get_parent_map(revision_ids)
1228
# The old API returned a list, should this actually be a set?
1229
return parent_map.keys()
1231
def _check_inventories(self, checker):
1232
"""Check the inventories found from the revision scan.
1234
This is responsible for verifying the sha1 of inventories and
1235
creating a pending_keys set that covers data referenced by inventories.
1237
bar = ui.ui_factory.nested_progress_bar()
1239
self._do_check_inventories(checker, bar)
1243
def _do_check_inventories(self, checker, bar):
1244
"""Helper for _check_inventories."""
1246
keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1247
kinds = ['chk_bytes', 'texts']
1248
count = len(checker.pending_keys)
1249
bar.update("inventories", 0, 2)
1250
current_keys = checker.pending_keys
1251
checker.pending_keys = {}
1252
# Accumulate current checks.
1253
for key in current_keys:
1254
if key[0] != 'inventories' and key[0] not in kinds:
1255
checker._report_items.append('unknown key type %r' % (key,))
1256
keys[key[0]].add(key[1:])
1257
if keys['inventories']:
1258
# NB: output order *should* be roughly sorted - topo or
1259
# inverse topo depending on repository - either way decent
1260
# to just delta against. However, pre-CHK formats didn't
1261
# try to optimise inventory layout on disk. As such the
1262
# pre-CHK code path does not use inventory deltas.
1264
for record in self.inventories.check(keys=keys['inventories']):
1265
if record.storage_kind == 'absent':
1266
checker._report_items.append(
1267
'Missing inventory {%s}' % (record.key,))
1269
last_object = self._check_record('inventories', record,
1270
checker, last_object,
1271
current_keys[('inventories',) + record.key])
1272
del keys['inventories']
1275
bar.update("texts", 1)
1276
while (checker.pending_keys or keys['chk_bytes']
1278
# Something to check.
1279
current_keys = checker.pending_keys
1280
checker.pending_keys = {}
1281
# Accumulate current checks.
1282
for key in current_keys:
1283
if key[0] not in kinds:
1284
checker._report_items.append('unknown key type %r' % (key,))
1285
keys[key[0]].add(key[1:])
1286
# Check the outermost kind only - inventories || chk_bytes || texts
1290
for record in getattr(self, kind).check(keys=keys[kind]):
1291
if record.storage_kind == 'absent':
1292
checker._report_items.append(
1293
'Missing %s {%s}' % (kind, record.key,))
1295
last_object = self._check_record(kind, record,
1296
checker, last_object, current_keys[(kind,) + record.key])
1300
def _check_record(self, kind, record, checker, last_object, item_data):
1301
"""Check a single text from this repository."""
1302
if kind == 'inventories':
1303
rev_id = record.key[0]
1304
inv = self._deserialise_inventory(rev_id,
1305
record.get_bytes_as('fulltext'))
1306
if last_object is not None:
1307
delta = inv._make_delta(last_object)
1308
for old_path, path, file_id, ie in delta:
1311
ie.check(checker, rev_id, inv)
1313
for path, ie in inv.iter_entries():
1314
ie.check(checker, rev_id, inv)
1315
if self._format.fast_deltas:
1317
elif kind == 'chk_bytes':
1318
# No code written to check chk_bytes for this repo format.
1319
checker._report_items.append(
1320
'unsupported key type chk_bytes for %s' % (record.key,))
1321
elif kind == 'texts':
1322
self._check_text(record, checker, item_data)
1324
checker._report_items.append(
1325
'unknown key type %s for %s' % (kind, record.key))
1327
def _check_text(self, record, checker, item_data):
1328
"""Check a single text."""
1329
# Check it is extractable.
1330
# TODO: check length.
1331
if record.storage_kind == 'chunked':
1332
chunks = record.get_bytes_as(record.storage_kind)
1333
sha1 = osutils.sha_strings(chunks)
1334
length = sum(map(len, chunks))
1336
content = record.get_bytes_as('fulltext')
1337
sha1 = osutils.sha_string(content)
1338
length = len(content)
1339
if item_data and sha1 != item_data[1]:
1340
checker._report_items.append(
1341
'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1342
(record.key, sha1, item_data[1], item_data[2]))
1345
def create(a_bzrdir):
1346
"""Construct the current default format repository in a_bzrdir."""
1347
return RepositoryFormat.get_default_format().initialize(a_bzrdir)
350
def create(controldir):
351
"""Construct the current default format repository in controldir."""
352
return RepositoryFormat.get_default_format().initialize(controldir)
1349
def __init__(self, _format, a_bzrdir, control_files):
354
def __init__(self, _format, controldir, control_files):
1350
355
"""instantiate a Repository.
1352
357
:param _format: The format of the repository on disk.
1353
:param a_bzrdir: The BzrDir of the repository.
358
:param controldir: The ControlDir of the repository.
359
:param control_files: Control files to use for locking, etc.
1355
361
# In the future we will have a single api for all stores for
1356
362
# getting file texts, inventories and revisions, then
2163
941
uniquely identify the file version in the caller's context. (Examples:
2164
942
an index number or a TreeTransform trans_id.)
2166
bytes_iterator is an iterable of bytestrings for the file. The
2167
kind of iterable and length of the bytestrings are unspecified, but for
2168
this implementation, it is a list of bytes produced by
2169
VersionedFile.get_record_stream().
2171
944
:param desired_files: a list of (file_id, revision_id, identifier)
2175
for file_id, revision_id, callable_data in desired_files:
2176
text_keys[(file_id, revision_id)] = callable_data
2177
for record in self.texts.get_record_stream(text_keys, 'unordered', True):
2178
if record.storage_kind == 'absent':
2179
raise errors.RevisionNotPresent(record.key, self)
2180
yield text_keys[record.key], record.get_bytes_as('chunked')
2182
def _generate_text_key_index(self, text_key_references=None,
2184
"""Generate a new text key index for the repository.
2186
This is an expensive function that will take considerable time to run.
2188
:return: A dict mapping text keys ((file_id, revision_id) tuples) to a
2189
list of parents, also text keys. When a given key has no parents,
2190
the parents list will be [NULL_REVISION].
2192
# All revisions, to find inventory parents.
2193
if ancestors is None:
2194
graph = self.get_graph()
2195
ancestors = graph.get_parent_map(self.all_revision_ids())
2196
if text_key_references is None:
2197
text_key_references = self.find_text_key_references()
2198
pb = ui.ui_factory.nested_progress_bar()
2200
return self._do_generate_text_key_index(ancestors,
2201
text_key_references, pb)
2205
def _do_generate_text_key_index(self, ancestors, text_key_references, pb):
2206
"""Helper for _generate_text_key_index to avoid deep nesting."""
2207
revision_order = tsort.topo_sort(ancestors)
2208
invalid_keys = set()
2210
for revision_id in revision_order:
2211
revision_keys[revision_id] = set()
2212
text_count = len(text_key_references)
2213
# a cache of the text keys to allow reuse; costs a dict of all the
2214
# keys, but saves a 2-tuple for every child of a given key.
2216
for text_key, valid in text_key_references.iteritems():
2218
invalid_keys.add(text_key)
2220
revision_keys[text_key[1]].add(text_key)
2221
text_key_cache[text_key] = text_key
2222
del text_key_references
2224
text_graph = graph.Graph(graph.DictParentsProvider(text_index))
2225
NULL_REVISION = _mod_revision.NULL_REVISION
2226
# Set a cache with a size of 10 - this suffices for bzr.dev but may be
2227
# too small for large or very branchy trees. However, for 55K path
2228
# trees, it would be easy to use too much memory trivially. Ideally we
2229
# could gauge this by looking at available real memory etc, but this is
2230
# always a tricky proposition.
2231
inventory_cache = lru_cache.LRUCache(10)
2232
batch_size = 10 # should be ~150MB on a 55K path tree
2233
batch_count = len(revision_order) / batch_size + 1
2235
pb.update("Calculating text parents", processed_texts, text_count)
2236
for offset in xrange(batch_count):
2237
to_query = revision_order[offset * batch_size:(offset + 1) *
2241
for revision_id in to_query:
2242
parent_ids = ancestors[revision_id]
2243
for text_key in revision_keys[revision_id]:
2244
pb.update("Calculating text parents", processed_texts)
2245
processed_texts += 1
2246
candidate_parents = []
2247
for parent_id in parent_ids:
2248
parent_text_key = (text_key[0], parent_id)
2250
check_parent = parent_text_key not in \
2251
revision_keys[parent_id]
2253
# the parent parent_id is a ghost:
2254
check_parent = False
2255
# truncate the derived graph against this ghost.
2256
parent_text_key = None
2258
# look at the parent commit details inventories to
2259
# determine possible candidates in the per file graph.
2262
inv = inventory_cache[parent_id]
2264
inv = self.revision_tree(parent_id).inventory
2265
inventory_cache[parent_id] = inv
2267
parent_entry = inv[text_key[0]]
2268
except (KeyError, errors.NoSuchId):
2270
if parent_entry is not None:
2272
text_key[0], parent_entry.revision)
2274
parent_text_key = None
2275
if parent_text_key is not None:
2276
candidate_parents.append(
2277
text_key_cache[parent_text_key])
2278
parent_heads = text_graph.heads(candidate_parents)
2279
new_parents = list(parent_heads)
2280
new_parents.sort(key=lambda x:candidate_parents.index(x))
2281
if new_parents == []:
2282
new_parents = [NULL_REVISION]
2283
text_index[text_key] = new_parents
2285
for text_key in invalid_keys:
2286
text_index[text_key] = [NULL_REVISION]
2289
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
2290
"""Get an iterable listing the keys of all the data introduced by a set
2293
The keys will be ordered so that the corresponding items can be safely
2294
fetched and inserted in that order.
2296
:returns: An iterable producing tuples of (knit-kind, file-id,
2297
versions). knit-kind is one of 'file', 'inventory', 'signatures',
2298
'revisions'. file-id is None unless knit-kind is 'file'.
2300
for result in self._find_file_keys_to_fetch(revision_ids, _files_pb):
2303
for result in self._find_non_file_keys_to_fetch(revision_ids):
2306
def _find_file_keys_to_fetch(self, revision_ids, pb):
2307
# XXX: it's a bit weird to control the inventory weave caching in this
2308
# generator. Ideally the caching would be done in fetch.py I think. Or
2309
# maybe this generator should explicitly have the contract that it
2310
# should not be iterated until the previously yielded item has been
2312
inv_w = self.inventories
2314
# file ids that changed
2315
file_ids = self.fileids_altered_by_revision_ids(revision_ids, inv_w)
2317
num_file_ids = len(file_ids)
2318
for file_id, altered_versions in file_ids.iteritems():
2320
pb.update("Fetch texts", count, num_file_ids)
2322
yield ("file", file_id, altered_versions)
2324
def _find_non_file_keys_to_fetch(self, revision_ids):
2326
yield ("inventory", None, revision_ids)
2329
# XXX: Note ATM no callers actually pay attention to this return
2330
# instead they just use the list of revision ids and ignore
2331
# missing sigs. Consider removing this work entirely
2332
revisions_with_signatures = set(self.signatures.get_parent_map(
2333
[(r,) for r in revision_ids]))
2334
revisions_with_signatures = set(
2335
[r for (r,) in revisions_with_signatures])
2336
revisions_with_signatures.intersection_update(revision_ids)
2337
yield ("signatures", None, revisions_with_signatures)
2340
yield ("revisions", None, revision_ids)
2343
def get_inventory(self, revision_id):
2344
"""Get Inventory object by revision id."""
2345
return self.iter_inventories([revision_id]).next()
2347
def iter_inventories(self, revision_ids, ordering=None):
2348
"""Get many inventories by revision_ids.
2350
This will buffer some or all of the texts used in constructing the
2351
inventories in memory, but will only parse a single inventory at a
2354
:param revision_ids: The expected revision ids of the inventories.
2355
:param ordering: optional ordering, e.g. 'topological'. If not
2356
specified, the order of revision_ids will be preserved (by
2357
buffering if necessary).
2358
:return: An iterator of inventories.
2360
if ((None in revision_ids)
2361
or (_mod_revision.NULL_REVISION in revision_ids)):
2362
raise ValueError('cannot get null revision inventory')
2363
return self._iter_inventories(revision_ids, ordering)
2365
def _iter_inventories(self, revision_ids, ordering):
2366
"""single-document based inventory iteration."""
2367
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2368
for text, revision_id in inv_xmls:
2369
yield self._deserialise_inventory(revision_id, text)
2371
def _iter_inventory_xmls(self, revision_ids, ordering):
2372
if ordering is None:
2373
order_as_requested = True
2374
ordering = 'unordered'
2376
order_as_requested = False
2377
keys = [(revision_id,) for revision_id in revision_ids]
2380
if order_as_requested:
2381
key_iter = iter(keys)
2382
next_key = key_iter.next()
2383
stream = self.inventories.get_record_stream(keys, ordering, True)
2385
for record in stream:
2386
if record.storage_kind != 'absent':
2387
chunks = record.get_bytes_as('chunked')
2388
if order_as_requested:
2389
text_chunks[record.key] = chunks
2391
yield ''.join(chunks), record.key[-1]
2393
raise errors.NoSuchRevision(self, record.key)
2394
if order_as_requested:
2395
# Yield as many results as we can while preserving order.
2396
while next_key in text_chunks:
2397
chunks = text_chunks.pop(next_key)
2398
yield ''.join(chunks), next_key[-1]
2400
next_key = key_iter.next()
2401
except StopIteration:
2402
# We still want to fully consume the get_record_stream,
2403
# just in case it is not actually finished at this point
2407
def _deserialise_inventory(self, revision_id, xml):
2408
"""Transform the xml into an inventory object.
2410
:param revision_id: The expected revision id of the inventory.
2411
:param xml: A serialised inventory.
2413
result = self._serializer.read_inventory_from_string(xml, revision_id,
2414
entry_cache=self._inventory_entry_cache,
2415
return_from_cache=self._safe_to_return_from_cache)
2416
if result.revision_id != revision_id:
2417
raise AssertionError('revision id mismatch %s != %s' % (
2418
result.revision_id, revision_id))
2421
def get_serializer_format(self):
2422
return self._serializer.format_num
2425
def _get_inventory_xml(self, revision_id):
2426
"""Get serialized inventory as a string."""
2427
texts = self._iter_inventory_xmls([revision_id], 'unordered')
2429
text, revision_id = texts.next()
2430
except StopIteration:
2431
raise errors.HistoryMissing(self, 'inventory', revision_id)
947
raise NotImplementedError(self.iter_files_bytes)
2434
949
def get_rev_id_for_revno(self, revno, known_pair):
2435
950
"""Return the revision id of a revno, given a later (revno, revid)
2770
1221
except UnicodeDecodeError:
2771
1222
raise errors.NonAsciiRevisionId(method, self)
2773
def revision_graph_can_have_wrong_parents(self):
2774
"""Is it possible for this repository to have a revision graph with
2777
If True, then this repository must also implement
2778
_find_inconsistent_revision_parents so that check and reconcile can
2779
check for inconsistencies before proceeding with other checks that may
2780
depend on the revision index being consistent.
2782
raise NotImplementedError(self.revision_graph_can_have_wrong_parents)
2785
def install_revision(repository, rev, revision_tree):
2786
"""Install all revision data into a repository."""
2787
install_revisions(repository, [(rev, revision_tree, None)])
2790
def install_revisions(repository, iterable, num_revisions=None, pb=None):
2791
"""Install all revision data into a repository.
2793
Accepts an iterable of revision, tree, signature tuples. The signature
2796
repository.start_write_group()
2798
inventory_cache = lru_cache.LRUCache(10)
2799
for n, (revision, revision_tree, signature) in enumerate(iterable):
2800
_install_revision(repository, revision, revision_tree, signature,
2803
pb.update('Transferring revisions', n + 1, num_revisions)
2805
repository.abort_write_group()
2808
repository.commit_write_group()
2811
def _install_revision(repository, rev, revision_tree, signature,
2813
"""Install all revision data into a repository."""
2814
present_parents = []
2816
for p_id in rev.parent_ids:
2817
if repository.has_revision(p_id):
2818
present_parents.append(p_id)
2819
parent_trees[p_id] = repository.revision_tree(p_id)
2821
parent_trees[p_id] = repository.revision_tree(
2822
_mod_revision.NULL_REVISION)
2824
inv = revision_tree.inventory
2825
entries = inv.iter_entries()
2826
# backwards compatibility hack: skip the root id.
2827
if not repository.supports_rich_root():
2828
path, root = entries.next()
2829
if root.revision != rev.revision_id:
2830
raise errors.IncompatibleRevision(repr(repository))
2832
for path, ie in entries:
2833
text_keys[(ie.file_id, ie.revision)] = ie
2834
text_parent_map = repository.texts.get_parent_map(text_keys)
2835
missing_texts = set(text_keys) - set(text_parent_map)
2836
# Add the texts that are not already present
2837
for text_key in missing_texts:
2838
ie = text_keys[text_key]
2840
# FIXME: TODO: The following loop overlaps/duplicates that done by
2841
# commit to determine parents. There is a latent/real bug here where
2842
# the parents inserted are not those commit would do - in particular
2843
# they are not filtered by heads(). RBC, AB
2844
for revision, tree in parent_trees.iteritems():
2845
if ie.file_id not in tree:
2847
parent_id = tree.inventory[ie.file_id].revision
2848
if parent_id in text_parents:
2850
text_parents.append((ie.file_id, parent_id))
2851
lines = revision_tree.get_file(ie.file_id).readlines()
2852
repository.texts.add_lines(text_key, text_parents, lines)
2854
# install the inventory
2855
if repository._format._commit_inv_deltas and len(rev.parent_ids):
2856
# Cache this inventory
2857
inventory_cache[rev.revision_id] = inv
2859
basis_inv = inventory_cache[rev.parent_ids[0]]
2861
repository.add_inventory(rev.revision_id, inv, present_parents)
2863
delta = inv._make_delta(basis_inv)
2864
repository.add_inventory_by_delta(rev.parent_ids[0], delta,
2865
rev.revision_id, present_parents)
2867
repository.add_inventory(rev.revision_id, inv, present_parents)
2868
except errors.RevisionAlreadyPresent:
2870
if signature is not None:
2871
repository.add_signature_text(rev.revision_id, signature)
2872
repository.add_revision(rev.revision_id, rev, inv)
2875
1225
class MetaDirRepository(Repository):
2876
1226
"""Repositories in the new meta-dir layout.
3546
1709
"different serializers")
3549
class InterSameDataRepository(InterRepository):
3550
"""Code for converting between repositories that represent the same data.
3552
Data format and model must match for this to work.
3556
def _get_repo_format_to_test(self):
3557
"""Repository format for testing with.
3559
InterSameData can pull from subtree to subtree and from non-subtree to
3560
non-subtree, so we test this with the richest repository format.
3562
from bzrlib.repofmt import knitrepo
3563
return knitrepo.RepositoryFormatKnit3()
3566
def is_compatible(source, target):
3567
return InterRepository._same_model(source, target)
3570
class InterDifferingSerializer(InterRepository):
3573
def _get_repo_format_to_test(self):
3577
def is_compatible(source, target):
3578
"""Be compatible with Knit2 source and Knit3 target"""
3579
# This is redundant with format.check_conversion_target(), however that
3580
# raises an exception, and we just want to say "False" as in we won't
3581
# support converting between these formats.
3582
if 'IDS_never' in debug.debug_flags:
3584
if source.supports_rich_root() and not target.supports_rich_root():
3586
if (source._format.supports_tree_reference
3587
and not target._format.supports_tree_reference):
3589
if target._fallback_repositories and target._format.supports_chks:
3590
# IDS doesn't know how to copy CHKs for the parent inventories it
3591
# adds to stacked repos.
3593
if 'IDS_always' in debug.debug_flags:
3595
# Only use this code path for local source and target. IDS does far
3596
# too much IO (both bandwidth and roundtrips) over a network.
3597
if not source.bzrdir.transport.base.startswith('file:///'):
3599
if not target.bzrdir.transport.base.startswith('file:///'):
3603
def _get_trees(self, revision_ids, cache):
3605
for rev_id in revision_ids:
3607
possible_trees.append((rev_id, cache[rev_id]))
3609
# Not cached, but inventory might be present anyway.
3611
tree = self.source.revision_tree(rev_id)
3612
except errors.NoSuchRevision:
3613
# Nope, parent is ghost.
3616
cache[rev_id] = tree
3617
possible_trees.append((rev_id, tree))
3618
return possible_trees
3620
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3621
"""Get the best delta and base for this revision.
3623
:return: (basis_id, delta)
3626
# Generate deltas against each tree, to find the shortest.
3627
texts_possibly_new_in_tree = set()
3628
for basis_id, basis_tree in possible_trees:
3629
delta = tree.inventory._make_delta(basis_tree.inventory)
3630
for old_path, new_path, file_id, new_entry in delta:
3631
if new_path is None:
3632
# This file_id isn't present in the new rev, so we don't
3636
# Rich roots are handled elsewhere...
3638
kind = new_entry.kind
3639
if kind != 'directory' and kind != 'file':
3640
# No text record associated with this inventory entry.
3642
# This is a directory or file that has changed somehow.
3643
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3644
deltas.append((len(delta), basis_id, delta))
3646
return deltas[0][1:]
3648
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3649
"""Find all parent revisions that are absent, but for which the
3650
inventory is present, and copy those inventories.
3652
This is necessary to preserve correctness when the source is stacked
3653
without fallbacks configured. (Note that in cases like upgrade the
3654
source may be not have _fallback_repositories even though it is
3658
for parents in parent_map.values():
3659
parent_revs.update(parents)
3660
present_parents = self.source.get_parent_map(parent_revs)
3661
absent_parents = set(parent_revs).difference(present_parents)
3662
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3663
(rev_id,) for rev_id in absent_parents)
3664
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3665
for parent_tree in self.source.revision_trees(parent_inv_ids):
3666
current_revision_id = parent_tree.get_revision_id()
3667
parents_parents_keys = parent_invs_keys_for_stacking[
3668
(current_revision_id,)]
3669
parents_parents = [key[-1] for key in parents_parents_keys]
3670
basis_id = _mod_revision.NULL_REVISION
3671
basis_tree = self.source.revision_tree(basis_id)
3672
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3673
self.target.add_inventory_by_delta(
3674
basis_id, delta, current_revision_id, parents_parents)
3675
cache[current_revision_id] = parent_tree
3677
def _fetch_batch(self, revision_ids, basis_id, cache):
3678
"""Fetch across a few revisions.
3680
:param revision_ids: The revisions to copy
3681
:param basis_id: The revision_id of a tree that must be in cache, used
3682
as a basis for delta when no other base is available
3683
:param cache: A cache of RevisionTrees that we can use.
3684
:return: The revision_id of the last converted tree. The RevisionTree
3685
for it will be in cache
3687
# Walk though all revisions; get inventory deltas, copy referenced
3688
# texts that delta references, insert the delta, revision and
3690
root_keys_to_create = set()
3693
pending_revisions = []
3694
parent_map = self.source.get_parent_map(revision_ids)
3695
self._fetch_parent_invs_for_stacking(parent_map, cache)
3696
self.source._safe_to_return_from_cache = True
3697
for tree in self.source.revision_trees(revision_ids):
3698
# Find a inventory delta for this revision.
3699
# Find text entries that need to be copied, too.
3700
current_revision_id = tree.get_revision_id()
3701
parent_ids = parent_map.get(current_revision_id, ())
3702
parent_trees = self._get_trees(parent_ids, cache)
3703
possible_trees = list(parent_trees)
3704
if len(possible_trees) == 0:
3705
# There either aren't any parents, or the parents are ghosts,
3706
# so just use the last converted tree.
3707
possible_trees.append((basis_id, cache[basis_id]))
3708
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3710
revision = self.source.get_revision(current_revision_id)
3711
pending_deltas.append((basis_id, delta,
3712
current_revision_id, revision.parent_ids))
3713
if self._converting_to_rich_root:
3714
self._revision_id_to_root_id[current_revision_id] = \
3716
# Determine which texts are in present in this revision but not in
3717
# any of the available parents.
3718
texts_possibly_new_in_tree = set()
3719
for old_path, new_path, file_id, entry in delta:
3720
if new_path is None:
3721
# This file_id isn't present in the new rev
3725
if not self.target.supports_rich_root():
3726
# The target doesn't support rich root, so we don't
3729
if self._converting_to_rich_root:
3730
# This can't be copied normally, we have to insert
3732
root_keys_to_create.add((file_id, entry.revision))
3735
texts_possibly_new_in_tree.add((file_id, entry.revision))
3736
for basis_id, basis_tree in possible_trees:
3737
basis_inv = basis_tree.inventory
3738
for file_key in list(texts_possibly_new_in_tree):
3739
file_id, file_revision = file_key
3741
entry = basis_inv[file_id]
3742
except errors.NoSuchId:
3744
if entry.revision == file_revision:
3745
texts_possibly_new_in_tree.remove(file_key)
3746
text_keys.update(texts_possibly_new_in_tree)
3747
pending_revisions.append(revision)
3748
cache[current_revision_id] = tree
3749
basis_id = current_revision_id
3750
self.source._safe_to_return_from_cache = False
3752
from_texts = self.source.texts
3753
to_texts = self.target.texts
3754
if root_keys_to_create:
3755
root_stream = _mod_fetch._new_root_data_stream(
3756
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3758
to_texts.insert_record_stream(root_stream)
3759
to_texts.insert_record_stream(from_texts.get_record_stream(
3760
text_keys, self.target._format._fetch_order,
3761
not self.target._format._fetch_uses_deltas))
3762
# insert inventory deltas
3763
for delta in pending_deltas:
3764
self.target.add_inventory_by_delta(*delta)
3765
if self.target._fallback_repositories:
3766
# Make sure this stacked repository has all the parent inventories
3767
# for the new revisions that we are about to insert. We do this
3768
# before adding the revisions so that no revision is added until
3769
# all the inventories it may depend on are added.
3770
# Note that this is overzealous, as we may have fetched these in an
3773
revision_ids = set()
3774
for revision in pending_revisions:
3775
revision_ids.add(revision.revision_id)
3776
parent_ids.update(revision.parent_ids)
3777
parent_ids.difference_update(revision_ids)
3778
parent_ids.discard(_mod_revision.NULL_REVISION)
3779
parent_map = self.source.get_parent_map(parent_ids)
3780
# we iterate over parent_map and not parent_ids because we don't
3781
# want to try copying any revision which is a ghost
3782
for parent_tree in self.source.revision_trees(parent_map):
3783
current_revision_id = parent_tree.get_revision_id()
3784
parents_parents = parent_map[current_revision_id]
3785
possible_trees = self._get_trees(parents_parents, cache)
3786
if len(possible_trees) == 0:
3787
# There either aren't any parents, or the parents are
3788
# ghosts, so just use the last converted tree.
3789
possible_trees.append((basis_id, cache[basis_id]))
3790
basis_id, delta = self._get_delta_for_revision(parent_tree,
3791
parents_parents, possible_trees)
3792
self.target.add_inventory_by_delta(
3793
basis_id, delta, current_revision_id, parents_parents)
3794
# insert signatures and revisions
3795
for revision in pending_revisions:
3797
signature = self.source.get_signature_text(
3798
revision.revision_id)
3799
self.target.add_signature_text(revision.revision_id,
3801
except errors.NoSuchRevision:
3803
self.target.add_revision(revision.revision_id, revision)
3806
def _fetch_all_revisions(self, revision_ids, pb):
3807
"""Fetch everything for the list of revisions.
3809
:param revision_ids: The list of revisions to fetch. Must be in
3811
:param pb: A ProgressTask
3814
basis_id, basis_tree = self._get_basis(revision_ids[0])
3816
cache = lru_cache.LRUCache(100)
3817
cache[basis_id] = basis_tree
3818
del basis_tree # We don't want to hang on to it here
3822
for offset in range(0, len(revision_ids), batch_size):
3823
self.target.start_write_group()
3825
pb.update('Transferring revisions', offset,
3827
batch = revision_ids[offset:offset+batch_size]
3828
basis_id = self._fetch_batch(batch, basis_id, cache)
3830
self.source._safe_to_return_from_cache = False
3831
self.target.abort_write_group()
3834
hint = self.target.commit_write_group()
3837
if hints and self.target._format.pack_compresses:
3838
self.target.pack(hint=hints)
3839
pb.update('Transferring revisions', len(revision_ids),
3843
def fetch(self, revision_id=None, find_ghosts=False,
3845
"""See InterRepository.fetch()."""
3846
if fetch_spec is not None:
3847
revision_ids = fetch_spec.get_keys()
3850
ui.ui_factory.warn_experimental_format_fetch(self)
3851
if (not self.source.supports_rich_root()
3852
and self.target.supports_rich_root()):
3853
self._converting_to_rich_root = True
3854
self._revision_id_to_root_id = {}
3856
self._converting_to_rich_root = False
3857
# See <https://launchpad.net/bugs/456077> asking for a warning here
3858
if self.source._format.network_name() != self.target._format.network_name():
3859
ui.ui_factory.show_user_warning('cross_format_fetch',
3860
from_format=self.source._format,
3861
to_format=self.target._format)
3862
if revision_ids is None:
3864
search_revision_ids = [revision_id]
3866
search_revision_ids = None
3867
revision_ids = self.target.search_missing_revision_ids(self.source,
3868
revision_ids=search_revision_ids,
3869
find_ghosts=find_ghosts).get_keys()
3870
if not revision_ids:
3872
revision_ids = tsort.topo_sort(
3873
self.source.get_graph().get_parent_map(revision_ids))
3874
if not revision_ids:
3876
# Walk though all revisions; get inventory deltas, copy referenced
3877
# texts that delta references, insert the delta, revision and
3879
pb = ui.ui_factory.nested_progress_bar()
3881
self._fetch_all_revisions(revision_ids, pb)
3884
return len(revision_ids), 0
3886
def _get_basis(self, first_revision_id):
3887
"""Get a revision and tree which exists in the target.
3889
This assumes that first_revision_id is selected for transmission
3890
because all other ancestors are already present. If we can't find an
3891
ancestor we fall back to NULL_REVISION since we know that is safe.
3893
:return: (basis_id, basis_tree)
3895
first_rev = self.source.get_revision(first_revision_id)
3897
basis_id = first_rev.parent_ids[0]
3898
# only valid as a basis if the target has it
3899
self.target.get_revision(basis_id)
3900
# Try to get a basis tree - if it's a ghost it will hit the
3901
# NoSuchRevision case.
3902
basis_tree = self.source.revision_tree(basis_id)
3903
except (IndexError, errors.NoSuchRevision):
3904
basis_id = _mod_revision.NULL_REVISION
3905
basis_tree = self.source.revision_tree(basis_id)
3906
return basis_id, basis_tree
3909
InterRepository.register_optimiser(InterDifferingSerializer)
3910
InterRepository.register_optimiser(InterSameDataRepository)
3913
1712
class CopyConverter(object):
3914
1713
"""A repository conversion tool which just performs a copy of the content.
3936
1735
# trigger an assertion if not such
3937
1736
repo._format.get_format_string()
3938
1737
self.repo_dir = repo.bzrdir
3939
pb.update('Moving repository to repository.backup')
1738
pb.update(gettext('Moving repository to repository.backup'))
3940
1739
self.repo_dir.transport.move('repository', 'repository.backup')
3941
1740
backup_transport = self.repo_dir.transport.clone('repository.backup')
3942
1741
repo._format.check_conversion_target(self.target_format)
3943
1742
self.source_repo = repo._format.open(self.repo_dir,
3945
1744
_override_transport=backup_transport)
3946
pb.update('Creating new repository')
1745
pb.update(gettext('Creating new repository'))
3947
1746
converted = self.target_format.initialize(self.repo_dir,
3948
1747
self.source_repo.is_shared())
3949
1748
converted.lock_write()
3951
pb.update('Copying content')
1750
pb.update(gettext('Copying content'))
3952
1751
self.source_repo.copy_content_into(converted)
3954
1753
converted.unlock()
3955
pb.update('Deleting old repository content')
1754
pb.update(gettext('Deleting old repository content'))
3956
1755
self.repo_dir.transport.delete_tree('repository.backup')
3957
ui.ui_factory.note('repository converted')
1756
ui.ui_factory.note(gettext('repository converted'))
3961
class _VersionedFileChecker(object):
3963
def __init__(self, repository, text_key_references=None, ancestors=None):
3964
self.repository = repository
3965
self.text_index = self.repository._generate_text_key_index(
3966
text_key_references=text_key_references, ancestors=ancestors)
3968
def calculate_file_version_parents(self, text_key):
3969
"""Calculate the correct parents for a file version according to
3972
parent_keys = self.text_index[text_key]
3973
if parent_keys == [_mod_revision.NULL_REVISION]:
3975
return tuple(parent_keys)
3977
def check_file_version_parents(self, texts, progress_bar=None):
3978
"""Check the parents stored in a versioned file are correct.
3980
It also detects file versions that are not referenced by their
3981
corresponding revision's inventory.
3983
:returns: A tuple of (wrong_parents, dangling_file_versions).
3984
wrong_parents is a dict mapping {revision_id: (stored_parents,
3985
correct_parents)} for each revision_id where the stored parents
3986
are not correct. dangling_file_versions is a set of (file_id,
3987
revision_id) tuples for versions that are present in this versioned
3988
file, but not used by the corresponding inventory.
3990
local_progress = None
3991
if progress_bar is None:
3992
local_progress = ui.ui_factory.nested_progress_bar()
3993
progress_bar = local_progress
3995
return self._check_file_version_parents(texts, progress_bar)
3998
local_progress.finished()
4000
def _check_file_version_parents(self, texts, progress_bar):
4001
"""See check_file_version_parents."""
4003
self.file_ids = set([file_id for file_id, _ in
4004
self.text_index.iterkeys()])
4005
# text keys is now grouped by file_id
4006
n_versions = len(self.text_index)
4007
progress_bar.update('loading text store', 0, n_versions)
4008
parent_map = self.repository.texts.get_parent_map(self.text_index)
4009
# On unlistable transports this could well be empty/error...
4010
text_keys = self.repository.texts.keys()
4011
unused_keys = frozenset(text_keys) - set(self.text_index)
4012
for num, key in enumerate(self.text_index.iterkeys()):
4013
progress_bar.update('checking text graph', num, n_versions)
4014
correct_parents = self.calculate_file_version_parents(key)
4016
knit_parents = parent_map[key]
4017
except errors.RevisionNotPresent:
4020
if correct_parents != knit_parents:
4021
wrong_parents[key] = (knit_parents, correct_parents)
4022
return wrong_parents, unused_keys
4025
def _old_get_graph(repository, revision_id):
4026
"""DO NOT USE. That is all. I'm serious."""
4027
graph = repository.get_graph()
4028
revision_graph = dict(((key, value) for key, value in
4029
graph.iter_ancestry([revision_id]) if value is not None))
4030
return _strip_NULL_ghosts(revision_graph)
4033
1760
def _strip_NULL_ghosts(revision_graph):
4034
1761
"""Also don't use this. more compatibility code for unmigrated clients."""
4035
1762
# Filter ghosts, and null:
4041
1768
return revision_graph
4044
class StreamSink(object):
4045
"""An object that can insert a stream into a repository.
4047
This interface handles the complexity of reserialising inventories and
4048
revisions from different formats, and allows unidirectional insertion into
4049
stacked repositories without looking for the missing basis parents
4053
def __init__(self, target_repo):
4054
self.target_repo = target_repo
4056
def insert_stream(self, stream, src_format, resume_tokens):
4057
"""Insert a stream's content into the target repository.
4059
:param src_format: a bzr repository format.
4061
:return: a list of resume tokens and an iterable of keys additional
4062
items required before the insertion can be completed.
4064
self.target_repo.lock_write()
4067
self.target_repo.resume_write_group(resume_tokens)
4070
self.target_repo.start_write_group()
4073
# locked_insert_stream performs a commit|suspend.
4074
missing_keys = self.insert_stream_without_locking(stream,
4075
src_format, is_resume)
4077
# suspend the write group and tell the caller what we is
4078
# missing. We know we can suspend or else we would not have
4079
# entered this code path. (All repositories that can handle
4080
# missing keys can handle suspending a write group).
4081
write_group_tokens = self.target_repo.suspend_write_group()
4082
return write_group_tokens, missing_keys
4083
hint = self.target_repo.commit_write_group()
4084
to_serializer = self.target_repo._format._serializer
4085
src_serializer = src_format._serializer
4086
if (to_serializer != src_serializer and
4087
self.target_repo._format.pack_compresses):
4088
self.target_repo.pack(hint=hint)
4091
self.target_repo.abort_write_group(suppress_errors=True)
4094
self.target_repo.unlock()
4096
def insert_stream_without_locking(self, stream, src_format,
4098
"""Insert a stream's content into the target repository.
4100
This assumes that you already have a locked repository and an active
4103
:param src_format: a bzr repository format.
4104
:param is_resume: Passed down to get_missing_parent_inventories to
4105
indicate if we should be checking for missing texts at the same
4108
:return: A set of keys that are missing.
4110
if not self.target_repo.is_write_locked():
4111
raise errors.ObjectNotLocked(self)
4112
if not self.target_repo.is_in_write_group():
4113
raise errors.BzrError('you must already be in a write group')
4114
to_serializer = self.target_repo._format._serializer
4115
src_serializer = src_format._serializer
4117
if to_serializer == src_serializer:
4118
# If serializers match and the target is a pack repository, set the
4119
# write cache size on the new pack. This avoids poor performance
4120
# on transports where append is unbuffered (such as
4121
# RemoteTransport). This is safe to do because nothing should read
4122
# back from the target repository while a stream with matching
4123
# serialization is being inserted.
4124
# The exception is that a delta record from the source that should
4125
# be a fulltext may need to be expanded by the target (see
4126
# test_fetch_revisions_with_deltas_into_pack); but we take care to
4127
# explicitly flush any buffered writes first in that rare case.
4129
new_pack = self.target_repo._pack_collection._new_pack
4130
except AttributeError:
4131
# Not a pack repository
4134
new_pack.set_write_cache_size(1024*1024)
4135
for substream_type, substream in stream:
4136
if 'stream' in debug.debug_flags:
4137
mutter('inserting substream: %s', substream_type)
4138
if substream_type == 'texts':
4139
self.target_repo.texts.insert_record_stream(substream)
4140
elif substream_type == 'inventories':
4141
if src_serializer == to_serializer:
4142
self.target_repo.inventories.insert_record_stream(
4145
self._extract_and_insert_inventories(
4146
substream, src_serializer)
4147
elif substream_type == 'inventory-deltas':
4148
self._extract_and_insert_inventory_deltas(
4149
substream, src_serializer)
4150
elif substream_type == 'chk_bytes':
4151
# XXX: This doesn't support conversions, as it assumes the
4152
# conversion was done in the fetch code.
4153
self.target_repo.chk_bytes.insert_record_stream(substream)
4154
elif substream_type == 'revisions':
4155
# This may fallback to extract-and-insert more often than
4156
# required if the serializers are different only in terms of
4158
if src_serializer == to_serializer:
4159
self.target_repo.revisions.insert_record_stream(substream)
4161
self._extract_and_insert_revisions(substream,
4163
elif substream_type == 'signatures':
4164
self.target_repo.signatures.insert_record_stream(substream)
4166
raise AssertionError('kaboom! %s' % (substream_type,))
4167
# Done inserting data, and the missing_keys calculations will try to
4168
# read back from the inserted data, so flush the writes to the new pack
4169
# (if this is pack format).
4170
if new_pack is not None:
4171
new_pack._write_data('', flush=True)
4172
# Find all the new revisions (including ones from resume_tokens)
4173
missing_keys = self.target_repo.get_missing_parent_inventories(
4174
check_for_missing_texts=is_resume)
4176
for prefix, versioned_file in (
4177
('texts', self.target_repo.texts),
4178
('inventories', self.target_repo.inventories),
4179
('revisions', self.target_repo.revisions),
4180
('signatures', self.target_repo.signatures),
4181
('chk_bytes', self.target_repo.chk_bytes),
4183
if versioned_file is None:
4185
# TODO: key is often going to be a StaticTuple object
4186
# I don't believe we can define a method by which
4187
# (prefix,) + StaticTuple will work, though we could
4188
# define a StaticTuple.sq_concat that would allow you to
4189
# pass in either a tuple or a StaticTuple as the second
4190
# object, so instead we could have:
4191
# StaticTuple(prefix) + key here...
4192
missing_keys.update((prefix,) + key for key in
4193
versioned_file.get_missing_compression_parent_keys())
4194
except NotImplementedError:
4195
# cannot even attempt suspending, and missing would have failed
4196
# during stream insertion.
4197
missing_keys = set()
4200
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4201
target_rich_root = self.target_repo._format.rich_root_data
4202
target_tree_refs = self.target_repo._format.supports_tree_reference
4203
for record in substream:
4204
# Insert the delta directly
4205
inventory_delta_bytes = record.get_bytes_as('fulltext')
4206
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4208
parse_result = deserialiser.parse_text_bytes(
4209
inventory_delta_bytes)
4210
except inventory_delta.IncompatibleInventoryDelta, err:
4211
trace.mutter("Incompatible delta: %s", err.msg)
4212
raise errors.IncompatibleRevision(self.target_repo._format)
4213
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4214
revision_id = new_id
4215
parents = [key[0] for key in record.parents]
4216
self.target_repo.add_inventory_by_delta(
4217
basis_id, inv_delta, revision_id, parents)
4219
def _extract_and_insert_inventories(self, substream, serializer,
4221
"""Generate a new inventory versionedfile in target, converting data.
4223
The inventory is retrieved from the source, (deserializing it), and
4224
stored in the target (reserializing it in a different format).
4226
target_rich_root = self.target_repo._format.rich_root_data
4227
target_tree_refs = self.target_repo._format.supports_tree_reference
4228
for record in substream:
4229
# It's not a delta, so it must be a fulltext in the source
4230
# serializer's format.
4231
bytes = record.get_bytes_as('fulltext')
4232
revision_id = record.key[0]
4233
inv = serializer.read_inventory_from_string(bytes, revision_id)
4234
parents = [key[0] for key in record.parents]
4235
self.target_repo.add_inventory(revision_id, inv, parents)
4236
# No need to keep holding this full inv in memory when the rest of
4237
# the substream is likely to be all deltas.
4240
def _extract_and_insert_revisions(self, substream, serializer):
4241
for record in substream:
4242
bytes = record.get_bytes_as('fulltext')
4243
revision_id = record.key[0]
4244
rev = serializer.read_revision_from_string(bytes)
4245
if rev.revision_id != revision_id:
4246
raise AssertionError('wtf: %s != %s' % (rev, revision_id))
4247
self.target_repo.add_revision(revision_id, rev)
4250
if self.target_repo._format._fetch_reconcile:
4251
self.target_repo.reconcile()
4254
class StreamSource(object):
4255
"""A source of a stream for fetching between repositories."""
4257
def __init__(self, from_repository, to_format):
4258
"""Create a StreamSource streaming from from_repository."""
4259
self.from_repository = from_repository
4260
self.to_format = to_format
4261
self._record_counter = RecordCounter()
4263
def delta_on_metadata(self):
4264
"""Return True if delta's are permitted on metadata streams.
4266
That is on revisions and signatures.
4268
src_serializer = self.from_repository._format._serializer
4269
target_serializer = self.to_format._serializer
4270
return (self.to_format._fetch_uses_deltas and
4271
src_serializer == target_serializer)
4273
def _fetch_revision_texts(self, revs):
4274
# fetch signatures first and then the revision texts
4275
# may need to be a InterRevisionStore call here.
4276
from_sf = self.from_repository.signatures
4277
# A missing signature is just skipped.
4278
keys = [(rev_id,) for rev_id in revs]
4279
signatures = versionedfile.filter_absent(from_sf.get_record_stream(
4281
self.to_format._fetch_order,
4282
not self.to_format._fetch_uses_deltas))
4283
# If a revision has a delta, this is actually expanded inside the
4284
# insert_record_stream code now, which is an alternate fix for
4286
from_rf = self.from_repository.revisions
4287
revisions = from_rf.get_record_stream(
4289
self.to_format._fetch_order,
4290
not self.delta_on_metadata())
4291
return [('signatures', signatures), ('revisions', revisions)]
4293
def _generate_root_texts(self, revs):
4294
"""This will be called by get_stream between fetching weave texts and
4295
fetching the inventory weave.
4297
if self._rich_root_upgrade():
4298
return _mod_fetch.Inter1and2Helper(
4299
self.from_repository).generate_root_texts(revs)
4303
def get_stream(self, search):
4305
revs = search.get_keys()
4306
graph = self.from_repository.get_graph()
4307
revs = tsort.topo_sort(graph.get_parent_map(revs))
4308
data_to_fetch = self.from_repository.item_keys_introduced_by(revs)
4310
for knit_kind, file_id, revisions in data_to_fetch:
4311
if knit_kind != phase:
4313
# Make a new progress bar for this phase
4314
if knit_kind == "file":
4315
# Accumulate file texts
4316
text_keys.extend([(file_id, revision) for revision in
4318
elif knit_kind == "inventory":
4319
# Now copy the file texts.
4320
from_texts = self.from_repository.texts
4321
yield ('texts', from_texts.get_record_stream(
4322
text_keys, self.to_format._fetch_order,
4323
not self.to_format._fetch_uses_deltas))
4324
# Cause an error if a text occurs after we have done the
4327
# Before we process the inventory we generate the root
4328
# texts (if necessary) so that the inventories references
4330
for _ in self._generate_root_texts(revs):
4332
# we fetch only the referenced inventories because we do not
4333
# know for unselected inventories whether all their required
4334
# texts are present in the other repository - it could be
4336
for info in self._get_inventory_stream(revs):
4338
elif knit_kind == "signatures":
4339
# Nothing to do here; this will be taken care of when
4340
# _fetch_revision_texts happens.
4342
elif knit_kind == "revisions":
4343
for record in self._fetch_revision_texts(revs):
4346
raise AssertionError("Unknown knit kind %r" % knit_kind)
4348
def get_stream_for_missing_keys(self, missing_keys):
4349
# missing keys can only occur when we are byte copying and not
4350
# translating (because translation means we don't send
4351
# unreconstructable deltas ever).
4353
keys['texts'] = set()
4354
keys['revisions'] = set()
4355
keys['inventories'] = set()
4356
keys['chk_bytes'] = set()
4357
keys['signatures'] = set()
4358
for key in missing_keys:
4359
keys[key[0]].add(key[1:])
4360
if len(keys['revisions']):
4361
# If we allowed copying revisions at this point, we could end up
4362
# copying a revision without copying its required texts: a
4363
# violation of the requirements for repository integrity.
4364
raise AssertionError(
4365
'cannot copy revisions to fill in missing deltas %s' % (
4366
keys['revisions'],))
4367
for substream_kind, keys in keys.iteritems():
4368
vf = getattr(self.from_repository, substream_kind)
4369
if vf is None and keys:
4370
raise AssertionError(
4371
"cannot fill in keys for a versioned file we don't"
4372
" have: %s needs %s" % (substream_kind, keys))
4374
# No need to stream something we don't have
4376
if substream_kind == 'inventories':
4377
# Some missing keys are genuinely ghosts, filter those out.
4378
present = self.from_repository.inventories.get_parent_map(keys)
4379
revs = [key[0] for key in present]
4380
# Get the inventory stream more-or-less as we do for the
4381
# original stream; there's no reason to assume that records
4382
# direct from the source will be suitable for the sink. (Think
4383
# e.g. 2a -> 1.9-rich-root).
4384
for info in self._get_inventory_stream(revs, missing=True):
4388
# Ask for full texts always so that we don't need more round trips
4389
# after this stream.
4390
# Some of the missing keys are genuinely ghosts, so filter absent
4391
# records. The Sink is responsible for doing another check to
4392
# ensure that ghosts don't introduce missing data for future
4394
stream = versionedfile.filter_absent(vf.get_record_stream(keys,
4395
self.to_format._fetch_order, True))
4396
yield substream_kind, stream
4398
def inventory_fetch_order(self):
4399
if self._rich_root_upgrade():
4400
return 'topological'
4402
return self.to_format._fetch_order
4404
def _rich_root_upgrade(self):
4405
return (not self.from_repository._format.rich_root_data and
4406
self.to_format.rich_root_data)
4408
def _get_inventory_stream(self, revision_ids, missing=False):
4409
from_format = self.from_repository._format
4410
if (from_format.supports_chks and self.to_format.supports_chks and
4411
from_format.network_name() == self.to_format.network_name()):
4412
raise AssertionError(
4413
"this case should be handled by GroupCHKStreamSource")
4414
elif 'forceinvdeltas' in debug.debug_flags:
4415
return self._get_convertable_inventory_stream(revision_ids,
4416
delta_versus_null=missing)
4417
elif from_format.network_name() == self.to_format.network_name():
4419
return self._get_simple_inventory_stream(revision_ids,
4421
elif (not from_format.supports_chks and not self.to_format.supports_chks
4422
and from_format._serializer == self.to_format._serializer):
4423
# Essentially the same format.
4424
return self._get_simple_inventory_stream(revision_ids,
4427
# Any time we switch serializations, we want to use an
4428
# inventory-delta based approach.
4429
return self._get_convertable_inventory_stream(revision_ids,
4430
delta_versus_null=missing)
4432
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4433
# NB: This currently reopens the inventory weave in source;
4434
# using a single stream interface instead would avoid this.
4435
from_weave = self.from_repository.inventories
4437
delta_closure = True
4439
delta_closure = not self.delta_on_metadata()
4440
yield ('inventories', from_weave.get_record_stream(
4441
[(rev_id,) for rev_id in revision_ids],
4442
self.inventory_fetch_order(), delta_closure))
4444
def _get_convertable_inventory_stream(self, revision_ids,
4445
delta_versus_null=False):
4446
# The two formats are sufficiently different that there is no fast
4447
# path, so we need to send just inventorydeltas, which any
4448
# sufficiently modern client can insert into any repository.
4449
# The StreamSink code expects to be able to
4450
# convert on the target, so we need to put bytes-on-the-wire that can
4451
# be converted. That means inventory deltas (if the remote is <1.19,
4452
# RemoteStreamSink will fallback to VFS to insert the deltas).
4453
yield ('inventory-deltas',
4454
self._stream_invs_as_deltas(revision_ids,
4455
delta_versus_null=delta_versus_null))
4457
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4458
"""Return a stream of inventory-deltas for the given rev ids.
4460
:param revision_ids: The list of inventories to transmit
4461
:param delta_versus_null: Don't try to find a minimal delta for this
4462
entry, instead compute the delta versus the NULL_REVISION. This
4463
effectively streams a complete inventory. Used for stuff like
4464
filling in missing parents, etc.
4466
from_repo = self.from_repository
4467
revision_keys = [(rev_id,) for rev_id in revision_ids]
4468
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4469
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4471
inventories = self.from_repository.iter_inventories(
4472
revision_ids, 'topological')
4473
format = from_repo._format
4474
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4475
inventory_cache = lru_cache.LRUCache(50)
4476
null_inventory = from_repo.revision_tree(
4477
_mod_revision.NULL_REVISION).inventory
4478
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4479
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4480
# repo back into a non-rich-root repo ought to be allowed)
4481
serializer = inventory_delta.InventoryDeltaSerializer(
4482
versioned_root=format.rich_root_data,
4483
tree_references=format.supports_tree_reference)
4484
for inv in inventories:
4485
key = (inv.revision_id,)
4486
parent_keys = parent_map.get(key, ())
4488
if not delta_versus_null and parent_keys:
4489
# The caller did not ask for complete inventories and we have
4490
# some parents that we can delta against. Make a delta against
4491
# each parent so that we can find the smallest.
4492
parent_ids = [parent_key[0] for parent_key in parent_keys]
4493
for parent_id in parent_ids:
4494
if parent_id not in invs_sent_so_far:
4495
# We don't know that the remote side has this basis, so
4498
if parent_id == _mod_revision.NULL_REVISION:
4499
parent_inv = null_inventory
4501
parent_inv = inventory_cache.get(parent_id, None)
4502
if parent_inv is None:
4503
parent_inv = from_repo.get_inventory(parent_id)
4504
candidate_delta = inv._make_delta(parent_inv)
4505
if (delta is None or
4506
len(delta) > len(candidate_delta)):
4507
delta = candidate_delta
4508
basis_id = parent_id
4510
# Either none of the parents ended up being suitable, or we
4511
# were asked to delta against NULL
4512
basis_id = _mod_revision.NULL_REVISION
4513
delta = inv._make_delta(null_inventory)
4514
invs_sent_so_far.add(inv.revision_id)
4515
inventory_cache[inv.revision_id] = inv
4516
delta_serialized = ''.join(
4517
serializer.delta_to_lines(basis_id, key[-1], delta))
4518
yield versionedfile.FulltextContentFactory(
4519
key, parent_keys, None, delta_serialized)
4522
1771
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4523
1772
stop_revision=None):
4524
1773
"""Extend the partial history to include a given index
added
removed
bzrlib/repository.py
