342
208
commit to be valid, deletes against the basis MUST be recorded via
343
209
builder.record_delete().
345
self._recording_deletes = True
347
basis_id = self.parents[0]
349
basis_id = _mod_revision.NULL_REVISION
350
self.basis_delta_revision = basis_id
352
def record_entry_contents(self, ie, parent_invs, path, tree,
354
"""Record the content of ie from tree into the commit if needed.
356
Side effect: sets ie.revision when unchanged
358
:param ie: An inventory entry present in the commit.
359
:param parent_invs: The inventories of the parent revisions of the
361
:param path: The path the entry is at in the tree.
362
:param tree: The tree which contains this entry and should be used to
364
:param content_summary: Summary data from the tree about the paths
365
content - stat, length, exec, sha/link target. This is only
366
accessed when the entry has a revision of None - that is when it is
367
a candidate to commit.
368
:return: A tuple (change_delta, version_recorded, fs_hash).
369
change_delta is an inventory_delta change for this entry against
370
the basis tree of the commit, or None if no change occured against
372
version_recorded is True if a new version of the entry has been
373
recorded. For instance, committing a merge where a file was only
374
changed on the other side will return (delta, False).
375
fs_hash is either None, or the hash details for the path (currently
376
a tuple of the contents sha1 and the statvalue returned by
377
tree.get_file_with_stat()).
379
if self.new_inventory.root is None:
380
if ie.parent_id is not None:
381
raise errors.RootMissing()
382
self._check_root(ie, parent_invs, tree)
383
if ie.revision is None:
384
kind = content_summary[0]
386
# ie is carried over from a prior commit
388
# XXX: repository specific check for nested tree support goes here - if
389
# the repo doesn't want nested trees we skip it ?
390
if (kind == 'tree-reference' and
391
not self.repository._format.supports_tree_reference):
392
# mismatch between commit builder logic and repository:
393
# this needs the entry creation pushed down into the builder.
394
raise NotImplementedError('Missing repository subtree support.')
395
self.new_inventory.add(ie)
397
# TODO: slow, take it out of the inner loop.
399
basis_inv = parent_invs[0]
401
basis_inv = Inventory(root_id=None)
403
# ie.revision is always None if the InventoryEntry is considered
404
# for committing. We may record the previous parents revision if the
405
# content is actually unchanged against a sole head.
406
if ie.revision is not None:
407
if not self._versioned_root and path == '':
408
# repositories that do not version the root set the root's
409
# revision to the new commit even when no change occurs (more
410
# specifically, they do not record a revision on the root; and
411
# the rev id is assigned to the root during deserialisation -
412
# this masks when a change may have occurred against the basis.
413
# To match this we always issue a delta, because the revision
414
# of the root will always be changing.
415
if ie.file_id in basis_inv:
416
delta = (basis_inv.id2path(ie.file_id), path,
420
delta = (None, path, ie.file_id, ie)
421
self._basis_delta.append(delta)
422
return delta, False, None
424
# we don't need to commit this, because the caller already
425
# determined that an existing revision of this file is
426
# appropriate. If its not being considered for committing then
427
# it and all its parents to the root must be unaltered so
428
# no-change against the basis.
429
if ie.revision == self._new_revision_id:
430
raise AssertionError("Impossible situation, a skipped "
431
"inventory entry (%r) claims to be modified in this "
432
"commit (%r).", (ie, self._new_revision_id))
433
return None, False, None
434
# XXX: Friction: parent_candidates should return a list not a dict
435
# so that we don't have to walk the inventories again.
436
parent_candiate_entries = ie.parent_candidates(parent_invs)
437
head_set = self._heads(ie.file_id, parent_candiate_entries.keys())
439
for inv in parent_invs:
440
if ie.file_id in inv:
441
old_rev = inv[ie.file_id].revision
442
if old_rev in head_set:
443
heads.append(inv[ie.file_id].revision)
444
head_set.remove(inv[ie.file_id].revision)
447
# now we check to see if we need to write a new record to the
449
# We write a new entry unless there is one head to the ancestors, and
450
# the kind-derived content is unchanged.
452
# Cheapest check first: no ancestors, or more the one head in the
453
# ancestors, we write a new node.
457
# There is a single head, look it up for comparison
458
parent_entry = parent_candiate_entries[heads[0]]
459
# if the non-content specific data has changed, we'll be writing a
461
if (parent_entry.parent_id != ie.parent_id or
462
parent_entry.name != ie.name):
464
# now we need to do content specific checks:
466
# if the kind changed the content obviously has
467
if kind != parent_entry.kind:
469
# Stat cache fingerprint feedback for the caller - None as we usually
470
# don't generate one.
473
if content_summary[2] is None:
474
raise ValueError("Files must not have executable = None")
476
# We can't trust a check of the file length because of content
478
if (# if the exec bit has changed we have to store:
479
parent_entry.executable != content_summary[2]):
481
elif parent_entry.text_sha1 == content_summary[3]:
482
# all meta and content is unchanged (using a hash cache
483
# hit to check the sha)
484
ie.revision = parent_entry.revision
485
ie.text_size = parent_entry.text_size
486
ie.text_sha1 = parent_entry.text_sha1
487
ie.executable = parent_entry.executable
488
return self._get_delta(ie, basis_inv, path), False, None
490
# Either there is only a hash change(no hash cache entry,
491
# or same size content change), or there is no change on
493
# Provide the parent's hash to the store layer, so that the
494
# content is unchanged we will not store a new node.
495
nostore_sha = parent_entry.text_sha1
497
# We want to record a new node regardless of the presence or
498
# absence of a content change in the file.
500
ie.executable = content_summary[2]
501
file_obj, stat_value = tree.get_file_with_stat(ie.file_id, path)
503
text = file_obj.read()
507
ie.text_sha1, ie.text_size = self._add_text_to_weave(
508
ie.file_id, text, heads, nostore_sha)
509
# Let the caller know we generated a stat fingerprint.
510
fingerprint = (ie.text_sha1, stat_value)
511
except errors.ExistingContent:
512
# Turns out that the file content was unchanged, and we were
513
# only going to store a new node if it was changed. Carry over
515
ie.revision = parent_entry.revision
516
ie.text_size = parent_entry.text_size
517
ie.text_sha1 = parent_entry.text_sha1
518
ie.executable = parent_entry.executable
519
return self._get_delta(ie, basis_inv, path), False, None
520
elif kind == 'directory':
522
# all data is meta here, nothing specific to directory, so
524
ie.revision = parent_entry.revision
525
return self._get_delta(ie, basis_inv, path), False, None
526
self._add_text_to_weave(ie.file_id, '', heads, None)
527
elif kind == 'symlink':
528
current_link_target = content_summary[3]
530
# symlink target is not generic metadata, check if it has
532
if current_link_target != parent_entry.symlink_target:
535
# unchanged, carry over.
536
ie.revision = parent_entry.revision
537
ie.symlink_target = parent_entry.symlink_target
538
return self._get_delta(ie, basis_inv, path), False, None
539
ie.symlink_target = current_link_target
540
self._add_text_to_weave(ie.file_id, '', heads, None)
541
elif kind == 'tree-reference':
543
if content_summary[3] != parent_entry.reference_revision:
546
# unchanged, carry over.
547
ie.reference_revision = parent_entry.reference_revision
548
ie.revision = parent_entry.revision
549
return self._get_delta(ie, basis_inv, path), False, None
550
ie.reference_revision = content_summary[3]
551
if ie.reference_revision is None:
552
raise AssertionError("invalid content_summary for nested tree: %r"
553
% (content_summary,))
554
self._add_text_to_weave(ie.file_id, '', heads, None)
556
raise NotImplementedError('unknown kind')
557
ie.revision = self._new_revision_id
558
self._any_changes = True
559
return self._get_delta(ie, basis_inv, path), True, fingerprint
561
def record_iter_changes(self, tree, basis_revision_id, iter_changes,
562
_entry_factory=entry_factory):
211
raise NotImplementedError(self.will_record_deletes)
213
def record_iter_changes(self, tree, basis_revision_id, iter_changes):
563
214
"""Record a new tree via iter_changes.
565
216
:param tree: The tree to obtain text contents from for changed objects.
570
221
to basis_revision_id. The iterator must not include any items with
571
222
a current kind of None - missing items must be either filtered out
572
223
or errored-on beefore record_iter_changes sees the item.
573
:param _entry_factory: Private method to bind entry_factory locally for
575
224
:return: A generator of (file_id, relpath, fs_hash) tuples for use with
576
225
tree._observed_sha1.
578
# Create an inventory delta based on deltas between all the parents and
579
# deltas between all the parent inventories. We use inventory delta's
580
# between the inventory objects because iter_changes masks
581
# last-changed-field only changes.
583
# file_id -> change map, change is fileid, paths, changed, versioneds,
584
# parents, names, kinds, executables
586
# {file_id -> revision_id -> inventory entry, for entries in parent
587
# trees that are not parents[0]
591
revtrees = list(self.repository.revision_trees(self.parents))
592
except errors.NoSuchRevision:
593
# one or more ghosts, slow path.
595
for revision_id in self.parents:
597
revtrees.append(self.repository.revision_tree(revision_id))
598
except errors.NoSuchRevision:
600
basis_revision_id = _mod_revision.NULL_REVISION
602
revtrees.append(self.repository.revision_tree(
603
_mod_revision.NULL_REVISION))
604
# The basis inventory from a repository
606
basis_inv = revtrees[0].inventory
608
basis_inv = self.repository.revision_tree(
609
_mod_revision.NULL_REVISION).inventory
610
if len(self.parents) > 0:
611
if basis_revision_id != self.parents[0] and not ghost_basis:
613
"arbitrary basis parents not yet supported with merges")
614
for revtree in revtrees[1:]:
615
for change in revtree.inventory._make_delta(basis_inv):
616
if change[1] is None:
617
# Not present in this parent.
619
if change[2] not in merged_ids:
620
if change[0] is not None:
621
basis_entry = basis_inv[change[2]]
622
merged_ids[change[2]] = [
624
basis_entry.revision,
627
parent_entries[change[2]] = {
629
basis_entry.revision:basis_entry,
631
change[3].revision:change[3],
634
merged_ids[change[2]] = [change[3].revision]
635
parent_entries[change[2]] = {change[3].revision:change[3]}
637
merged_ids[change[2]].append(change[3].revision)
638
parent_entries[change[2]][change[3].revision] = change[3]
641
# Setup the changes from the tree:
642
# changes maps file_id -> (change, [parent revision_ids])
644
for change in iter_changes:
645
# This probably looks up in basis_inv way to much.
646
if change[1][0] is not None:
647
head_candidate = [basis_inv[change[0]].revision]
650
changes[change[0]] = change, merged_ids.get(change[0],
652
unchanged_merged = set(merged_ids) - set(changes)
653
# Extend the changes dict with synthetic changes to record merges of
655
for file_id in unchanged_merged:
656
# Record a merged version of these items that did not change vs the
657
# basis. This can be either identical parallel changes, or a revert
658
# of a specific file after a merge. The recorded content will be
659
# that of the current tree (which is the same as the basis), but
660
# the per-file graph will reflect a merge.
661
# NB:XXX: We are reconstructing path information we had, this
662
# should be preserved instead.
663
# inv delta change: (file_id, (path_in_source, path_in_target),
664
# changed_content, versioned, parent, name, kind,
667
basis_entry = basis_inv[file_id]
668
except errors.NoSuchId:
669
# a change from basis->some_parents but file_id isn't in basis
670
# so was new in the merge, which means it must have changed
671
# from basis -> current, and as it hasn't the add was reverted
672
# by the user. So we discard this change.
676
(basis_inv.id2path(file_id), tree.id2path(file_id)),
678
(basis_entry.parent_id, basis_entry.parent_id),
679
(basis_entry.name, basis_entry.name),
680
(basis_entry.kind, basis_entry.kind),
681
(basis_entry.executable, basis_entry.executable))
682
changes[file_id] = (change, merged_ids[file_id])
683
# changes contains tuples with the change and a set of inventory
684
# candidates for the file.
686
# old_path, new_path, file_id, new_inventory_entry
687
seen_root = False # Is the root in the basis delta?
688
inv_delta = self._basis_delta
689
modified_rev = self._new_revision_id
690
for change, head_candidates in changes.values():
691
if change[3][1]: # versioned in target.
692
# Several things may be happening here:
693
# We may have a fork in the per-file graph
694
# - record a change with the content from tree
695
# We may have a change against < all trees
696
# - carry over the tree that hasn't changed
697
# We may have a change against all trees
698
# - record the change with the content from tree
701
entry = _entry_factory[kind](file_id, change[5][1],
703
head_set = self._heads(change[0], set(head_candidates))
706
for head_candidate in head_candidates:
707
if head_candidate in head_set:
708
heads.append(head_candidate)
709
head_set.remove(head_candidate)
712
# Could be a carry-over situation:
713
parent_entry_revs = parent_entries.get(file_id, None)
714
if parent_entry_revs:
715
parent_entry = parent_entry_revs.get(heads[0], None)
718
if parent_entry is None:
719
# The parent iter_changes was called against is the one
720
# that is the per-file head, so any change is relevant
721
# iter_changes is valid.
722
carry_over_possible = False
724
# could be a carry over situation
725
# A change against the basis may just indicate a merge,
726
# we need to check the content against the source of the
727
# merge to determine if it was changed after the merge
729
if (parent_entry.kind != entry.kind or
730
parent_entry.parent_id != entry.parent_id or
731
parent_entry.name != entry.name):
732
# Metadata common to all entries has changed
733
# against per-file parent
734
carry_over_possible = False
736
carry_over_possible = True
737
# per-type checks for changes against the parent_entry
740
# Cannot be a carry-over situation
741
carry_over_possible = False
742
# Populate the entry in the delta
744
# XXX: There is still a small race here: If someone reverts the content of a file
745
# after iter_changes examines and decides it has changed,
746
# we will unconditionally record a new version even if some
747
# other process reverts it while commit is running (with
748
# the revert happening after iter_changes did it's
751
entry.executable = True
753
entry.executable = False
754
if (carry_over_possible and
755
parent_entry.executable == entry.executable):
756
# Check the file length, content hash after reading
758
nostore_sha = parent_entry.text_sha1
761
file_obj, stat_value = tree.get_file_with_stat(file_id, change[1][1])
763
text = file_obj.read()
767
entry.text_sha1, entry.text_size = self._add_text_to_weave(
768
file_id, text, heads, nostore_sha)
769
yield file_id, change[1][1], (entry.text_sha1, stat_value)
770
except errors.ExistingContent:
771
# No content change against a carry_over parent
772
# Perhaps this should also yield a fs hash update?
774
entry.text_size = parent_entry.text_size
775
entry.text_sha1 = parent_entry.text_sha1
776
elif kind == 'symlink':
778
entry.symlink_target = tree.get_symlink_target(file_id)
779
if (carry_over_possible and
780
parent_entry.symlink_target == entry.symlink_target):
783
self._add_text_to_weave(change[0], '', heads, None)
784
elif kind == 'directory':
785
if carry_over_possible:
788
# Nothing to set on the entry.
789
# XXX: split into the Root and nonRoot versions.
790
if change[1][1] != '' or self.repository.supports_rich_root():
791
self._add_text_to_weave(change[0], '', heads, None)
792
elif kind == 'tree-reference':
793
if not self.repository._format.supports_tree_reference:
794
# This isn't quite sane as an error, but we shouldn't
795
# ever see this code path in practice: tree's don't
796
# permit references when the repo doesn't support tree
798
raise errors.UnsupportedOperation(tree.add_reference,
800
reference_revision = tree.get_reference_revision(change[0])
801
entry.reference_revision = reference_revision
802
if (carry_over_possible and
803
parent_entry.reference_revision == reference_revision):
806
self._add_text_to_weave(change[0], '', heads, None)
808
raise AssertionError('unknown kind %r' % kind)
810
entry.revision = modified_rev
812
entry.revision = parent_entry.revision
815
new_path = change[1][1]
816
inv_delta.append((change[1][0], new_path, change[0], entry))
819
self.new_inventory = None
821
# This should perhaps be guarded by a check that the basis we
822
# commit against is the basis for the commit and if not do a delta
824
self._any_changes = True
826
# housekeeping root entry changes do not affect no-change commits.
827
self._require_root_change(tree)
828
self.basis_delta_revision = basis_revision_id
830
def _add_text_to_weave(self, file_id, new_text, parents, nostore_sha):
831
parent_keys = tuple([(file_id, parent) for parent in parents])
832
return self.repository.texts._add_text(
833
(file_id, self._new_revision_id), parent_keys, new_text,
834
nostore_sha=nostore_sha, random_id=self.random_revid)[0:2]
837
class RootCommitBuilder(CommitBuilder):
838
"""This commitbuilder actually records the root id"""
840
# the root entry gets versioned properly by this builder.
841
_versioned_root = True
843
def _check_root(self, ie, parent_invs, tree):
844
"""Helper for record_entry_contents.
846
:param ie: An entry being added.
847
:param parent_invs: The inventories of the parent revisions of the
849
:param tree: The tree that is being committed.
852
def _require_root_change(self, tree):
853
"""Enforce an appropriate root object change.
855
This is called once when record_iter_changes is called, if and only if
856
the root was not in the delta calculated by record_iter_changes.
858
:param tree: The tree which is being committed.
860
# versioned roots do not change unless the tree found a change.
227
raise NotImplementedError(self.record_iter_changes)
230
class RepositoryWriteLockResult(LogicalLockResult):
231
"""The result of write locking a repository.
233
:ivar repository_token: The token obtained from the underlying lock, or
235
:ivar unlock: A callable which will unlock the lock.
238
def __init__(self, unlock, repository_token):
239
LogicalLockResult.__init__(self, unlock)
240
self.repository_token = repository_token
243
return "RepositoryWriteLockResult(%s, %s)" % (self.repository_token,
863
247
######################################################################
867
class Repository(_RelockDebugMixin):
251
class Repository(_RelockDebugMixin, controldir.ControlComponent):
868
252
"""Repository holding history for one or more branches.
870
254
The repository holds and retrieves historical information including
871
255
revisions and file history. It's normally accessed only by the Branch,
872
256
which views a particular line of development through that history.
874
The Repository builds on top of some byte storage facilies (the revisions,
875
signatures, inventories, texts and chk_bytes attributes) and a Transport,
876
which respectively provide byte storage and a means to access the (possibly
879
The byte storage facilities are addressed via tuples, which we refer to
880
as 'keys' throughout the code base. Revision_keys, inventory_keys and
881
signature_keys are all 1-tuples: (revision_id,). text_keys are two-tuples:
882
(file_id, revision_id). chk_bytes uses CHK keys - a 1-tuple with a single
883
byte string made up of a hash identifier and a hash value.
884
We use this interface because it allows low friction with the underlying
885
code that implements disk indices, network encoding and other parts of
888
:ivar revisions: A bzrlib.versionedfile.VersionedFiles instance containing
889
the serialised revisions for the repository. This can be used to obtain
890
revision graph information or to access raw serialised revisions.
891
The result of trying to insert data into the repository via this store
892
is undefined: it should be considered read-only except for implementors
894
:ivar signatures: A bzrlib.versionedfile.VersionedFiles instance containing
895
the serialised signatures for the repository. This can be used to
896
obtain access to raw serialised signatures. The result of trying to
897
insert data into the repository via this store is undefined: it should
898
be considered read-only except for implementors of repositories.
899
:ivar inventories: A bzrlib.versionedfile.VersionedFiles instance containing
900
the serialised inventories for the repository. This can be used to
901
obtain unserialised inventories. The result of trying to insert data
902
into the repository via this store is undefined: it should be
903
considered read-only except for implementors of repositories.
904
:ivar texts: A bzrlib.versionedfile.VersionedFiles instance containing the
905
texts of files and directories for the repository. This can be used to
906
obtain file texts or file graphs. Note that Repository.iter_file_bytes
907
is usually a better interface for accessing file texts.
908
The result of trying to insert data into the repository via this store
909
is undefined: it should be considered read-only except for implementors
911
:ivar chk_bytes: A bzrlib.versionedfile.VersionedFiles instance containing
912
any data the repository chooses to store or have indexed by its hash.
913
The result of trying to insert data into the repository via this store
914
is undefined: it should be considered read-only except for implementors
916
:ivar _transport: Transport for file access to repository, typically
917
pointing to .bzr/repository.
258
See VersionedFileRepository in bzrlib.vf_repository for the
259
base class for most Bazaar repositories.
920
# What class to use for a CommitBuilder. Often its simpler to change this
921
# in a Repository class subclass rather than to override
922
# get_commit_builder.
923
_commit_builder_class = CommitBuilder
924
# The search regex used by xml based repositories to determine what things
925
# where changed in a single commit.
926
_file_ids_altered_regex = lazy_regex.lazy_compile(
927
r'file_id="(?P<file_id>[^"]+)"'
928
r'.* revision="(?P<revision_id>[^"]+)"'
931
262
def abort_write_group(self, suppress_errors=False):
932
263
"""Commit the contents accrued within the current write group.
1001
319
return InterRepository._assert_same_model(self, repository)
1003
def add_inventory(self, revision_id, inv, parents):
1004
"""Add the inventory inv to the repository as revision_id.
1006
:param parents: The revision ids of the parents that revision_id
1007
is known to have and are in the repository already.
1009
:returns: The validator(which is a sha1 digest, though what is sha'd is
1010
repository format specific) of the serialized inventory.
1012
if not self.is_in_write_group():
1013
raise AssertionError("%r not in write group" % (self,))
1014
_mod_revision.check_not_reserved_id(revision_id)
1015
if not (inv.revision_id is None or inv.revision_id == revision_id):
1016
raise AssertionError(
1017
"Mismatch between inventory revision"
1018
" id and insertion revid (%r, %r)"
1019
% (inv.revision_id, revision_id))
1020
if inv.root is None:
1021
raise AssertionError()
1022
return self._add_inventory_checked(revision_id, inv, parents)
1024
def _add_inventory_checked(self, revision_id, inv, parents):
1025
"""Add inv to the repository after checking the inputs.
1027
This function can be overridden to allow different inventory styles.
1029
:seealso: add_inventory, for the contract.
1031
inv_lines = self._serializer.write_inventory_to_lines(inv)
1032
return self._inventory_add_lines(revision_id, parents,
1033
inv_lines, check_content=False)
1035
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1036
parents, basis_inv=None, propagate_caches=False):
1037
"""Add a new inventory expressed as a delta against another revision.
1039
See the inventory developers documentation for the theory behind
1042
:param basis_revision_id: The inventory id the delta was created
1043
against. (This does not have to be a direct parent.)
1044
:param delta: The inventory delta (see Inventory.apply_delta for
1046
:param new_revision_id: The revision id that the inventory is being
1048
:param parents: The revision ids of the parents that revision_id is
1049
known to have and are in the repository already. These are supplied
1050
for repositories that depend on the inventory graph for revision
1051
graph access, as well as for those that pun ancestry with delta
1053
:param basis_inv: The basis inventory if it is already known,
1055
:param propagate_caches: If True, the caches for this inventory are
1056
copied to and updated for the result if possible.
1058
:returns: (validator, new_inv)
1059
The validator(which is a sha1 digest, though what is sha'd is
1060
repository format specific) of the serialized inventory, and the
1061
resulting inventory.
1063
if not self.is_in_write_group():
1064
raise AssertionError("%r not in write group" % (self,))
1065
_mod_revision.check_not_reserved_id(new_revision_id)
1066
basis_tree = self.revision_tree(basis_revision_id)
1067
basis_tree.lock_read()
1069
# Note that this mutates the inventory of basis_tree, which not all
1070
# inventory implementations may support: A better idiom would be to
1071
# return a new inventory, but as there is no revision tree cache in
1072
# repository this is safe for now - RBC 20081013
1073
if basis_inv is None:
1074
basis_inv = basis_tree.inventory
1075
basis_inv.apply_delta(delta)
1076
basis_inv.revision_id = new_revision_id
1077
return (self.add_inventory(new_revision_id, basis_inv, parents),
1082
def _inventory_add_lines(self, revision_id, parents, lines,
1083
check_content=True):
1084
"""Store lines in inv_vf and return the sha1 of the inventory."""
1085
parents = [(parent,) for parent in parents]
1086
result = self.inventories.add_lines((revision_id,), parents, lines,
1087
check_content=check_content)[0]
1088
self.inventories._access.flush()
1091
def add_revision(self, revision_id, rev, inv=None, config=None):
1092
"""Add rev to the revision store as revision_id.
1094
:param revision_id: the revision id to use.
1095
:param rev: The revision object.
1096
:param inv: The inventory for the revision. if None, it will be looked
1097
up in the inventory storer
1098
:param config: If None no digital signature will be created.
1099
If supplied its signature_needed method will be used
1100
to determine if a signature should be made.
1102
# TODO: jam 20070210 Shouldn't we check rev.revision_id and
1104
_mod_revision.check_not_reserved_id(revision_id)
1105
if config is not None and config.signature_needed():
1107
inv = self.get_inventory(revision_id)
1108
plaintext = Testament(rev, inv).as_short_text()
1109
self.store_revision_signature(
1110
gpg.GPGStrategy(config), plaintext, revision_id)
1111
# check inventory present
1112
if not self.inventories.get_parent_map([(revision_id,)]):
1114
raise errors.WeaveRevisionNotPresent(revision_id,
1117
# yes, this is not suitable for adding with ghosts.
1118
rev.inventory_sha1 = self.add_inventory(revision_id, inv,
1121
key = (revision_id,)
1122
rev.inventory_sha1 = self.inventories.get_sha1s([key])[key]
1123
self._add_revision(rev)
1125
def _add_revision(self, revision):
1126
text = self._serializer.write_revision_to_string(revision)
1127
key = (revision.revision_id,)
1128
parents = tuple((parent,) for parent in revision.parent_ids)
1129
self.revisions.add_lines(key, parents, osutils.split_lines(text))
1131
321
def all_revision_ids(self):
1132
322
"""Returns a list of all the revision ids in the repository.
1157
347
self.control_files.break_lock()
1160
def _eliminate_revisions_not_present(self, revision_ids):
1161
"""Check every revision id in revision_ids to see if we have it.
1163
Returns a set of the present revisions.
1166
graph = self.get_graph()
1167
parent_map = graph.get_parent_map(revision_ids)
1168
# The old API returned a list, should this actually be a set?
1169
return parent_map.keys()
1171
def _check_inventories(self, checker):
1172
"""Check the inventories found from the revision scan.
1174
This is responsible for verifying the sha1 of inventories and
1175
creating a pending_keys set that covers data referenced by inventories.
1177
bar = ui.ui_factory.nested_progress_bar()
1179
self._do_check_inventories(checker, bar)
1183
def _do_check_inventories(self, checker, bar):
1184
"""Helper for _check_inventories."""
1186
keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1187
kinds = ['chk_bytes', 'texts']
1188
count = len(checker.pending_keys)
1189
bar.update("inventories", 0, 2)
1190
current_keys = checker.pending_keys
1191
checker.pending_keys = {}
1192
# Accumulate current checks.
1193
for key in current_keys:
1194
if key[0] != 'inventories' and key[0] not in kinds:
1195
checker._report_items.append('unknown key type %r' % (key,))
1196
keys[key[0]].add(key[1:])
1197
if keys['inventories']:
1198
# NB: output order *should* be roughly sorted - topo or
1199
# inverse topo depending on repository - either way decent
1200
# to just delta against. However, pre-CHK formats didn't
1201
# try to optimise inventory layout on disk. As such the
1202
# pre-CHK code path does not use inventory deltas.
1204
for record in self.inventories.check(keys=keys['inventories']):
1205
if record.storage_kind == 'absent':
1206
checker._report_items.append(
1207
'Missing inventory {%s}' % (record.key,))
1209
last_object = self._check_record('inventories', record,
1210
checker, last_object,
1211
current_keys[('inventories',) + record.key])
1212
del keys['inventories']
1215
bar.update("texts", 1)
1216
while (checker.pending_keys or keys['chk_bytes']
1218
# Something to check.
1219
current_keys = checker.pending_keys
1220
checker.pending_keys = {}
1221
# Accumulate current checks.
1222
for key in current_keys:
1223
if key[0] not in kinds:
1224
checker._report_items.append('unknown key type %r' % (key,))
1225
keys[key[0]].add(key[1:])
1226
# Check the outermost kind only - inventories || chk_bytes || texts
1230
for record in getattr(self, kind).check(keys=keys[kind]):
1231
if record.storage_kind == 'absent':
1232
checker._report_items.append(
1233
'Missing %s {%s}' % (kind, record.key,))
1235
last_object = self._check_record(kind, record,
1236
checker, last_object, current_keys[(kind,) + record.key])
1240
def _check_record(self, kind, record, checker, last_object, item_data):
1241
"""Check a single text from this repository."""
1242
if kind == 'inventories':
1243
rev_id = record.key[0]
1244
inv = self._deserialise_inventory(rev_id,
1245
record.get_bytes_as('fulltext'))
1246
if last_object is not None:
1247
delta = inv._make_delta(last_object)
1248
for old_path, path, file_id, ie in delta:
1251
ie.check(checker, rev_id, inv)
1253
for path, ie in inv.iter_entries():
1254
ie.check(checker, rev_id, inv)
1255
if self._format.fast_deltas:
1257
elif kind == 'chk_bytes':
1258
# No code written to check chk_bytes for this repo format.
1259
checker._report_items.append(
1260
'unsupported key type chk_bytes for %s' % (record.key,))
1261
elif kind == 'texts':
1262
self._check_text(record, checker, item_data)
1264
checker._report_items.append(
1265
'unknown key type %s for %s' % (kind, record.key))
1267
def _check_text(self, record, checker, item_data):
1268
"""Check a single text."""
1269
# Check it is extractable.
1270
# TODO: check length.
1271
if record.storage_kind == 'chunked':
1272
chunks = record.get_bytes_as(record.storage_kind)
1273
sha1 = osutils.sha_strings(chunks)
1274
length = sum(map(len, chunks))
1276
content = record.get_bytes_as('fulltext')
1277
sha1 = osutils.sha_string(content)
1278
length = len(content)
1279
if item_data and sha1 != item_data[1]:
1280
checker._report_items.append(
1281
'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1282
(record.key, sha1, item_data[1], item_data[2]))
1285
def create(a_bzrdir):
1286
"""Construct the current default format repository in a_bzrdir."""
1287
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)
1289
def __init__(self, _format, a_bzrdir, control_files):
354
def __init__(self, _format, controldir, control_files):
1290
355
"""instantiate a Repository.
1292
357
:param _format: The format of the repository on disk.
1293
:param a_bzrdir: The BzrDir of the repository.
1295
In the future we will have a single api for all stores for
1296
getting file texts, inventories and revisions, then
1297
this construct will accept instances of those things.
358
:param controldir: The ControlDir of the repository.
359
:param control_files: Control files to use for locking, etc.
361
# In the future we will have a single api for all stores for
362
# getting file texts, inventories and revisions, then
363
# this construct will accept instances of those things.
1299
364
super(Repository, self).__init__()
1300
365
self._format = _format
1301
366
# the following are part of the public API for Repository:
1302
self.bzrdir = a_bzrdir
367
self.bzrdir = controldir
1303
368
self.control_files = control_files
1304
self._transport = control_files._transport
1305
self.base = self._transport.base
1307
self._reconcile_does_inventory_gc = True
1308
self._reconcile_fixes_text_parents = False
1309
self._reconcile_backsup_inventory = True
1310
370
self._write_group = None
1311
371
# Additional places to query for data.
1312
372
self._fallback_repositories = []
1313
# An InventoryEntry cache, used during deserialization
1314
self._inventory_entry_cache = fifo_cache.FIFOCache(10*1024)
1315
# Is it safe to return inventory entries directly from the entry cache,
1316
# rather copying them?
1317
self._safe_to_return_from_cache = False
375
def user_transport(self):
376
return self.bzrdir.user_transport
379
def control_transport(self):
380
return self._transport
1319
382
def __repr__(self):
1320
383
if self._fallback_repositories:
1955
909
signature = gpg_strategy.sign(plaintext)
1956
910
self.add_signature_text(revision_id, signature)
1959
912
def add_signature_text(self, revision_id, signature):
1960
self.signatures.add_lines((revision_id,), (),
1961
osutils.split_lines(signature))
1963
def find_text_key_references(self):
1964
"""Find the text key references within the repository.
1966
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1967
to whether they were referred to by the inventory of the
1968
revision_id that they contain. The inventory texts from all present
1969
revision ids are assessed to generate this report.
1971
revision_keys = self.revisions.keys()
1972
w = self.inventories
1973
pb = ui.ui_factory.nested_progress_bar()
1975
return self._find_text_key_references_from_xml_inventory_lines(
1976
w.iter_lines_added_or_present_in_keys(revision_keys, pb=pb))
1980
def _find_text_key_references_from_xml_inventory_lines(self,
1982
"""Core routine for extracting references to texts from inventories.
1984
This performs the translation of xml lines to revision ids.
1986
:param line_iterator: An iterator of lines, origin_version_id
1987
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1988
to whether they were referred to by the inventory of the
1989
revision_id that they contain. Note that if that revision_id was
1990
not part of the line_iterator's output then False will be given -
1991
even though it may actually refer to that key.
1993
if not self._serializer.support_altered_by_hack:
1994
raise AssertionError(
1995
"_find_text_key_references_from_xml_inventory_lines only "
1996
"supported for branches which store inventory as unnested xml"
1997
", not on %r" % self)
2000
# this code needs to read every new line in every inventory for the
2001
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
2002
# not present in one of those inventories is unnecessary but not
2003
# harmful because we are filtering by the revision id marker in the
2004
# inventory lines : we only select file ids altered in one of those
2005
# revisions. We don't need to see all lines in the inventory because
2006
# only those added in an inventory in rev X can contain a revision=X
2008
unescape_revid_cache = {}
2009
unescape_fileid_cache = {}
2011
# jam 20061218 In a big fetch, this handles hundreds of thousands
2012
# of lines, so it has had a lot of inlining and optimizing done.
2013
# Sorry that it is a little bit messy.
2014
# Move several functions to be local variables, since this is a long
2016
search = self._file_ids_altered_regex.search
2017
unescape = _unescape_xml
2018
setdefault = result.setdefault
2019
for line, line_key in line_iterator:
2020
match = search(line)
2023
# One call to match.group() returning multiple items is quite a
2024
# bit faster than 2 calls to match.group() each returning 1
2025
file_id, revision_id = match.group('file_id', 'revision_id')
2027
# Inlining the cache lookups helps a lot when you make 170,000
2028
# lines and 350k ids, versus 8.4 unique ids.
2029
# Using a cache helps in 2 ways:
2030
# 1) Avoids unnecessary decoding calls
2031
# 2) Re-uses cached strings, which helps in future set and
2033
# (2) is enough that removing encoding entirely along with
2034
# the cache (so we are using plain strings) results in no
2035
# performance improvement.
2037
revision_id = unescape_revid_cache[revision_id]
2039
unescaped = unescape(revision_id)
2040
unescape_revid_cache[revision_id] = unescaped
2041
revision_id = unescaped
2043
# Note that unconditionally unescaping means that we deserialise
2044
# every fileid, which for general 'pull' is not great, but we don't
2045
# really want to have some many fulltexts that this matters anyway.
2048
file_id = unescape_fileid_cache[file_id]
2050
unescaped = unescape(file_id)
2051
unescape_fileid_cache[file_id] = unescaped
2054
key = (file_id, revision_id)
2055
setdefault(key, False)
2056
if revision_id == line_key[-1]:
2060
def _inventory_xml_lines_for_keys(self, keys):
2061
"""Get a line iterator of the sort needed for findind references.
2063
Not relevant for non-xml inventory repositories.
2065
Ghosts in revision_keys are ignored.
2067
:param revision_keys: The revision keys for the inventories to inspect.
2068
:return: An iterator over (inventory line, revid) for the fulltexts of
2069
all of the xml inventories specified by revision_keys.
2071
stream = self.inventories.get_record_stream(keys, 'unordered', True)
2072
for record in stream:
2073
if record.storage_kind != 'absent':
2074
chunks = record.get_bytes_as('chunked')
2075
revid = record.key[-1]
2076
lines = osutils.chunks_to_lines(chunks)
2080
def _find_file_ids_from_xml_inventory_lines(self, line_iterator,
2082
"""Helper routine for fileids_altered_by_revision_ids.
2084
This performs the translation of xml lines to revision ids.
2086
:param line_iterator: An iterator of lines, origin_version_id
2087
:param revision_keys: The revision ids to filter for. This should be a
2088
set or other type which supports efficient __contains__ lookups, as
2089
the revision key from each parsed line will be looked up in the
2090
revision_keys filter.
2091
:return: a dictionary mapping altered file-ids to an iterable of
2092
revision_ids. Each altered file-ids has the exact revision_ids that
2093
altered it listed explicitly.
2095
seen = set(self._find_text_key_references_from_xml_inventory_lines(
2096
line_iterator).iterkeys())
2097
parent_keys = self._find_parent_keys_of_revisions(revision_keys)
2098
parent_seen = set(self._find_text_key_references_from_xml_inventory_lines(
2099
self._inventory_xml_lines_for_keys(parent_keys)))
2100
new_keys = seen - parent_seen
2102
setdefault = result.setdefault
2103
for key in new_keys:
2104
setdefault(key[0], set()).add(key[-1])
913
"""Store a signature text for a revision.
915
:param revision_id: Revision id of the revision
916
:param signature: Signature text.
918
raise NotImplementedError(self.add_signature_text)
2107
920
def _find_parent_ids_of_revisions(self, revision_ids):
2108
921
"""Find all parent ids that are mentioned in the revision graph.
2159
941
uniquely identify the file version in the caller's context. (Examples:
2160
942
an index number or a TreeTransform trans_id.)
2162
bytes_iterator is an iterable of bytestrings for the file. The
2163
kind of iterable and length of the bytestrings are unspecified, but for
2164
this implementation, it is a list of bytes produced by
2165
VersionedFile.get_record_stream().
2167
944
:param desired_files: a list of (file_id, revision_id, identifier)
2171
for file_id, revision_id, callable_data in desired_files:
2172
text_keys[(file_id, revision_id)] = callable_data
2173
for record in self.texts.get_record_stream(text_keys, 'unordered', True):
2174
if record.storage_kind == 'absent':
2175
raise errors.RevisionNotPresent(record.key, self)
2176
yield text_keys[record.key], record.get_bytes_as('chunked')
2178
def _generate_text_key_index(self, text_key_references=None,
2180
"""Generate a new text key index for the repository.
2182
This is an expensive function that will take considerable time to run.
2184
:return: A dict mapping text keys ((file_id, revision_id) tuples) to a
2185
list of parents, also text keys. When a given key has no parents,
2186
the parents list will be [NULL_REVISION].
2188
# All revisions, to find inventory parents.
2189
if ancestors is None:
2190
graph = self.get_graph()
2191
ancestors = graph.get_parent_map(self.all_revision_ids())
2192
if text_key_references is None:
2193
text_key_references = self.find_text_key_references()
2194
pb = ui.ui_factory.nested_progress_bar()
2196
return self._do_generate_text_key_index(ancestors,
2197
text_key_references, pb)
2201
def _do_generate_text_key_index(self, ancestors, text_key_references, pb):
2202
"""Helper for _generate_text_key_index to avoid deep nesting."""
2203
revision_order = tsort.topo_sort(ancestors)
2204
invalid_keys = set()
2206
for revision_id in revision_order:
2207
revision_keys[revision_id] = set()
2208
text_count = len(text_key_references)
2209
# a cache of the text keys to allow reuse; costs a dict of all the
2210
# keys, but saves a 2-tuple for every child of a given key.
2212
for text_key, valid in text_key_references.iteritems():
2214
invalid_keys.add(text_key)
2216
revision_keys[text_key[1]].add(text_key)
2217
text_key_cache[text_key] = text_key
2218
del text_key_references
2220
text_graph = graph.Graph(graph.DictParentsProvider(text_index))
2221
NULL_REVISION = _mod_revision.NULL_REVISION
2222
# Set a cache with a size of 10 - this suffices for bzr.dev but may be
2223
# too small for large or very branchy trees. However, for 55K path
2224
# trees, it would be easy to use too much memory trivially. Ideally we
2225
# could gauge this by looking at available real memory etc, but this is
2226
# always a tricky proposition.
2227
inventory_cache = lru_cache.LRUCache(10)
2228
batch_size = 10 # should be ~150MB on a 55K path tree
2229
batch_count = len(revision_order) / batch_size + 1
2231
pb.update("Calculating text parents", processed_texts, text_count)
2232
for offset in xrange(batch_count):
2233
to_query = revision_order[offset * batch_size:(offset + 1) *
2237
for revision_id in to_query:
2238
parent_ids = ancestors[revision_id]
2239
for text_key in revision_keys[revision_id]:
2240
pb.update("Calculating text parents", processed_texts)
2241
processed_texts += 1
2242
candidate_parents = []
2243
for parent_id in parent_ids:
2244
parent_text_key = (text_key[0], parent_id)
2246
check_parent = parent_text_key not in \
2247
revision_keys[parent_id]
2249
# the parent parent_id is a ghost:
2250
check_parent = False
2251
# truncate the derived graph against this ghost.
2252
parent_text_key = None
2254
# look at the parent commit details inventories to
2255
# determine possible candidates in the per file graph.
2258
inv = inventory_cache[parent_id]
2260
inv = self.revision_tree(parent_id).inventory
2261
inventory_cache[parent_id] = inv
2263
parent_entry = inv[text_key[0]]
2264
except (KeyError, errors.NoSuchId):
2266
if parent_entry is not None:
2268
text_key[0], parent_entry.revision)
2270
parent_text_key = None
2271
if parent_text_key is not None:
2272
candidate_parents.append(
2273
text_key_cache[parent_text_key])
2274
parent_heads = text_graph.heads(candidate_parents)
2275
new_parents = list(parent_heads)
2276
new_parents.sort(key=lambda x:candidate_parents.index(x))
2277
if new_parents == []:
2278
new_parents = [NULL_REVISION]
2279
text_index[text_key] = new_parents
2281
for text_key in invalid_keys:
2282
text_index[text_key] = [NULL_REVISION]
2285
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
2286
"""Get an iterable listing the keys of all the data introduced by a set
2289
The keys will be ordered so that the corresponding items can be safely
2290
fetched and inserted in that order.
2292
:returns: An iterable producing tuples of (knit-kind, file-id,
2293
versions). knit-kind is one of 'file', 'inventory', 'signatures',
2294
'revisions'. file-id is None unless knit-kind is 'file'.
2296
for result in self._find_file_keys_to_fetch(revision_ids, _files_pb):
2299
for result in self._find_non_file_keys_to_fetch(revision_ids):
2302
def _find_file_keys_to_fetch(self, revision_ids, pb):
2303
# XXX: it's a bit weird to control the inventory weave caching in this
2304
# generator. Ideally the caching would be done in fetch.py I think. Or
2305
# maybe this generator should explicitly have the contract that it
2306
# should not be iterated until the previously yielded item has been
2308
inv_w = self.inventories
2310
# file ids that changed
2311
file_ids = self.fileids_altered_by_revision_ids(revision_ids, inv_w)
2313
num_file_ids = len(file_ids)
2314
for file_id, altered_versions in file_ids.iteritems():
2316
pb.update("Fetch texts", count, num_file_ids)
2318
yield ("file", file_id, altered_versions)
2320
def _find_non_file_keys_to_fetch(self, revision_ids):
2322
yield ("inventory", None, revision_ids)
2325
# XXX: Note ATM no callers actually pay attention to this return
2326
# instead they just use the list of revision ids and ignore
2327
# missing sigs. Consider removing this work entirely
2328
revisions_with_signatures = set(self.signatures.get_parent_map(
2329
[(r,) for r in revision_ids]))
2330
revisions_with_signatures = set(
2331
[r for (r,) in revisions_with_signatures])
2332
revisions_with_signatures.intersection_update(revision_ids)
2333
yield ("signatures", None, revisions_with_signatures)
2336
yield ("revisions", None, revision_ids)
2339
def get_inventory(self, revision_id):
2340
"""Get Inventory object by revision id."""
2341
return self.iter_inventories([revision_id]).next()
2343
def iter_inventories(self, revision_ids, ordering=None):
2344
"""Get many inventories by revision_ids.
2346
This will buffer some or all of the texts used in constructing the
2347
inventories in memory, but will only parse a single inventory at a
2350
:param revision_ids: The expected revision ids of the inventories.
2351
:param ordering: optional ordering, e.g. 'topological'. If not
2352
specified, the order of revision_ids will be preserved (by
2353
buffering if necessary).
2354
:return: An iterator of inventories.
2356
if ((None in revision_ids)
2357
or (_mod_revision.NULL_REVISION in revision_ids)):
2358
raise ValueError('cannot get null revision inventory')
2359
return self._iter_inventories(revision_ids, ordering)
2361
def _iter_inventories(self, revision_ids, ordering):
2362
"""single-document based inventory iteration."""
2363
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2364
for text, revision_id in inv_xmls:
2365
yield self._deserialise_inventory(revision_id, text)
2367
def _iter_inventory_xmls(self, revision_ids, ordering):
2368
if ordering is None:
2369
order_as_requested = True
2370
ordering = 'unordered'
2372
order_as_requested = False
2373
keys = [(revision_id,) for revision_id in revision_ids]
2376
if order_as_requested:
2377
key_iter = iter(keys)
2378
next_key = key_iter.next()
2379
stream = self.inventories.get_record_stream(keys, ordering, True)
2381
for record in stream:
2382
if record.storage_kind != 'absent':
2383
chunks = record.get_bytes_as('chunked')
2384
if order_as_requested:
2385
text_chunks[record.key] = chunks
2387
yield ''.join(chunks), record.key[-1]
2389
raise errors.NoSuchRevision(self, record.key)
2390
if order_as_requested:
2391
# Yield as many results as we can while preserving order.
2392
while next_key in text_chunks:
2393
chunks = text_chunks.pop(next_key)
2394
yield ''.join(chunks), next_key[-1]
2396
next_key = key_iter.next()
2397
except StopIteration:
2398
# We still want to fully consume the get_record_stream,
2399
# just in case it is not actually finished at this point
2403
def _deserialise_inventory(self, revision_id, xml):
2404
"""Transform the xml into an inventory object.
2406
:param revision_id: The expected revision id of the inventory.
2407
:param xml: A serialised inventory.
2409
result = self._serializer.read_inventory_from_string(xml, revision_id,
2410
entry_cache=self._inventory_entry_cache,
2411
return_from_cache=self._safe_to_return_from_cache)
2412
if result.revision_id != revision_id:
2413
raise AssertionError('revision id mismatch %s != %s' % (
2414
result.revision_id, revision_id))
2417
def get_serializer_format(self):
2418
return self._serializer.format_num
2421
def _get_inventory_xml(self, revision_id):
2422
"""Get serialized inventory as a string."""
2423
texts = self._iter_inventory_xmls([revision_id], 'unordered')
2425
text, revision_id = texts.next()
2426
except StopIteration:
2427
raise errors.HistoryMissing(self, 'inventory', revision_id)
947
raise NotImplementedError(self.iter_files_bytes)
2430
949
def get_rev_id_for_revno(self, revno, known_pair):
2431
950
"""Return the revision id of a revno, given a later (revno, revid)
2772
1221
except UnicodeDecodeError:
2773
1222
raise errors.NonAsciiRevisionId(method, self)
2775
def revision_graph_can_have_wrong_parents(self):
2776
"""Is it possible for this repository to have a revision graph with
2779
If True, then this repository must also implement
2780
_find_inconsistent_revision_parents so that check and reconcile can
2781
check for inconsistencies before proceeding with other checks that may
2782
depend on the revision index being consistent.
2784
raise NotImplementedError(self.revision_graph_can_have_wrong_parents)
2787
# remove these delegates a while after bzr 0.15
2788
def __make_delegated(name, from_module):
2789
def _deprecated_repository_forwarder():
2790
symbol_versioning.warn('%s moved to %s in bzr 0.15'
2791
% (name, from_module),
2794
m = __import__(from_module, globals(), locals(), [name])
2796
return getattr(m, name)
2797
except AttributeError:
2798
raise AttributeError('module %s has no name %s'
2800
globals()[name] = _deprecated_repository_forwarder
2803
'AllInOneRepository',
2804
'WeaveMetaDirRepository',
2805
'PreSplitOutRepositoryFormat',
2806
'RepositoryFormat4',
2807
'RepositoryFormat5',
2808
'RepositoryFormat6',
2809
'RepositoryFormat7',
2811
__make_delegated(_name, 'bzrlib.repofmt.weaverepo')
2815
'RepositoryFormatKnit',
2816
'RepositoryFormatKnit1',
2818
__make_delegated(_name, 'bzrlib.repofmt.knitrepo')
2821
def install_revision(repository, rev, revision_tree):
2822
"""Install all revision data into a repository."""
2823
install_revisions(repository, [(rev, revision_tree, None)])
2826
def install_revisions(repository, iterable, num_revisions=None, pb=None):
2827
"""Install all revision data into a repository.
2829
Accepts an iterable of revision, tree, signature tuples. The signature
2832
repository.start_write_group()
2834
inventory_cache = lru_cache.LRUCache(10)
2835
for n, (revision, revision_tree, signature) in enumerate(iterable):
2836
_install_revision(repository, revision, revision_tree, signature,
2839
pb.update('Transferring revisions', n + 1, num_revisions)
2841
repository.abort_write_group()
2844
repository.commit_write_group()
2847
def _install_revision(repository, rev, revision_tree, signature,
2849
"""Install all revision data into a repository."""
2850
present_parents = []
2852
for p_id in rev.parent_ids:
2853
if repository.has_revision(p_id):
2854
present_parents.append(p_id)
2855
parent_trees[p_id] = repository.revision_tree(p_id)
2857
parent_trees[p_id] = repository.revision_tree(
2858
_mod_revision.NULL_REVISION)
2860
inv = revision_tree.inventory
2861
entries = inv.iter_entries()
2862
# backwards compatibility hack: skip the root id.
2863
if not repository.supports_rich_root():
2864
path, root = entries.next()
2865
if root.revision != rev.revision_id:
2866
raise errors.IncompatibleRevision(repr(repository))
2868
for path, ie in entries:
2869
text_keys[(ie.file_id, ie.revision)] = ie
2870
text_parent_map = repository.texts.get_parent_map(text_keys)
2871
missing_texts = set(text_keys) - set(text_parent_map)
2872
# Add the texts that are not already present
2873
for text_key in missing_texts:
2874
ie = text_keys[text_key]
2876
# FIXME: TODO: The following loop overlaps/duplicates that done by
2877
# commit to determine parents. There is a latent/real bug here where
2878
# the parents inserted are not those commit would do - in particular
2879
# they are not filtered by heads(). RBC, AB
2880
for revision, tree in parent_trees.iteritems():
2881
if ie.file_id not in tree:
2883
parent_id = tree.inventory[ie.file_id].revision
2884
if parent_id in text_parents:
2886
text_parents.append((ie.file_id, parent_id))
2887
lines = revision_tree.get_file(ie.file_id).readlines()
2888
repository.texts.add_lines(text_key, text_parents, lines)
2890
# install the inventory
2891
if repository._format._commit_inv_deltas and len(rev.parent_ids):
2892
# Cache this inventory
2893
inventory_cache[rev.revision_id] = inv
2895
basis_inv = inventory_cache[rev.parent_ids[0]]
2897
repository.add_inventory(rev.revision_id, inv, present_parents)
2899
delta = inv._make_delta(basis_inv)
2900
repository.add_inventory_by_delta(rev.parent_ids[0], delta,
2901
rev.revision_id, present_parents)
2903
repository.add_inventory(rev.revision_id, inv, present_parents)
2904
except errors.RevisionAlreadyPresent:
2906
if signature is not None:
2907
repository.add_signature_text(rev.revision_id, signature)
2908
repository.add_revision(rev.revision_id, rev, inv)
2911
1225
class MetaDirRepository(Repository):
2912
1226
"""Repositories in the new meta-dir layout.
3268
1558
# NOTE: These are experimental in 0.92. Stable in 1.0 and above
3269
1559
format_registry.register_lazy(
3270
1560
'Bazaar pack repository format 1 (needs bzr 0.92)\n',
3271
'bzrlib.repofmt.pack_repo',
1561
'bzrlib.repofmt.knitpack_repo',
3272
1562
'RepositoryFormatKnitPack1',
3274
1564
format_registry.register_lazy(
3275
1565
'Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n',
3276
'bzrlib.repofmt.pack_repo',
1566
'bzrlib.repofmt.knitpack_repo',
3277
1567
'RepositoryFormatKnitPack3',
3279
1569
format_registry.register_lazy(
3280
1570
'Bazaar pack repository format 1 with rich root (needs bzr 1.0)\n',
3281
'bzrlib.repofmt.pack_repo',
1571
'bzrlib.repofmt.knitpack_repo',
3282
1572
'RepositoryFormatKnitPack4',
3284
1574
format_registry.register_lazy(
3285
1575
'Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n',
3286
'bzrlib.repofmt.pack_repo',
1576
'bzrlib.repofmt.knitpack_repo',
3287
1577
'RepositoryFormatKnitPack5',
3289
1579
format_registry.register_lazy(
3290
1580
'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n',
3291
'bzrlib.repofmt.pack_repo',
1581
'bzrlib.repofmt.knitpack_repo',
3292
1582
'RepositoryFormatKnitPack5RichRoot',
3294
1584
format_registry.register_lazy(
3295
1585
'Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n',
3296
'bzrlib.repofmt.pack_repo',
1586
'bzrlib.repofmt.knitpack_repo',
3297
1587
'RepositoryFormatKnitPack5RichRootBroken',
3299
1589
format_registry.register_lazy(
3300
1590
'Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n',
3301
'bzrlib.repofmt.pack_repo',
1591
'bzrlib.repofmt.knitpack_repo',
3302
1592
'RepositoryFormatKnitPack6',
3304
1594
format_registry.register_lazy(
3305
1595
'Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n',
3306
'bzrlib.repofmt.pack_repo',
1596
'bzrlib.repofmt.knitpack_repo',
3307
1597
'RepositoryFormatKnitPack6RichRoot',
1599
format_registry.register_lazy(
1600
'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
1601
'bzrlib.repofmt.groupcompress_repo',
1602
'RepositoryFormat2a',
3310
1605
# Development formats.
3311
# Obsolete but kept pending a CHK based subtree format.
1606
# Check their docstrings to see if/when they are obsolete.
3312
1607
format_registry.register_lazy(
3313
1608
("Bazaar development format 2 with subtree support "
3314
1609
"(needs bzr.dev from before 1.8)\n"),
3315
'bzrlib.repofmt.pack_repo',
1610
'bzrlib.repofmt.knitpack_repo',
3316
1611
'RepositoryFormatPackDevelopment2Subtree',
3319
# 1.14->1.16 go below here
3320
format_registry.register_lazy(
3321
'Bazaar development format - group compression and chk inventory'
3322
' (needs bzr.dev from 1.14)\n',
3323
'bzrlib.repofmt.groupcompress_repo',
3324
'RepositoryFormatCHK1',
3327
format_registry.register_lazy(
3328
'Bazaar development format - chk repository with bencode revision '
3329
'serialization (needs bzr.dev from 1.16)\n',
3330
'bzrlib.repofmt.groupcompress_repo',
3331
'RepositoryFormatCHK2',
3333
format_registry.register_lazy(
3334
'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
3335
'bzrlib.repofmt.groupcompress_repo',
3336
'RepositoryFormat2a',
1613
format_registry.register_lazy(
1614
'Bazaar development format 8\n',
1615
'bzrlib.repofmt.groupcompress_repo',
1616
'RepositoryFormat2aSubtree',
3370
1649
self.target.fetch(self.source, revision_id=revision_id)
3372
1651
@needs_write_lock
3373
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
1652
def fetch(self, revision_id=None, find_ghosts=False):
3375
1653
"""Fetch the content required to construct revision_id.
3377
1655
The content is copied from self.source to self.target.
3379
1657
:param revision_id: if None all content is copied, if NULL_REVISION no
3380
1658
content is copied.
3384
ui.ui_factory.warn_experimental_format_fetch(self)
3385
from bzrlib.fetch import RepoFetcher
3386
# See <https://launchpad.net/bugs/456077> asking for a warning here
3387
if self.source._format.network_name() != self.target._format.network_name():
3388
ui.ui_factory.show_user_warning('cross_format_fetch',
3389
from_format=self.source._format,
3390
to_format=self.target._format)
3391
f = RepoFetcher(to_repository=self.target,
3392
from_repository=self.source,
3393
last_revision=revision_id,
3394
fetch_spec=fetch_spec,
3395
find_ghosts=find_ghosts)
3397
def _walk_to_common_revisions(self, revision_ids):
3398
"""Walk out from revision_ids in source to revisions target has.
3400
:param revision_ids: The start point for the search.
3401
:return: A set of revision ids.
3403
target_graph = self.target.get_graph()
3404
revision_ids = frozenset(revision_ids)
3405
missing_revs = set()
3406
source_graph = self.source.get_graph()
3407
# ensure we don't pay silly lookup costs.
3408
searcher = source_graph._make_breadth_first_searcher(revision_ids)
3409
null_set = frozenset([_mod_revision.NULL_REVISION])
3410
searcher_exhausted = False
3414
# Iterate the searcher until we have enough next_revs
3415
while len(next_revs) < self._walk_to_common_revisions_batch_size:
3417
next_revs_part, ghosts_part = searcher.next_with_ghosts()
3418
next_revs.update(next_revs_part)
3419
ghosts.update(ghosts_part)
3420
except StopIteration:
3421
searcher_exhausted = True
3423
# If there are ghosts in the source graph, and the caller asked for
3424
# them, make sure that they are present in the target.
3425
# We don't care about other ghosts as we can't fetch them and
3426
# haven't been asked to.
3427
ghosts_to_check = set(revision_ids.intersection(ghosts))
3428
revs_to_get = set(next_revs).union(ghosts_to_check)
3430
have_revs = set(target_graph.get_parent_map(revs_to_get))
3431
# we always have NULL_REVISION present.
3432
have_revs = have_revs.union(null_set)
3433
# Check if the target is missing any ghosts we need.
3434
ghosts_to_check.difference_update(have_revs)
3436
# One of the caller's revision_ids is a ghost in both the
3437
# source and the target.
3438
raise errors.NoSuchRevision(
3439
self.source, ghosts_to_check.pop())
3440
missing_revs.update(next_revs - have_revs)
3441
# Because we may have walked past the original stop point, make
3442
# sure everything is stopped
3443
stop_revs = searcher.find_seen_ancestors(have_revs)
3444
searcher.stop_searching_any(stop_revs)
3445
if searcher_exhausted:
3447
return searcher.get_result()
1661
raise NotImplementedError(self.fetch)
3449
1663
@needs_read_lock
3450
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
1664
def search_missing_revision_ids(self,
1665
revision_id=symbol_versioning.DEPRECATED_PARAMETER,
1666
find_ghosts=True, revision_ids=None, if_present_ids=None,
3451
1668
"""Return the revision ids that source has that target does not.
3453
1670
:param revision_id: only return revision ids included by this
1672
:param revision_ids: return revision ids included by these
1673
revision_ids. NoSuchRevision will be raised if any of these
1674
revisions are not present.
1675
:param if_present_ids: like revision_ids, but will not cause
1676
NoSuchRevision if any of these are absent, instead they will simply
1677
not be in the result. This is useful for e.g. finding revisions
1678
to fetch for tags, which may reference absent revisions.
3455
1679
:param find_ghosts: If True find missing revisions in deep history
3456
1680
rather than just finding the surface difference.
1681
:param limit: Maximum number of revisions to return, topologically
3457
1683
:return: A bzrlib.graph.SearchResult.
3459
# stop searching at found target revisions.
3460
if not find_ghosts and revision_id is not None:
3461
return self._walk_to_common_revisions([revision_id])
3462
# generic, possibly worst case, slow code path.
3463
target_ids = set(self.target.all_revision_ids())
3464
if revision_id is not None:
3465
source_ids = self.source.get_ancestry(revision_id)
3466
if source_ids[0] is not None:
3467
raise AssertionError()
3470
source_ids = self.source.all_revision_ids()
3471
result_set = set(source_ids).difference(target_ids)
3472
return self.source.revision_ids_to_search_result(result_set)
1685
raise NotImplementedError(self.search_missing_revision_ids)
3475
1688
def _same_model(source, target):
3496
1709
"different serializers")
3499
class InterSameDataRepository(InterRepository):
3500
"""Code for converting between repositories that represent the same data.
3502
Data format and model must match for this to work.
3506
def _get_repo_format_to_test(self):
3507
"""Repository format for testing with.
3509
InterSameData can pull from subtree to subtree and from non-subtree to
3510
non-subtree, so we test this with the richest repository format.
3512
from bzrlib.repofmt import knitrepo
3513
return knitrepo.RepositoryFormatKnit3()
3516
def is_compatible(source, target):
3517
return InterRepository._same_model(source, target)
3520
class InterWeaveRepo(InterSameDataRepository):
3521
"""Optimised code paths between Weave based repositories.
3523
This should be in bzrlib/repofmt/weaverepo.py but we have not yet
3524
implemented lazy inter-object optimisation.
3528
def _get_repo_format_to_test(self):
3529
from bzrlib.repofmt import weaverepo
3530
return weaverepo.RepositoryFormat7()
3533
def is_compatible(source, target):
3534
"""Be compatible with known Weave formats.
3536
We don't test for the stores being of specific types because that
3537
could lead to confusing results, and there is no need to be
3540
from bzrlib.repofmt.weaverepo import (
3546
return (isinstance(source._format, (RepositoryFormat5,
3548
RepositoryFormat7)) and
3549
isinstance(target._format, (RepositoryFormat5,
3551
RepositoryFormat7)))
3552
except AttributeError:
3556
def copy_content(self, revision_id=None):
3557
"""See InterRepository.copy_content()."""
3558
# weave specific optimised path:
3560
self.target.set_make_working_trees(self.source.make_working_trees())
3561
except (errors.RepositoryUpgradeRequired, NotImplemented):
3563
# FIXME do not peek!
3564
if self.source._transport.listable():
3565
pb = ui.ui_factory.nested_progress_bar()
3567
self.target.texts.insert_record_stream(
3568
self.source.texts.get_record_stream(
3569
self.source.texts.keys(), 'topological', False))
3570
pb.update('Copying inventory', 0, 1)
3571
self.target.inventories.insert_record_stream(
3572
self.source.inventories.get_record_stream(
3573
self.source.inventories.keys(), 'topological', False))
3574
self.target.signatures.insert_record_stream(
3575
self.source.signatures.get_record_stream(
3576
self.source.signatures.keys(),
3578
self.target.revisions.insert_record_stream(
3579
self.source.revisions.get_record_stream(
3580
self.source.revisions.keys(),
3581
'topological', True))
3585
self.target.fetch(self.source, revision_id=revision_id)
3588
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
3589
"""See InterRepository.missing_revision_ids()."""
3590
# we want all revisions to satisfy revision_id in source.
3591
# but we don't want to stat every file here and there.
3592
# we want then, all revisions other needs to satisfy revision_id
3593
# checked, but not those that we have locally.
3594
# so the first thing is to get a subset of the revisions to
3595
# satisfy revision_id in source, and then eliminate those that
3596
# we do already have.
3597
# this is slow on high latency connection to self, but as this
3598
# disk format scales terribly for push anyway due to rewriting
3599
# inventory.weave, this is considered acceptable.
3601
if revision_id is not None:
3602
source_ids = self.source.get_ancestry(revision_id)
3603
if source_ids[0] is not None:
3604
raise AssertionError()
3607
source_ids = self.source._all_possible_ids()
3608
source_ids_set = set(source_ids)
3609
# source_ids is the worst possible case we may need to pull.
3610
# now we want to filter source_ids against what we actually
3611
# have in target, but don't try to check for existence where we know
3612
# we do not have a revision as that would be pointless.
3613
target_ids = set(self.target._all_possible_ids())
3614
possibly_present_revisions = target_ids.intersection(source_ids_set)
3615
actually_present_revisions = set(
3616
self.target._eliminate_revisions_not_present(possibly_present_revisions))
3617
required_revisions = source_ids_set.difference(actually_present_revisions)
3618
if revision_id is not None:
3619
# we used get_ancestry to determine source_ids then we are assured all
3620
# revisions referenced are present as they are installed in topological order.
3621
# and the tip revision was validated by get_ancestry.
3622
result_set = required_revisions
3624
# if we just grabbed the possibly available ids, then
3625
# we only have an estimate of whats available and need to validate
3626
# that against the revision records.
3628
self.source._eliminate_revisions_not_present(required_revisions))
3629
return self.source.revision_ids_to_search_result(result_set)
3632
class InterKnitRepo(InterSameDataRepository):
3633
"""Optimised code paths between Knit based repositories."""
3636
def _get_repo_format_to_test(self):
3637
from bzrlib.repofmt import knitrepo
3638
return knitrepo.RepositoryFormatKnit1()
3641
def is_compatible(source, target):
3642
"""Be compatible with known Knit formats.
3644
We don't test for the stores being of specific types because that
3645
could lead to confusing results, and there is no need to be
3648
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit
3650
are_knits = (isinstance(source._format, RepositoryFormatKnit) and
3651
isinstance(target._format, RepositoryFormatKnit))
3652
except AttributeError:
3654
return are_knits and InterRepository._same_model(source, target)
3657
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
3658
"""See InterRepository.missing_revision_ids()."""
3659
if revision_id is not None:
3660
source_ids = self.source.get_ancestry(revision_id)
3661
if source_ids[0] is not None:
3662
raise AssertionError()
3665
source_ids = self.source.all_revision_ids()
3666
source_ids_set = set(source_ids)
3667
# source_ids is the worst possible case we may need to pull.
3668
# now we want to filter source_ids against what we actually
3669
# have in target, but don't try to check for existence where we know
3670
# we do not have a revision as that would be pointless.
3671
target_ids = set(self.target.all_revision_ids())
3672
possibly_present_revisions = target_ids.intersection(source_ids_set)
3673
actually_present_revisions = set(
3674
self.target._eliminate_revisions_not_present(possibly_present_revisions))
3675
required_revisions = source_ids_set.difference(actually_present_revisions)
3676
if revision_id is not None:
3677
# we used get_ancestry to determine source_ids then we are assured all
3678
# revisions referenced are present as they are installed in topological order.
3679
# and the tip revision was validated by get_ancestry.
3680
result_set = required_revisions
3682
# if we just grabbed the possibly available ids, then
3683
# we only have an estimate of whats available and need to validate
3684
# that against the revision records.
3686
self.source._eliminate_revisions_not_present(required_revisions))
3687
return self.source.revision_ids_to_search_result(result_set)
3690
class InterDifferingSerializer(InterRepository):
3693
def _get_repo_format_to_test(self):
3697
def is_compatible(source, target):
3698
"""Be compatible with Knit2 source and Knit3 target"""
3699
# This is redundant with format.check_conversion_target(), however that
3700
# raises an exception, and we just want to say "False" as in we won't
3701
# support converting between these formats.
3702
if 'IDS_never' in debug.debug_flags:
3704
if source.supports_rich_root() and not target.supports_rich_root():
3706
if (source._format.supports_tree_reference
3707
and not target._format.supports_tree_reference):
3709
if target._fallback_repositories and target._format.supports_chks:
3710
# IDS doesn't know how to copy CHKs for the parent inventories it
3711
# adds to stacked repos.
3713
if 'IDS_always' in debug.debug_flags:
3715
# Only use this code path for local source and target. IDS does far
3716
# too much IO (both bandwidth and roundtrips) over a network.
3717
if not source.bzrdir.transport.base.startswith('file:///'):
3719
if not target.bzrdir.transport.base.startswith('file:///'):
3723
def _get_trees(self, revision_ids, cache):
3725
for rev_id in revision_ids:
3727
possible_trees.append((rev_id, cache[rev_id]))
3729
# Not cached, but inventory might be present anyway.
3731
tree = self.source.revision_tree(rev_id)
3732
except errors.NoSuchRevision:
3733
# Nope, parent is ghost.
3736
cache[rev_id] = tree
3737
possible_trees.append((rev_id, tree))
3738
return possible_trees
3740
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3741
"""Get the best delta and base for this revision.
3743
:return: (basis_id, delta)
3746
# Generate deltas against each tree, to find the shortest.
3747
texts_possibly_new_in_tree = set()
3748
for basis_id, basis_tree in possible_trees:
3749
delta = tree.inventory._make_delta(basis_tree.inventory)
3750
for old_path, new_path, file_id, new_entry in delta:
3751
if new_path is None:
3752
# This file_id isn't present in the new rev, so we don't
3756
# Rich roots are handled elsewhere...
3758
kind = new_entry.kind
3759
if kind != 'directory' and kind != 'file':
3760
# No text record associated with this inventory entry.
3762
# This is a directory or file that has changed somehow.
3763
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3764
deltas.append((len(delta), basis_id, delta))
3766
return deltas[0][1:]
3768
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3769
"""Find all parent revisions that are absent, but for which the
3770
inventory is present, and copy those inventories.
3772
This is necessary to preserve correctness when the source is stacked
3773
without fallbacks configured. (Note that in cases like upgrade the
3774
source may be not have _fallback_repositories even though it is
3778
for parents in parent_map.values():
3779
parent_revs.update(parents)
3780
present_parents = self.source.get_parent_map(parent_revs)
3781
absent_parents = set(parent_revs).difference(present_parents)
3782
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3783
(rev_id,) for rev_id in absent_parents)
3784
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3785
for parent_tree in self.source.revision_trees(parent_inv_ids):
3786
current_revision_id = parent_tree.get_revision_id()
3787
parents_parents_keys = parent_invs_keys_for_stacking[
3788
(current_revision_id,)]
3789
parents_parents = [key[-1] for key in parents_parents_keys]
3790
basis_id = _mod_revision.NULL_REVISION
3791
basis_tree = self.source.revision_tree(basis_id)
3792
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3793
self.target.add_inventory_by_delta(
3794
basis_id, delta, current_revision_id, parents_parents)
3795
cache[current_revision_id] = parent_tree
3797
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3798
"""Fetch across a few revisions.
3800
:param revision_ids: The revisions to copy
3801
:param basis_id: The revision_id of a tree that must be in cache, used
3802
as a basis for delta when no other base is available
3803
:param cache: A cache of RevisionTrees that we can use.
3804
:param a_graph: A Graph object to determine the heads() of the
3805
rich-root data stream.
3806
:return: The revision_id of the last converted tree. The RevisionTree
3807
for it will be in cache
3809
# Walk though all revisions; get inventory deltas, copy referenced
3810
# texts that delta references, insert the delta, revision and
3812
root_keys_to_create = set()
3815
pending_revisions = []
3816
parent_map = self.source.get_parent_map(revision_ids)
3817
self._fetch_parent_invs_for_stacking(parent_map, cache)
3818
self.source._safe_to_return_from_cache = True
3819
for tree in self.source.revision_trees(revision_ids):
3820
# Find a inventory delta for this revision.
3821
# Find text entries that need to be copied, too.
3822
current_revision_id = tree.get_revision_id()
3823
parent_ids = parent_map.get(current_revision_id, ())
3824
parent_trees = self._get_trees(parent_ids, cache)
3825
possible_trees = list(parent_trees)
3826
if len(possible_trees) == 0:
3827
# There either aren't any parents, or the parents are ghosts,
3828
# so just use the last converted tree.
3829
possible_trees.append((basis_id, cache[basis_id]))
3830
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3832
revision = self.source.get_revision(current_revision_id)
3833
pending_deltas.append((basis_id, delta,
3834
current_revision_id, revision.parent_ids))
3835
if self._converting_to_rich_root:
3836
self._revision_id_to_root_id[current_revision_id] = \
3838
# Determine which texts are in present in this revision but not in
3839
# any of the available parents.
3840
texts_possibly_new_in_tree = set()
3841
for old_path, new_path, file_id, entry in delta:
3842
if new_path is None:
3843
# This file_id isn't present in the new rev
3847
if not self.target.supports_rich_root():
3848
# The target doesn't support rich root, so we don't
3851
if self._converting_to_rich_root:
3852
# This can't be copied normally, we have to insert
3854
root_keys_to_create.add((file_id, entry.revision))
3857
texts_possibly_new_in_tree.add((file_id, entry.revision))
3858
for basis_id, basis_tree in possible_trees:
3859
basis_inv = basis_tree.inventory
3860
for file_key in list(texts_possibly_new_in_tree):
3861
file_id, file_revision = file_key
3863
entry = basis_inv[file_id]
3864
except errors.NoSuchId:
3866
if entry.revision == file_revision:
3867
texts_possibly_new_in_tree.remove(file_key)
3868
text_keys.update(texts_possibly_new_in_tree)
3869
pending_revisions.append(revision)
3870
cache[current_revision_id] = tree
3871
basis_id = current_revision_id
3872
self.source._safe_to_return_from_cache = False
3874
from_texts = self.source.texts
3875
to_texts = self.target.texts
3876
if root_keys_to_create:
3877
root_stream = _mod_fetch._new_root_data_stream(
3878
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3879
self.source, graph=a_graph)
3880
to_texts.insert_record_stream(root_stream)
3881
to_texts.insert_record_stream(from_texts.get_record_stream(
3882
text_keys, self.target._format._fetch_order,
3883
not self.target._format._fetch_uses_deltas))
3884
# insert inventory deltas
3885
for delta in pending_deltas:
3886
self.target.add_inventory_by_delta(*delta)
3887
if self.target._fallback_repositories:
3888
# Make sure this stacked repository has all the parent inventories
3889
# for the new revisions that we are about to insert. We do this
3890
# before adding the revisions so that no revision is added until
3891
# all the inventories it may depend on are added.
3892
# Note that this is overzealous, as we may have fetched these in an
3895
revision_ids = set()
3896
for revision in pending_revisions:
3897
revision_ids.add(revision.revision_id)
3898
parent_ids.update(revision.parent_ids)
3899
parent_ids.difference_update(revision_ids)
3900
parent_ids.discard(_mod_revision.NULL_REVISION)
3901
parent_map = self.source.get_parent_map(parent_ids)
3902
# we iterate over parent_map and not parent_ids because we don't
3903
# want to try copying any revision which is a ghost
3904
for parent_tree in self.source.revision_trees(parent_map):
3905
current_revision_id = parent_tree.get_revision_id()
3906
parents_parents = parent_map[current_revision_id]
3907
possible_trees = self._get_trees(parents_parents, cache)
3908
if len(possible_trees) == 0:
3909
# There either aren't any parents, or the parents are
3910
# ghosts, so just use the last converted tree.
3911
possible_trees.append((basis_id, cache[basis_id]))
3912
basis_id, delta = self._get_delta_for_revision(parent_tree,
3913
parents_parents, possible_trees)
3914
self.target.add_inventory_by_delta(
3915
basis_id, delta, current_revision_id, parents_parents)
3916
# insert signatures and revisions
3917
for revision in pending_revisions:
3919
signature = self.source.get_signature_text(
3920
revision.revision_id)
3921
self.target.add_signature_text(revision.revision_id,
3923
except errors.NoSuchRevision:
3925
self.target.add_revision(revision.revision_id, revision)
3928
def _fetch_all_revisions(self, revision_ids, pb):
3929
"""Fetch everything for the list of revisions.
3931
:param revision_ids: The list of revisions to fetch. Must be in
3933
:param pb: A ProgressTask
3936
basis_id, basis_tree = self._get_basis(revision_ids[0])
3938
cache = lru_cache.LRUCache(100)
3939
cache[basis_id] = basis_tree
3940
del basis_tree # We don't want to hang on to it here
3942
if self._converting_to_rich_root and len(revision_ids) > 100:
3943
a_graph = _mod_fetch._get_rich_root_heads_graph(self.source,
3948
for offset in range(0, len(revision_ids), batch_size):
3949
self.target.start_write_group()
3951
pb.update('Transferring revisions', offset,
3953
batch = revision_ids[offset:offset+batch_size]
3954
basis_id = self._fetch_batch(batch, basis_id, cache,
3957
self.source._safe_to_return_from_cache = False
3958
self.target.abort_write_group()
3961
hint = self.target.commit_write_group()
3964
if hints and self.target._format.pack_compresses:
3965
self.target.pack(hint=hints)
3966
pb.update('Transferring revisions', len(revision_ids),
3970
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
3972
"""See InterRepository.fetch()."""
3973
if fetch_spec is not None:
3974
raise AssertionError("Not implemented yet...")
3975
ui.ui_factory.warn_experimental_format_fetch(self)
3976
if (not self.source.supports_rich_root()
3977
and self.target.supports_rich_root()):
3978
self._converting_to_rich_root = True
3979
self._revision_id_to_root_id = {}
3981
self._converting_to_rich_root = False
3982
# See <https://launchpad.net/bugs/456077> asking for a warning here
3983
if self.source._format.network_name() != self.target._format.network_name():
3984
ui.ui_factory.show_user_warning('cross_format_fetch',
3985
from_format=self.source._format,
3986
to_format=self.target._format)
3987
revision_ids = self.target.search_missing_revision_ids(self.source,
3988
revision_id, find_ghosts=find_ghosts).get_keys()
3989
if not revision_ids:
3991
revision_ids = tsort.topo_sort(
3992
self.source.get_graph().get_parent_map(revision_ids))
3993
if not revision_ids:
3995
# Walk though all revisions; get inventory deltas, copy referenced
3996
# texts that delta references, insert the delta, revision and
3999
my_pb = ui.ui_factory.nested_progress_bar()
4002
symbol_versioning.warn(
4003
symbol_versioning.deprecated_in((1, 14, 0))
4004
% "pb parameter to fetch()")
4007
self._fetch_all_revisions(revision_ids, pb)
4009
if my_pb is not None:
4011
return len(revision_ids), 0
4013
def _get_basis(self, first_revision_id):
4014
"""Get a revision and tree which exists in the target.
4016
This assumes that first_revision_id is selected for transmission
4017
because all other ancestors are already present. If we can't find an
4018
ancestor we fall back to NULL_REVISION since we know that is safe.
4020
:return: (basis_id, basis_tree)
4022
first_rev = self.source.get_revision(first_revision_id)
4024
basis_id = first_rev.parent_ids[0]
4025
# only valid as a basis if the target has it
4026
self.target.get_revision(basis_id)
4027
# Try to get a basis tree - if its a ghost it will hit the
4028
# NoSuchRevision case.
4029
basis_tree = self.source.revision_tree(basis_id)
4030
except (IndexError, errors.NoSuchRevision):
4031
basis_id = _mod_revision.NULL_REVISION
4032
basis_tree = self.source.revision_tree(basis_id)
4033
return basis_id, basis_tree
4036
InterRepository.register_optimiser(InterDifferingSerializer)
4037
InterRepository.register_optimiser(InterSameDataRepository)
4038
InterRepository.register_optimiser(InterWeaveRepo)
4039
InterRepository.register_optimiser(InterKnitRepo)
4042
1712
class CopyConverter(object):
4043
1713
"""A repository conversion tool which just performs a copy of the content.
4065
1735
# trigger an assertion if not such
4066
1736
repo._format.get_format_string()
4067
1737
self.repo_dir = repo.bzrdir
4068
pb.update('Moving repository to repository.backup')
1738
pb.update(gettext('Moving repository to repository.backup'))
4069
1739
self.repo_dir.transport.move('repository', 'repository.backup')
4070
1740
backup_transport = self.repo_dir.transport.clone('repository.backup')
4071
1741
repo._format.check_conversion_target(self.target_format)
4072
1742
self.source_repo = repo._format.open(self.repo_dir,
4074
1744
_override_transport=backup_transport)
4075
pb.update('Creating new repository')
1745
pb.update(gettext('Creating new repository'))
4076
1746
converted = self.target_format.initialize(self.repo_dir,
4077
1747
self.source_repo.is_shared())
4078
1748
converted.lock_write()
4080
pb.update('Copying content')
1750
pb.update(gettext('Copying content'))
4081
1751
self.source_repo.copy_content_into(converted)
4083
1753
converted.unlock()
4084
pb.update('Deleting old repository content')
1754
pb.update(gettext('Deleting old repository content'))
4085
1755
self.repo_dir.transport.delete_tree('repository.backup')
4086
ui.ui_factory.note('repository converted')
1756
ui.ui_factory.note(gettext('repository converted'))
4099
def _unescaper(match, _map=_unescape_map):
4100
code = match.group(1)
4104
if not code.startswith('#'):
4106
return unichr(int(code[1:])).encode('utf8')
4112
def _unescape_xml(data):
4113
"""Unescape predefined XML entities in a string of data."""
4115
if _unescape_re is None:
4116
_unescape_re = re.compile('\&([^;]*);')
4117
return _unescape_re.sub(_unescaper, data)
4120
class _VersionedFileChecker(object):
4122
def __init__(self, repository, text_key_references=None, ancestors=None):
4123
self.repository = repository
4124
self.text_index = self.repository._generate_text_key_index(
4125
text_key_references=text_key_references, ancestors=ancestors)
4127
def calculate_file_version_parents(self, text_key):
4128
"""Calculate the correct parents for a file version according to
4131
parent_keys = self.text_index[text_key]
4132
if parent_keys == [_mod_revision.NULL_REVISION]:
4134
return tuple(parent_keys)
4136
def check_file_version_parents(self, texts, progress_bar=None):
4137
"""Check the parents stored in a versioned file are correct.
4139
It also detects file versions that are not referenced by their
4140
corresponding revision's inventory.
4142
:returns: A tuple of (wrong_parents, dangling_file_versions).
4143
wrong_parents is a dict mapping {revision_id: (stored_parents,
4144
correct_parents)} for each revision_id where the stored parents
4145
are not correct. dangling_file_versions is a set of (file_id,
4146
revision_id) tuples for versions that are present in this versioned
4147
file, but not used by the corresponding inventory.
4149
local_progress = None
4150
if progress_bar is None:
4151
local_progress = ui.ui_factory.nested_progress_bar()
4152
progress_bar = local_progress
4154
return self._check_file_version_parents(texts, progress_bar)
4157
local_progress.finished()
4159
def _check_file_version_parents(self, texts, progress_bar):
4160
"""See check_file_version_parents."""
4162
self.file_ids = set([file_id for file_id, _ in
4163
self.text_index.iterkeys()])
4164
# text keys is now grouped by file_id
4165
n_versions = len(self.text_index)
4166
progress_bar.update('loading text store', 0, n_versions)
4167
parent_map = self.repository.texts.get_parent_map(self.text_index)
4168
# On unlistable transports this could well be empty/error...
4169
text_keys = self.repository.texts.keys()
4170
unused_keys = frozenset(text_keys) - set(self.text_index)
4171
for num, key in enumerate(self.text_index.iterkeys()):
4172
progress_bar.update('checking text graph', num, n_versions)
4173
correct_parents = self.calculate_file_version_parents(key)
4175
knit_parents = parent_map[key]
4176
except errors.RevisionNotPresent:
4179
if correct_parents != knit_parents:
4180
wrong_parents[key] = (knit_parents, correct_parents)
4181
return wrong_parents, unused_keys
4184
def _old_get_graph(repository, revision_id):
4185
"""DO NOT USE. That is all. I'm serious."""
4186
graph = repository.get_graph()
4187
revision_graph = dict(((key, value) for key, value in
4188
graph.iter_ancestry([revision_id]) if value is not None))
4189
return _strip_NULL_ghosts(revision_graph)
4192
1760
def _strip_NULL_ghosts(revision_graph):
4193
1761
"""Also don't use this. more compatibility code for unmigrated clients."""
4194
1762
# Filter ghosts, and null:
4200
1768
return revision_graph
4203
class StreamSink(object):
4204
"""An object that can insert a stream into a repository.
4206
This interface handles the complexity of reserialising inventories and
4207
revisions from different formats, and allows unidirectional insertion into
4208
stacked repositories without looking for the missing basis parents
4212
def __init__(self, target_repo):
4213
self.target_repo = target_repo
4215
def insert_stream(self, stream, src_format, resume_tokens):
4216
"""Insert a stream's content into the target repository.
4218
:param src_format: a bzr repository format.
4220
:return: a list of resume tokens and an iterable of keys additional
4221
items required before the insertion can be completed.
4223
self.target_repo.lock_write()
4226
self.target_repo.resume_write_group(resume_tokens)
4229
self.target_repo.start_write_group()
4232
# locked_insert_stream performs a commit|suspend.
4233
return self._locked_insert_stream(stream, src_format, is_resume)
4235
self.target_repo.abort_write_group(suppress_errors=True)
4238
self.target_repo.unlock()
4240
def _locked_insert_stream(self, stream, src_format, is_resume):
4241
to_serializer = self.target_repo._format._serializer
4242
src_serializer = src_format._serializer
4244
if to_serializer == src_serializer:
4245
# If serializers match and the target is a pack repository, set the
4246
# write cache size on the new pack. This avoids poor performance
4247
# on transports where append is unbuffered (such as
4248
# RemoteTransport). This is safe to do because nothing should read
4249
# back from the target repository while a stream with matching
4250
# serialization is being inserted.
4251
# The exception is that a delta record from the source that should
4252
# be a fulltext may need to be expanded by the target (see
4253
# test_fetch_revisions_with_deltas_into_pack); but we take care to
4254
# explicitly flush any buffered writes first in that rare case.
4256
new_pack = self.target_repo._pack_collection._new_pack
4257
except AttributeError:
4258
# Not a pack repository
4261
new_pack.set_write_cache_size(1024*1024)
4262
for substream_type, substream in stream:
4263
if 'stream' in debug.debug_flags:
4264
mutter('inserting substream: %s', substream_type)
4265
if substream_type == 'texts':
4266
self.target_repo.texts.insert_record_stream(substream)
4267
elif substream_type == 'inventories':
4268
if src_serializer == to_serializer:
4269
self.target_repo.inventories.insert_record_stream(
4272
self._extract_and_insert_inventories(
4273
substream, src_serializer)
4274
elif substream_type == 'inventory-deltas':
4275
self._extract_and_insert_inventory_deltas(
4276
substream, src_serializer)
4277
elif substream_type == 'chk_bytes':
4278
# XXX: This doesn't support conversions, as it assumes the
4279
# conversion was done in the fetch code.
4280
self.target_repo.chk_bytes.insert_record_stream(substream)
4281
elif substream_type == 'revisions':
4282
# This may fallback to extract-and-insert more often than
4283
# required if the serializers are different only in terms of
4285
if src_serializer == to_serializer:
4286
self.target_repo.revisions.insert_record_stream(
4289
self._extract_and_insert_revisions(substream,
4291
elif substream_type == 'signatures':
4292
self.target_repo.signatures.insert_record_stream(substream)
4294
raise AssertionError('kaboom! %s' % (substream_type,))
4295
# Done inserting data, and the missing_keys calculations will try to
4296
# read back from the inserted data, so flush the writes to the new pack
4297
# (if this is pack format).
4298
if new_pack is not None:
4299
new_pack._write_data('', flush=True)
4300
# Find all the new revisions (including ones from resume_tokens)
4301
missing_keys = self.target_repo.get_missing_parent_inventories(
4302
check_for_missing_texts=is_resume)
4304
for prefix, versioned_file in (
4305
('texts', self.target_repo.texts),
4306
('inventories', self.target_repo.inventories),
4307
('revisions', self.target_repo.revisions),
4308
('signatures', self.target_repo.signatures),
4309
('chk_bytes', self.target_repo.chk_bytes),
4311
if versioned_file is None:
4313
# TODO: key is often going to be a StaticTuple object
4314
# I don't believe we can define a method by which
4315
# (prefix,) + StaticTuple will work, though we could
4316
# define a StaticTuple.sq_concat that would allow you to
4317
# pass in either a tuple or a StaticTuple as the second
4318
# object, so instead we could have:
4319
# StaticTuple(prefix) + key here...
4320
missing_keys.update((prefix,) + key for key in
4321
versioned_file.get_missing_compression_parent_keys())
4322
except NotImplementedError:
4323
# cannot even attempt suspending, and missing would have failed
4324
# during stream insertion.
4325
missing_keys = set()
4328
# suspend the write group and tell the caller what we is
4329
# missing. We know we can suspend or else we would not have
4330
# entered this code path. (All repositories that can handle
4331
# missing keys can handle suspending a write group).
4332
write_group_tokens = self.target_repo.suspend_write_group()
4333
return write_group_tokens, missing_keys
4334
hint = self.target_repo.commit_write_group()
4335
if (to_serializer != src_serializer and
4336
self.target_repo._format.pack_compresses):
4337
self.target_repo.pack(hint=hint)
4340
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4341
target_rich_root = self.target_repo._format.rich_root_data
4342
target_tree_refs = self.target_repo._format.supports_tree_reference
4343
for record in substream:
4344
# Insert the delta directly
4345
inventory_delta_bytes = record.get_bytes_as('fulltext')
4346
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4348
parse_result = deserialiser.parse_text_bytes(
4349
inventory_delta_bytes)
4350
except inventory_delta.IncompatibleInventoryDelta, err:
4351
trace.mutter("Incompatible delta: %s", err.msg)
4352
raise errors.IncompatibleRevision(self.target_repo._format)
4353
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4354
revision_id = new_id
4355
parents = [key[0] for key in record.parents]
4356
self.target_repo.add_inventory_by_delta(
4357
basis_id, inv_delta, revision_id, parents)
4359
def _extract_and_insert_inventories(self, substream, serializer,
4361
"""Generate a new inventory versionedfile in target, converting data.
4363
The inventory is retrieved from the source, (deserializing it), and
4364
stored in the target (reserializing it in a different format).
4366
target_rich_root = self.target_repo._format.rich_root_data
4367
target_tree_refs = self.target_repo._format.supports_tree_reference
4368
for record in substream:
4369
# It's not a delta, so it must be a fulltext in the source
4370
# serializer's format.
4371
bytes = record.get_bytes_as('fulltext')
4372
revision_id = record.key[0]
4373
inv = serializer.read_inventory_from_string(bytes, revision_id)
4374
parents = [key[0] for key in record.parents]
4375
self.target_repo.add_inventory(revision_id, inv, parents)
4376
# No need to keep holding this full inv in memory when the rest of
4377
# the substream is likely to be all deltas.
4380
def _extract_and_insert_revisions(self, substream, serializer):
4381
for record in substream:
4382
bytes = record.get_bytes_as('fulltext')
4383
revision_id = record.key[0]
4384
rev = serializer.read_revision_from_string(bytes)
4385
if rev.revision_id != revision_id:
4386
raise AssertionError('wtf: %s != %s' % (rev, revision_id))
4387
self.target_repo.add_revision(revision_id, rev)
4390
if self.target_repo._format._fetch_reconcile:
4391
self.target_repo.reconcile()
4394
class StreamSource(object):
4395
"""A source of a stream for fetching between repositories."""
4397
def __init__(self, from_repository, to_format):
4398
"""Create a StreamSource streaming from from_repository."""
4399
self.from_repository = from_repository
4400
self.to_format = to_format
4402
def delta_on_metadata(self):
4403
"""Return True if delta's are permitted on metadata streams.
4405
That is on revisions and signatures.
4407
src_serializer = self.from_repository._format._serializer
4408
target_serializer = self.to_format._serializer
4409
return (self.to_format._fetch_uses_deltas and
4410
src_serializer == target_serializer)
4412
def _fetch_revision_texts(self, revs):
4413
# fetch signatures first and then the revision texts
4414
# may need to be a InterRevisionStore call here.
4415
from_sf = self.from_repository.signatures
4416
# A missing signature is just skipped.
4417
keys = [(rev_id,) for rev_id in revs]
4418
signatures = versionedfile.filter_absent(from_sf.get_record_stream(
4420
self.to_format._fetch_order,
4421
not self.to_format._fetch_uses_deltas))
4422
# If a revision has a delta, this is actually expanded inside the
4423
# insert_record_stream code now, which is an alternate fix for
4425
from_rf = self.from_repository.revisions
4426
revisions = from_rf.get_record_stream(
4428
self.to_format._fetch_order,
4429
not self.delta_on_metadata())
4430
return [('signatures', signatures), ('revisions', revisions)]
4432
def _generate_root_texts(self, revs):
4433
"""This will be called by get_stream between fetching weave texts and
4434
fetching the inventory weave.
4436
if self._rich_root_upgrade():
4437
return _mod_fetch.Inter1and2Helper(
4438
self.from_repository).generate_root_texts(revs)
4442
def get_stream(self, search):
4444
revs = search.get_keys()
4445
graph = self.from_repository.get_graph()
4446
revs = tsort.topo_sort(graph.get_parent_map(revs))
4447
data_to_fetch = self.from_repository.item_keys_introduced_by(revs)
4449
for knit_kind, file_id, revisions in data_to_fetch:
4450
if knit_kind != phase:
4452
# Make a new progress bar for this phase
4453
if knit_kind == "file":
4454
# Accumulate file texts
4455
text_keys.extend([(file_id, revision) for revision in
4457
elif knit_kind == "inventory":
4458
# Now copy the file texts.
4459
from_texts = self.from_repository.texts
4460
yield ('texts', from_texts.get_record_stream(
4461
text_keys, self.to_format._fetch_order,
4462
not self.to_format._fetch_uses_deltas))
4463
# Cause an error if a text occurs after we have done the
4466
# Before we process the inventory we generate the root
4467
# texts (if necessary) so that the inventories references
4469
for _ in self._generate_root_texts(revs):
4471
# we fetch only the referenced inventories because we do not
4472
# know for unselected inventories whether all their required
4473
# texts are present in the other repository - it could be
4475
for info in self._get_inventory_stream(revs):
4477
elif knit_kind == "signatures":
4478
# Nothing to do here; this will be taken care of when
4479
# _fetch_revision_texts happens.
4481
elif knit_kind == "revisions":
4482
for record in self._fetch_revision_texts(revs):
4485
raise AssertionError("Unknown knit kind %r" % knit_kind)
4487
def get_stream_for_missing_keys(self, missing_keys):
4488
# missing keys can only occur when we are byte copying and not
4489
# translating (because translation means we don't send
4490
# unreconstructable deltas ever).
4492
keys['texts'] = set()
4493
keys['revisions'] = set()
4494
keys['inventories'] = set()
4495
keys['chk_bytes'] = set()
4496
keys['signatures'] = set()
4497
for key in missing_keys:
4498
keys[key[0]].add(key[1:])
4499
if len(keys['revisions']):
4500
# If we allowed copying revisions at this point, we could end up
4501
# copying a revision without copying its required texts: a
4502
# violation of the requirements for repository integrity.
4503
raise AssertionError(
4504
'cannot copy revisions to fill in missing deltas %s' % (
4505
keys['revisions'],))
4506
for substream_kind, keys in keys.iteritems():
4507
vf = getattr(self.from_repository, substream_kind)
4508
if vf is None and keys:
4509
raise AssertionError(
4510
"cannot fill in keys for a versioned file we don't"
4511
" have: %s needs %s" % (substream_kind, keys))
4513
# No need to stream something we don't have
4515
if substream_kind == 'inventories':
4516
# Some missing keys are genuinely ghosts, filter those out.
4517
present = self.from_repository.inventories.get_parent_map(keys)
4518
revs = [key[0] for key in present]
4519
# Get the inventory stream more-or-less as we do for the
4520
# original stream; there's no reason to assume that records
4521
# direct from the source will be suitable for the sink. (Think
4522
# e.g. 2a -> 1.9-rich-root).
4523
for info in self._get_inventory_stream(revs, missing=True):
4527
# Ask for full texts always so that we don't need more round trips
4528
# after this stream.
4529
# Some of the missing keys are genuinely ghosts, so filter absent
4530
# records. The Sink is responsible for doing another check to
4531
# ensure that ghosts don't introduce missing data for future
4533
stream = versionedfile.filter_absent(vf.get_record_stream(keys,
4534
self.to_format._fetch_order, True))
4535
yield substream_kind, stream
4537
def inventory_fetch_order(self):
4538
if self._rich_root_upgrade():
4539
return 'topological'
4541
return self.to_format._fetch_order
4543
def _rich_root_upgrade(self):
4544
return (not self.from_repository._format.rich_root_data and
4545
self.to_format.rich_root_data)
4547
def _get_inventory_stream(self, revision_ids, missing=False):
4548
from_format = self.from_repository._format
4549
if (from_format.supports_chks and self.to_format.supports_chks and
4550
from_format.network_name() == self.to_format.network_name()):
4551
raise AssertionError(
4552
"this case should be handled by GroupCHKStreamSource")
4553
elif 'forceinvdeltas' in debug.debug_flags:
4554
return self._get_convertable_inventory_stream(revision_ids,
4555
delta_versus_null=missing)
4556
elif from_format.network_name() == self.to_format.network_name():
4558
return self._get_simple_inventory_stream(revision_ids,
4560
elif (not from_format.supports_chks and not self.to_format.supports_chks
4561
and from_format._serializer == self.to_format._serializer):
4562
# Essentially the same format.
4563
return self._get_simple_inventory_stream(revision_ids,
4566
# Any time we switch serializations, we want to use an
4567
# inventory-delta based approach.
4568
return self._get_convertable_inventory_stream(revision_ids,
4569
delta_versus_null=missing)
4571
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4572
# NB: This currently reopens the inventory weave in source;
4573
# using a single stream interface instead would avoid this.
4574
from_weave = self.from_repository.inventories
4576
delta_closure = True
4578
delta_closure = not self.delta_on_metadata()
4579
yield ('inventories', from_weave.get_record_stream(
4580
[(rev_id,) for rev_id in revision_ids],
4581
self.inventory_fetch_order(), delta_closure))
4583
def _get_convertable_inventory_stream(self, revision_ids,
4584
delta_versus_null=False):
4585
# The two formats are sufficiently different that there is no fast
4586
# path, so we need to send just inventorydeltas, which any
4587
# sufficiently modern client can insert into any repository.
4588
# The StreamSink code expects to be able to
4589
# convert on the target, so we need to put bytes-on-the-wire that can
4590
# be converted. That means inventory deltas (if the remote is <1.19,
4591
# RemoteStreamSink will fallback to VFS to insert the deltas).
4592
yield ('inventory-deltas',
4593
self._stream_invs_as_deltas(revision_ids,
4594
delta_versus_null=delta_versus_null))
4596
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4597
"""Return a stream of inventory-deltas for the given rev ids.
4599
:param revision_ids: The list of inventories to transmit
4600
:param delta_versus_null: Don't try to find a minimal delta for this
4601
entry, instead compute the delta versus the NULL_REVISION. This
4602
effectively streams a complete inventory. Used for stuff like
4603
filling in missing parents, etc.
4605
from_repo = self.from_repository
4606
revision_keys = [(rev_id,) for rev_id in revision_ids]
4607
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4608
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4610
inventories = self.from_repository.iter_inventories(
4611
revision_ids, 'topological')
4612
format = from_repo._format
4613
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4614
inventory_cache = lru_cache.LRUCache(50)
4615
null_inventory = from_repo.revision_tree(
4616
_mod_revision.NULL_REVISION).inventory
4617
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4618
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4619
# repo back into a non-rich-root repo ought to be allowed)
4620
serializer = inventory_delta.InventoryDeltaSerializer(
4621
versioned_root=format.rich_root_data,
4622
tree_references=format.supports_tree_reference)
4623
for inv in inventories:
4624
key = (inv.revision_id,)
4625
parent_keys = parent_map.get(key, ())
4627
if not delta_versus_null and parent_keys:
4628
# The caller did not ask for complete inventories and we have
4629
# some parents that we can delta against. Make a delta against
4630
# each parent so that we can find the smallest.
4631
parent_ids = [parent_key[0] for parent_key in parent_keys]
4632
for parent_id in parent_ids:
4633
if parent_id not in invs_sent_so_far:
4634
# We don't know that the remote side has this basis, so
4637
if parent_id == _mod_revision.NULL_REVISION:
4638
parent_inv = null_inventory
4640
parent_inv = inventory_cache.get(parent_id, None)
4641
if parent_inv is None:
4642
parent_inv = from_repo.get_inventory(parent_id)
4643
candidate_delta = inv._make_delta(parent_inv)
4644
if (delta is None or
4645
len(delta) > len(candidate_delta)):
4646
delta = candidate_delta
4647
basis_id = parent_id
4649
# Either none of the parents ended up being suitable, or we
4650
# were asked to delta against NULL
4651
basis_id = _mod_revision.NULL_REVISION
4652
delta = inv._make_delta(null_inventory)
4653
invs_sent_so_far.add(inv.revision_id)
4654
inventory_cache[inv.revision_id] = inv
4655
delta_serialized = ''.join(
4656
serializer.delta_to_lines(basis_id, key[-1], delta))
4657
yield versionedfile.FulltextContentFactory(
4658
key, parent_keys, None, delta_serialized)
4661
1771
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4662
1772
stop_revision=None):
4663
1773
"""Extend the partial history to include a given index
added
removed
bzrlib/repository.py
