390
538
# unchanged, carry over.
391
539
ie.reference_revision = parent_entry.reference_revision
392
540
ie.revision = parent_entry.revision
393
return self._get_delta(ie, basis_inv, path), False
541
return self._get_delta(ie, basis_inv, path), False, None
394
542
ie.reference_revision = content_summary[3]
396
self._add_text_to_weave(ie.file_id, lines, heads, None)
543
if ie.reference_revision is None:
544
raise AssertionError("invalid content_summary for nested tree: %r"
545
% (content_summary,))
546
self._add_text_to_weave(ie.file_id, '', heads, None)
398
548
raise NotImplementedError('unknown kind')
399
549
ie.revision = self._new_revision_id
400
return self._get_delta(ie, basis_inv, path), True
402
def _add_text_to_weave(self, file_id, new_lines, parents, nostore_sha):
403
versionedfile = self.repository.weave_store.get_weave_or_empty(
404
file_id, self.repository.get_transaction())
405
# Don't change this to add_lines - add_lines_with_ghosts is cheaper
406
# than add_lines, and allows committing when a parent is ghosted for
408
# Note: as we read the content directly from the tree, we know its not
409
# been turned into unicode or badly split - but a broken tree
410
# implementation could give us bad output from readlines() so this is
411
# not a guarantee of safety. What would be better is always checking
412
# the content during test suite execution. RBC 20070912
550
self._any_changes = True
551
return self._get_delta(ie, basis_inv, path), True, fingerprint
553
def record_iter_changes(self, tree, basis_revision_id, iter_changes,
554
_entry_factory=entry_factory):
555
"""Record a new tree via iter_changes.
557
:param tree: The tree to obtain text contents from for changed objects.
558
:param basis_revision_id: The revision id of the tree the iter_changes
559
has been generated against. Currently assumed to be the same
560
as self.parents[0] - if it is not, errors may occur.
561
:param iter_changes: An iter_changes iterator with the changes to apply
562
to basis_revision_id. The iterator must not include any items with
563
a current kind of None - missing items must be either filtered out
564
or errored-on beefore record_iter_changes sees the item.
565
:param _entry_factory: Private method to bind entry_factory locally for
567
:return: A generator of (file_id, relpath, fs_hash) tuples for use with
570
# Create an inventory delta based on deltas between all the parents and
571
# deltas between all the parent inventories. We use inventory delta's
572
# between the inventory objects because iter_changes masks
573
# last-changed-field only changes.
575
# file_id -> change map, change is fileid, paths, changed, versioneds,
576
# parents, names, kinds, executables
578
# {file_id -> revision_id -> inventory entry, for entries in parent
579
# trees that are not parents[0]
414
return versionedfile.add_lines_with_ghosts(
415
self._new_revision_id, parents, new_lines,
416
nostore_sha=nostore_sha, random_id=self.random_revid,
417
check_content=False)[0:2]
419
versionedfile.clear_cache()
583
revtrees = list(self.repository.revision_trees(self.parents))
584
except errors.NoSuchRevision:
585
# one or more ghosts, slow path.
587
for revision_id in self.parents:
589
revtrees.append(self.repository.revision_tree(revision_id))
590
except errors.NoSuchRevision:
592
basis_revision_id = _mod_revision.NULL_REVISION
594
revtrees.append(self.repository.revision_tree(
595
_mod_revision.NULL_REVISION))
596
# The basis inventory from a repository
598
basis_inv = revtrees[0].inventory
600
basis_inv = self.repository.revision_tree(
601
_mod_revision.NULL_REVISION).inventory
602
if len(self.parents) > 0:
603
if basis_revision_id != self.parents[0] and not ghost_basis:
605
"arbitrary basis parents not yet supported with merges")
606
for revtree in revtrees[1:]:
607
for change in revtree.inventory._make_delta(basis_inv):
608
if change[1] is None:
609
# Not present in this parent.
611
if change[2] not in merged_ids:
612
if change[0] is not None:
613
basis_entry = basis_inv[change[2]]
614
merged_ids[change[2]] = [
616
basis_entry.revision,
619
parent_entries[change[2]] = {
621
basis_entry.revision:basis_entry,
623
change[3].revision:change[3],
626
merged_ids[change[2]] = [change[3].revision]
627
parent_entries[change[2]] = {change[3].revision:change[3]}
629
merged_ids[change[2]].append(change[3].revision)
630
parent_entries[change[2]][change[3].revision] = change[3]
633
# Setup the changes from the tree:
634
# changes maps file_id -> (change, [parent revision_ids])
636
for change in iter_changes:
637
# This probably looks up in basis_inv way to much.
638
if change[1][0] is not None:
639
head_candidate = [basis_inv[change[0]].revision]
642
changes[change[0]] = change, merged_ids.get(change[0],
644
unchanged_merged = set(merged_ids) - set(changes)
645
# Extend the changes dict with synthetic changes to record merges of
647
for file_id in unchanged_merged:
648
# Record a merged version of these items that did not change vs the
649
# basis. This can be either identical parallel changes, or a revert
650
# of a specific file after a merge. The recorded content will be
651
# that of the current tree (which is the same as the basis), but
652
# the per-file graph will reflect a merge.
653
# NB:XXX: We are reconstructing path information we had, this
654
# should be preserved instead.
655
# inv delta change: (file_id, (path_in_source, path_in_target),
656
# changed_content, versioned, parent, name, kind,
659
basis_entry = basis_inv[file_id]
660
except errors.NoSuchId:
661
# a change from basis->some_parents but file_id isn't in basis
662
# so was new in the merge, which means it must have changed
663
# from basis -> current, and as it hasn't the add was reverted
664
# by the user. So we discard this change.
668
(basis_inv.id2path(file_id), tree.id2path(file_id)),
670
(basis_entry.parent_id, basis_entry.parent_id),
671
(basis_entry.name, basis_entry.name),
672
(basis_entry.kind, basis_entry.kind),
673
(basis_entry.executable, basis_entry.executable))
674
changes[file_id] = (change, merged_ids[file_id])
675
# changes contains tuples with the change and a set of inventory
676
# candidates for the file.
678
# old_path, new_path, file_id, new_inventory_entry
679
seen_root = False # Is the root in the basis delta?
680
inv_delta = self._basis_delta
681
modified_rev = self._new_revision_id
682
for change, head_candidates in changes.values():
683
if change[3][1]: # versioned in target.
684
# Several things may be happening here:
685
# We may have a fork in the per-file graph
686
# - record a change with the content from tree
687
# We may have a change against < all trees
688
# - carry over the tree that hasn't changed
689
# We may have a change against all trees
690
# - record the change with the content from tree
693
entry = _entry_factory[kind](file_id, change[5][1],
695
head_set = self._heads(change[0], set(head_candidates))
698
for head_candidate in head_candidates:
699
if head_candidate in head_set:
700
heads.append(head_candidate)
701
head_set.remove(head_candidate)
704
# Could be a carry-over situation:
705
parent_entry_revs = parent_entries.get(file_id, None)
706
if parent_entry_revs:
707
parent_entry = parent_entry_revs.get(heads[0], None)
710
if parent_entry is None:
711
# The parent iter_changes was called against is the one
712
# that is the per-file head, so any change is relevant
713
# iter_changes is valid.
714
carry_over_possible = False
716
# could be a carry over situation
717
# A change against the basis may just indicate a merge,
718
# we need to check the content against the source of the
719
# merge to determine if it was changed after the merge
721
if (parent_entry.kind != entry.kind or
722
parent_entry.parent_id != entry.parent_id or
723
parent_entry.name != entry.name):
724
# Metadata common to all entries has changed
725
# against per-file parent
726
carry_over_possible = False
728
carry_over_possible = True
729
# per-type checks for changes against the parent_entry
732
# Cannot be a carry-over situation
733
carry_over_possible = False
734
# Populate the entry in the delta
736
# XXX: There is still a small race here: If someone reverts the content of a file
737
# after iter_changes examines and decides it has changed,
738
# we will unconditionally record a new version even if some
739
# other process reverts it while commit is running (with
740
# the revert happening after iter_changes did it's
743
entry.executable = True
745
entry.executable = False
746
if (carry_over_possible and
747
parent_entry.executable == entry.executable):
748
# Check the file length, content hash after reading
750
nostore_sha = parent_entry.text_sha1
753
file_obj, stat_value = tree.get_file_with_stat(file_id, change[1][1])
755
text = file_obj.read()
759
entry.text_sha1, entry.text_size = self._add_text_to_weave(
760
file_id, text, heads, nostore_sha)
761
yield file_id, change[1][1], (entry.text_sha1, stat_value)
762
except errors.ExistingContent:
763
# No content change against a carry_over parent
764
# Perhaps this should also yield a fs hash update?
766
entry.text_size = parent_entry.text_size
767
entry.text_sha1 = parent_entry.text_sha1
768
elif kind == 'symlink':
770
entry.symlink_target = tree.get_symlink_target(file_id)
771
if (carry_over_possible and
772
parent_entry.symlink_target == entry.symlink_target):
775
self._add_text_to_weave(change[0], '', heads, None)
776
elif kind == 'directory':
777
if carry_over_possible:
780
# Nothing to set on the entry.
781
# XXX: split into the Root and nonRoot versions.
782
if change[1][1] != '' or self.repository.supports_rich_root():
783
self._add_text_to_weave(change[0], '', heads, None)
784
elif kind == 'tree-reference':
785
if not self.repository._format.supports_tree_reference:
786
# This isn't quite sane as an error, but we shouldn't
787
# ever see this code path in practice: tree's don't
788
# permit references when the repo doesn't support tree
790
raise errors.UnsupportedOperation(tree.add_reference,
792
reference_revision = tree.get_reference_revision(change[0])
793
entry.reference_revision = reference_revision
794
if (carry_over_possible and
795
parent_entry.reference_revision == reference_revision):
798
self._add_text_to_weave(change[0], '', heads, None)
800
raise AssertionError('unknown kind %r' % kind)
802
entry.revision = modified_rev
804
entry.revision = parent_entry.revision
807
new_path = change[1][1]
808
inv_delta.append((change[1][0], new_path, change[0], entry))
811
self.new_inventory = None
813
# This should perhaps be guarded by a check that the basis we
814
# commit against is the basis for the commit and if not do a delta
816
self._any_changes = True
818
# housekeeping root entry changes do not affect no-change commits.
819
self._require_root_change(tree)
820
self.basis_delta_revision = basis_revision_id
822
def _add_text_to_weave(self, file_id, new_text, parents, nostore_sha):
823
parent_keys = tuple([(file_id, parent) for parent in parents])
824
return self.repository.texts._add_text(
825
(file_id, self._new_revision_id), parent_keys, new_text,
826
nostore_sha=nostore_sha, random_id=self.random_revid)[0:2]
422
829
class RootCommitBuilder(CommitBuilder):
423
830
"""This commitbuilder actually records the root id"""
425
832
# the root entry gets versioned properly by this builder.
426
833
_versioned_root = True
966
def add_fallback_repository(self, repository):
967
"""Add a repository to use for looking up data not held locally.
969
:param repository: A repository.
971
if not self._format.supports_external_lookups:
972
raise errors.UnstackableRepositoryFormat(self._format, self.base)
974
# This repository will call fallback.unlock() when we transition to
975
# the unlocked state, so we make sure to increment the lock count
976
repository.lock_read()
977
self._check_fallback_repository(repository)
978
self._fallback_repositories.append(repository)
979
self.texts.add_fallback_versioned_files(repository.texts)
980
self.inventories.add_fallback_versioned_files(repository.inventories)
981
self.revisions.add_fallback_versioned_files(repository.revisions)
982
self.signatures.add_fallback_versioned_files(repository.signatures)
983
if self.chk_bytes is not None:
984
self.chk_bytes.add_fallback_versioned_files(repository.chk_bytes)
986
def _check_fallback_repository(self, repository):
987
"""Check that this repository can fallback to repository safely.
989
Raise an error if not.
991
:param repository: A repository to fallback to.
993
return InterRepository._assert_same_model(self, repository)
489
995
def add_inventory(self, revision_id, inv, parents):
490
996
"""Add the inventory inv to the repository as revision_id.
492
998
:param parents: The revision ids of the parents that revision_id
493
999
is known to have and are in the repository already.
495
returns the sha1 of the serialized inventory.
1001
:returns: The validator(which is a sha1 digest, though what is sha'd is
1002
repository format specific) of the serialized inventory.
497
assert self.is_in_write_group()
1004
if not self.is_in_write_group():
1005
raise AssertionError("%r not in write group" % (self,))
498
1006
_mod_revision.check_not_reserved_id(revision_id)
499
assert inv.revision_id is None or inv.revision_id == revision_id, \
500
"Mismatch between inventory revision" \
501
" id and insertion revid (%r, %r)" % (inv.revision_id, revision_id)
502
assert inv.root is not None
1007
if not (inv.revision_id is None or inv.revision_id == revision_id):
1008
raise AssertionError(
1009
"Mismatch between inventory revision"
1010
" id and insertion revid (%r, %r)"
1011
% (inv.revision_id, revision_id))
1012
if inv.root is None:
1013
raise AssertionError()
1014
return self._add_inventory_checked(revision_id, inv, parents)
1016
def _add_inventory_checked(self, revision_id, inv, parents):
1017
"""Add inv to the repository after checking the inputs.
1019
This function can be overridden to allow different inventory styles.
1021
:seealso: add_inventory, for the contract.
503
1023
inv_lines = self._serialise_inventory_to_lines(inv)
504
inv_vf = self.get_inventory_weave()
505
return self._inventory_add_lines(inv_vf, revision_id, parents,
1024
return self._inventory_add_lines(revision_id, parents,
506
1025
inv_lines, check_content=False)
508
def _inventory_add_lines(self, inv_vf, revision_id, parents, lines,
1027
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1028
parents, basis_inv=None, propagate_caches=False):
1029
"""Add a new inventory expressed as a delta against another revision.
1031
See the inventory developers documentation for the theory behind
1034
:param basis_revision_id: The inventory id the delta was created
1035
against. (This does not have to be a direct parent.)
1036
:param delta: The inventory delta (see Inventory.apply_delta for
1038
:param new_revision_id: The revision id that the inventory is being
1040
:param parents: The revision ids of the parents that revision_id is
1041
known to have and are in the repository already. These are supplied
1042
for repositories that depend on the inventory graph for revision
1043
graph access, as well as for those that pun ancestry with delta
1045
:param basis_inv: The basis inventory if it is already known,
1047
:param propagate_caches: If True, the caches for this inventory are
1048
copied to and updated for the result if possible.
1050
:returns: (validator, new_inv)
1051
The validator(which is a sha1 digest, though what is sha'd is
1052
repository format specific) of the serialized inventory, and the
1053
resulting inventory.
1055
if not self.is_in_write_group():
1056
raise AssertionError("%r not in write group" % (self,))
1057
_mod_revision.check_not_reserved_id(new_revision_id)
1058
basis_tree = self.revision_tree(basis_revision_id)
1059
basis_tree.lock_read()
1061
# Note that this mutates the inventory of basis_tree, which not all
1062
# inventory implementations may support: A better idiom would be to
1063
# return a new inventory, but as there is no revision tree cache in
1064
# repository this is safe for now - RBC 20081013
1065
if basis_inv is None:
1066
basis_inv = basis_tree.inventory
1067
basis_inv.apply_delta(delta)
1068
basis_inv.revision_id = new_revision_id
1069
return (self.add_inventory(new_revision_id, basis_inv, parents),
1074
def _inventory_add_lines(self, revision_id, parents, lines,
509
1075
check_content=True):
510
1076
"""Store lines in inv_vf and return the sha1 of the inventory."""
512
for parent in parents:
514
final_parents.append(parent)
515
return inv_vf.add_lines(revision_id, final_parents, lines,
1077
parents = [(parent,) for parent in parents]
1078
result = self.inventories.add_lines((revision_id,), parents, lines,
516
1079
check_content=check_content)[0]
1080
self.inventories._access.flush()
519
1083
def add_revision(self, revision_id, rev, inv=None, config=None):
520
1084
"""Add rev to the revision store as revision_id.
585
1155
Returns a set of the present revisions.
588
for id in revision_ids:
589
if self.has_revision(id):
1158
graph = self.get_graph()
1159
parent_map = graph.get_parent_map(revision_ids)
1160
# The old API returned a list, should this actually be a set?
1161
return parent_map.keys()
1163
def _check_inventories(self, checker):
1164
"""Check the inventories found from the revision scan.
1166
This is responsible for verifying the sha1 of inventories and
1167
creating a pending_keys set that covers data referenced by inventories.
1169
bar = ui.ui_factory.nested_progress_bar()
1171
self._do_check_inventories(checker, bar)
1175
def _do_check_inventories(self, checker, bar):
1176
"""Helper for _check_inventories."""
1178
keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1179
kinds = ['chk_bytes', 'texts']
1180
count = len(checker.pending_keys)
1181
bar.update("inventories", 0, 2)
1182
current_keys = checker.pending_keys
1183
checker.pending_keys = {}
1184
# Accumulate current checks.
1185
for key in current_keys:
1186
if key[0] != 'inventories' and key[0] not in kinds:
1187
checker._report_items.append('unknown key type %r' % (key,))
1188
keys[key[0]].add(key[1:])
1189
if keys['inventories']:
1190
# NB: output order *should* be roughly sorted - topo or
1191
# inverse topo depending on repository - either way decent
1192
# to just delta against. However, pre-CHK formats didn't
1193
# try to optimise inventory layout on disk. As such the
1194
# pre-CHK code path does not use inventory deltas.
1196
for record in self.inventories.check(keys=keys['inventories']):
1197
if record.storage_kind == 'absent':
1198
checker._report_items.append(
1199
'Missing inventory {%s}' % (record.key,))
1201
last_object = self._check_record('inventories', record,
1202
checker, last_object,
1203
current_keys[('inventories',) + record.key])
1204
del keys['inventories']
1207
bar.update("texts", 1)
1208
while (checker.pending_keys or keys['chk_bytes']
1210
# Something to check.
1211
current_keys = checker.pending_keys
1212
checker.pending_keys = {}
1213
# Accumulate current checks.
1214
for key in current_keys:
1215
if key[0] not in kinds:
1216
checker._report_items.append('unknown key type %r' % (key,))
1217
keys[key[0]].add(key[1:])
1218
# Check the outermost kind only - inventories || chk_bytes || texts
1222
for record in getattr(self, kind).check(keys=keys[kind]):
1223
if record.storage_kind == 'absent':
1224
checker._report_items.append(
1225
'Missing %s {%s}' % (kind, record.key,))
1227
last_object = self._check_record(kind, record,
1228
checker, last_object, current_keys[(kind,) + record.key])
1232
def _check_record(self, kind, record, checker, last_object, item_data):
1233
"""Check a single text from this repository."""
1234
if kind == 'inventories':
1235
rev_id = record.key[0]
1236
inv = self.deserialise_inventory(rev_id,
1237
record.get_bytes_as('fulltext'))
1238
if last_object is not None:
1239
delta = inv._make_delta(last_object)
1240
for old_path, path, file_id, ie in delta:
1243
ie.check(checker, rev_id, inv)
1245
for path, ie in inv.iter_entries():
1246
ie.check(checker, rev_id, inv)
1247
if self._format.fast_deltas:
1249
elif kind == 'chk_bytes':
1250
# No code written to check chk_bytes for this repo format.
1251
checker._report_items.append(
1252
'unsupported key type chk_bytes for %s' % (record.key,))
1253
elif kind == 'texts':
1254
self._check_text(record, checker, item_data)
1256
checker._report_items.append(
1257
'unknown key type %s for %s' % (kind, record.key))
1259
def _check_text(self, record, checker, item_data):
1260
"""Check a single text."""
1261
# Check it is extractable.
1262
# TODO: check length.
1263
if record.storage_kind == 'chunked':
1264
chunks = record.get_bytes_as(record.storage_kind)
1265
sha1 = osutils.sha_strings(chunks)
1266
length = sum(map(len, chunks))
1268
content = record.get_bytes_as('fulltext')
1269
sha1 = osutils.sha_string(content)
1270
length = len(content)
1271
if item_data and sha1 != item_data[1]:
1272
checker._report_items.append(
1273
'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1274
(record.key, sha1, item_data[1], item_data[2]))
594
1277
def create(a_bzrdir):
595
1278
"""Construct the current default format repository in a_bzrdir."""
596
1279
return RepositoryFormat.get_default_format().initialize(a_bzrdir)
598
def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
1281
def __init__(self, _format, a_bzrdir, control_files):
599
1282
"""instantiate a Repository.
601
1284
:param _format: The format of the repository on disk.
822
1543
"""Commit the contents accrued within the current write group.
824
1545
:seealso: start_write_group.
1547
:return: it may return an opaque hint that can be passed to 'pack'.
826
1549
if self._write_group is not self.get_transaction():
827
1550
# has an unlock or relock occured ?
828
1551
raise errors.BzrError('mismatched lock context %r and '
829
1552
'write group %r.' %
830
1553
(self.get_transaction(), self._write_group))
831
self._commit_write_group()
1554
result = self._commit_write_group()
832
1555
self._write_group = None
834
1558
def _commit_write_group(self):
835
1559
"""Template method for per-repository write group cleanup.
837
This is called before the write group is considered to be
1561
This is called before the write group is considered to be
838
1562
finished and should ensure that all data handed to the repository
839
for writing during the write group is safely committed (to the
1563
for writing during the write group is safely committed (to the
840
1564
extent possible considering file system caching etc).
843
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
1567
def suspend_write_group(self):
1568
raise errors.UnsuspendableWriteGroup(self)
1570
def get_missing_parent_inventories(self, check_for_missing_texts=True):
1571
"""Return the keys of missing inventory parents for revisions added in
1574
A revision is not complete if the inventory delta for that revision
1575
cannot be calculated. Therefore if the parent inventories of a
1576
revision are not present, the revision is incomplete, and e.g. cannot
1577
be streamed by a smart server. This method finds missing inventory
1578
parents for revisions added in this write group.
1580
if not self._format.supports_external_lookups:
1581
# This is only an issue for stacked repositories
1583
if not self.is_in_write_group():
1584
raise AssertionError('not in a write group')
1586
# XXX: We assume that every added revision already has its
1587
# corresponding inventory, so we only check for parent inventories that
1588
# might be missing, rather than all inventories.
1589
parents = set(self.revisions._index.get_missing_parents())
1590
parents.discard(_mod_revision.NULL_REVISION)
1591
unstacked_inventories = self.inventories._index
1592
present_inventories = unstacked_inventories.get_parent_map(
1593
key[-1:] for key in parents)
1594
parents.difference_update(present_inventories)
1595
if len(parents) == 0:
1596
# No missing parent inventories.
1598
if not check_for_missing_texts:
1599
return set(('inventories', rev_id) for (rev_id,) in parents)
1600
# Ok, now we have a list of missing inventories. But these only matter
1601
# if the inventories that reference them are missing some texts they
1602
# appear to introduce.
1603
# XXX: Texts referenced by all added inventories need to be present,
1604
# but at the moment we're only checking for texts referenced by
1605
# inventories at the graph's edge.
1606
key_deps = self.revisions._index._key_dependencies
1607
key_deps.satisfy_refs_for_keys(present_inventories)
1608
referrers = frozenset(r[0] for r in key_deps.get_referrers())
1609
file_ids = self.fileids_altered_by_revision_ids(referrers)
1610
missing_texts = set()
1611
for file_id, version_ids in file_ids.iteritems():
1612
missing_texts.update(
1613
(file_id, version_id) for version_id in version_ids)
1614
present_texts = self.texts.get_parent_map(missing_texts)
1615
missing_texts.difference_update(present_texts)
1616
if not missing_texts:
1617
# No texts are missing, so all revisions and their deltas are
1620
# Alternatively the text versions could be returned as the missing
1621
# keys, but this is likely to be less data.
1622
missing_keys = set(('inventories', rev_id) for (rev_id,) in parents)
1625
def refresh_data(self):
1626
"""Re-read any data needed to to synchronise with disk.
1628
This method is intended to be called after another repository instance
1629
(such as one used by a smart server) has inserted data into the
1630
repository. It may not be called during a write group, but may be
1631
called at any other time.
1633
if self.is_in_write_group():
1634
raise errors.InternalBzrError(
1635
"May not refresh_data while in a write group.")
1636
self._refresh_data()
1638
def resume_write_group(self, tokens):
1639
if not self.is_write_locked():
1640
raise errors.NotWriteLocked(self)
1641
if self._write_group:
1642
raise errors.BzrError('already in a write group')
1643
self._resume_write_group(tokens)
1644
# so we can detect unlock/relock - the write group is now entered.
1645
self._write_group = self.get_transaction()
1647
def _resume_write_group(self, tokens):
1648
raise errors.UnsuspendableWriteGroup(self)
1650
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
844
1652
"""Fetch the content required to construct revision_id from source.
846
If revision_id is None all content is copied.
1654
If revision_id is None and fetch_spec is None, then all content is
1657
fetch() may not be used when the repository is in a write group -
1658
either finish the current write group before using fetch, or use
1659
fetch before starting the write group.
847
1661
:param find_ghosts: Find and copy revisions in the source that are
848
1662
ghosts in the target (and not reachable directly by walking out to
849
1663
the first-present revision in target from revision_id).
1664
:param revision_id: If specified, all the content needed for this
1665
revision ID will be copied to the target. Fetch will determine for
1666
itself which content needs to be copied.
1667
:param fetch_spec: If specified, a SearchResult or
1668
PendingAncestryResult that describes which revisions to copy. This
1669
allows copying multiple heads at once. Mutually exclusive with
1672
if fetch_spec is not None and revision_id is not None:
1673
raise AssertionError(
1674
"fetch_spec and revision_id are mutually exclusive.")
1675
if self.is_in_write_group():
1676
raise errors.InternalBzrError(
1677
"May not fetch while in a write group.")
851
1678
# fast path same-url fetch operations
852
if self.has_same_location(source):
1679
# TODO: lift out to somewhere common with RemoteRepository
1680
# <https://bugs.edge.launchpad.net/bzr/+bug/401646>
1681
if (self.has_same_location(source)
1682
and fetch_spec is None
1683
and self._has_same_fallbacks(source)):
853
1684
# check that last_revision is in 'from' and then return a
855
1686
if (revision_id is not None and
856
1687
not _mod_revision.is_null(revision_id)):
857
1688
self.get_revision(revision_id)
1690
# if there is no specific appropriate InterRepository, this will get
1691
# the InterRepository base class, which raises an
1692
# IncompatibleRepositories when asked to fetch.
859
1693
inter = InterRepository.get(source, self)
861
return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
862
except NotImplementedError:
863
raise errors.IncompatibleRepositories(source, self)
1694
return inter.fetch(revision_id=revision_id, pb=pb,
1695
find_ghosts=find_ghosts, fetch_spec=fetch_spec)
865
1697
def create_bundle(self, target, base, fileobj, format=None):
866
1698
return serializer.write_bundle(self, target, base, fileobj, format)
988
1848
@needs_read_lock
989
1849
def get_revisions(self, revision_ids):
990
"""Get many revisions at once."""
1850
"""Get many revisions at once.
1852
Repositories that need to check data on every revision read should
1853
subclass this method.
991
1855
return self._get_revisions(revision_ids)
993
1857
@needs_read_lock
994
1858
def _get_revisions(self, revision_ids):
995
1859
"""Core work logic to get many revisions without sanity checks."""
996
for rev_id in revision_ids:
997
if not rev_id or not isinstance(rev_id, basestring):
998
raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
999
revs = self._revision_store.get_revisions(revision_ids,
1000
self.get_transaction())
1002
assert not isinstance(rev.revision_id, unicode)
1003
for parent_id in rev.parent_ids:
1004
assert not isinstance(parent_id, unicode)
1861
for revid, rev in self._iter_revisions(revision_ids):
1863
raise errors.NoSuchRevision(self, revid)
1865
return [revs[revid] for revid in revision_ids]
1867
def _iter_revisions(self, revision_ids):
1868
"""Iterate over revision objects.
1870
:param revision_ids: An iterable of revisions to examine. None may be
1871
passed to request all revisions known to the repository. Note that
1872
not all repositories can find unreferenced revisions; for those
1873
repositories only referenced ones will be returned.
1874
:return: An iterator of (revid, revision) tuples. Absent revisions (
1875
those asked for but not available) are returned as (revid, None).
1877
if revision_ids is None:
1878
revision_ids = self.all_revision_ids()
1880
for rev_id in revision_ids:
1881
if not rev_id or not isinstance(rev_id, basestring):
1882
raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
1883
keys = [(key,) for key in revision_ids]
1884
stream = self.revisions.get_record_stream(keys, 'unordered', True)
1885
for record in stream:
1886
revid = record.key[0]
1887
if record.storage_kind == 'absent':
1890
text = record.get_bytes_as('fulltext')
1891
rev = self._serializer.read_revision_from_string(text)
1007
1894
@needs_read_lock
1008
1895
def get_revision_xml(self, revision_id):
1009
1896
# TODO: jam 20070210 This shouldn't be necessary since get_revision
1010
1897
# would have already do it.
1011
1898
# TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1899
# TODO: this can't just be replaced by:
1900
# return self._serializer.write_revision_to_string(
1901
# self.get_revision(revision_id))
1902
# as cStringIO preservers the encoding unlike write_revision_to_string
1903
# or some other call down the path.
1012
1904
rev = self.get_revision(revision_id)
1013
rev_tmp = StringIO()
1905
rev_tmp = cStringIO.StringIO()
1014
1906
# the current serializer..
1015
self._revision_store._serializer.write_revision(rev, rev_tmp)
1907
self._serializer.write_revision(rev, rev_tmp)
1016
1908
rev_tmp.seek(0)
1017
1909
return rev_tmp.getvalue()
1020
def get_deltas_for_revisions(self, revisions):
1911
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1021
1912
"""Produce a generator of revision deltas.
1023
1914
Note that the input is a sequence of REVISIONS, not revision_ids.
1024
1915
Trees will be held in memory until the generator exits.
1025
1916
Each delta is relative to the revision's lefthand predecessor.
1918
:param specific_fileids: if not None, the result is filtered
1919
so that only those file-ids, their parents and their
1920
children are included.
1922
# Get the revision-ids of interest
1027
1923
required_trees = set()
1028
1924
for revision in revisions:
1029
1925
required_trees.add(revision.revision_id)
1030
1926
required_trees.update(revision.parent_ids[:1])
1031
trees = dict((t.get_revision_id(), t) for
1032
t in self.revision_trees(required_trees))
1928
# Get the matching filtered trees. Note that it's more
1929
# efficient to pass filtered trees to changes_from() rather
1930
# than doing the filtering afterwards. changes_from() could
1931
# arguably do the filtering itself but it's path-based, not
1932
# file-id based, so filtering before or afterwards is
1934
if specific_fileids is None:
1935
trees = dict((t.get_revision_id(), t) for
1936
t in self.revision_trees(required_trees))
1938
trees = dict((t.get_revision_id(), t) for
1939
t in self._filtered_revision_trees(required_trees,
1942
# Calculate the deltas
1033
1943
for revision in revisions:
1034
1944
if not revision.parent_ids:
1035
old_tree = self.revision_tree(None)
1945
old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
1037
1947
old_tree = trees[revision.parent_ids[0]]
1038
1948
yield trees[revision.revision_id].changes_from(old_tree)
1040
1950
@needs_read_lock
1041
def get_revision_delta(self, revision_id):
1951
def get_revision_delta(self, revision_id, specific_fileids=None):
1042
1952
"""Return the delta for one revision.
1044
1954
The delta is relative to the left-hand predecessor of the
1957
:param specific_fileids: if not None, the result is filtered
1958
so that only those file-ids, their parents and their
1959
children are included.
1047
1961
r = self.get_revision(revision_id)
1048
return list(self.get_deltas_for_revisions([r]))[0]
1962
return list(self.get_deltas_for_revisions([r],
1963
specific_fileids=specific_fileids))[0]
1050
1965
@needs_write_lock
1051
1966
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1052
1967
signature = gpg_strategy.sign(plaintext)
1053
self._revision_store.add_revision_signature_text(revision_id,
1055
self.get_transaction())
1057
def _find_file_ids_from_xml_inventory_lines(self, line_iterator,
1059
"""Helper routine for fileids_altered_by_revision_ids.
1968
self.add_signature_text(revision_id, signature)
1971
def add_signature_text(self, revision_id, signature):
1972
self.signatures.add_lines((revision_id,), (),
1973
osutils.split_lines(signature))
1975
def find_text_key_references(self):
1976
"""Find the text key references within the repository.
1978
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1979
to whether they were referred to by the inventory of the
1980
revision_id that they contain. The inventory texts from all present
1981
revision ids are assessed to generate this report.
1983
revision_keys = self.revisions.keys()
1984
w = self.inventories
1985
pb = ui.ui_factory.nested_progress_bar()
1987
return self._find_text_key_references_from_xml_inventory_lines(
1988
w.iter_lines_added_or_present_in_keys(revision_keys, pb=pb))
1992
def _find_text_key_references_from_xml_inventory_lines(self,
1994
"""Core routine for extracting references to texts from inventories.
1061
1996
This performs the translation of xml lines to revision ids.
1063
:param line_iterator: An iterator of lines
1064
:param revision_ids: The revision ids to filter for. This should be a
1065
set or other type which supports efficient __contains__ lookups, as
1066
the revision id from each parsed line will be looked up in the
1067
revision_ids filter.
1068
:return: a dictionary mapping altered file-ids to an iterable of
1069
revision_ids. Each altered file-ids has the exact revision_ids that
1070
altered it listed explicitly.
1998
:param line_iterator: An iterator of lines, origin_version_id
1999
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
2000
to whether they were referred to by the inventory of the
2001
revision_id that they contain. Note that if that revision_id was
2002
not part of the line_iterator's output then False will be given -
2003
even though it may actually refer to that key.
2005
if not self._serializer.support_altered_by_hack:
2006
raise AssertionError(
2007
"_find_text_key_references_from_xml_inventory_lines only "
2008
"supported for branches which store inventory as unnested xml"
2009
", not on %r" % self)
1074
2012
# this code needs to read every new line in every inventory for the
1075
2013
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
1076
# not present in one of those inventories is unnecessary but not
2014
# not present in one of those inventories is unnecessary but not
1077
2015
# harmful because we are filtering by the revision id marker in the
1078
# inventory lines : we only select file ids altered in one of those
2016
# inventory lines : we only select file ids altered in one of those
1079
2017
# revisions. We don't need to see all lines in the inventory because
1080
2018
# only those added in an inventory in rev X can contain a revision=X
1114
2052
unescape_revid_cache[revision_id] = unescaped
1115
2053
revision_id = unescaped
1117
if revision_id in revision_ids:
1119
file_id = unescape_fileid_cache[file_id]
1121
unescaped = unescape(file_id)
1122
unescape_fileid_cache[file_id] = unescaped
1124
setdefault(file_id, set()).add(revision_id)
1127
def fileids_altered_by_revision_ids(self, revision_ids):
2055
# Note that unconditionally unescaping means that we deserialise
2056
# every fileid, which for general 'pull' is not great, but we don't
2057
# really want to have some many fulltexts that this matters anyway.
2060
file_id = unescape_fileid_cache[file_id]
2062
unescaped = unescape(file_id)
2063
unescape_fileid_cache[file_id] = unescaped
2066
key = (file_id, revision_id)
2067
setdefault(key, False)
2068
if revision_id == line_key[-1]:
2072
def _inventory_xml_lines_for_keys(self, keys):
2073
"""Get a line iterator of the sort needed for findind references.
2075
Not relevant for non-xml inventory repositories.
2077
Ghosts in revision_keys are ignored.
2079
:param revision_keys: The revision keys for the inventories to inspect.
2080
:return: An iterator over (inventory line, revid) for the fulltexts of
2081
all of the xml inventories specified by revision_keys.
2083
stream = self.inventories.get_record_stream(keys, 'unordered', True)
2084
for record in stream:
2085
if record.storage_kind != 'absent':
2086
chunks = record.get_bytes_as('chunked')
2087
revid = record.key[-1]
2088
lines = osutils.chunks_to_lines(chunks)
2092
def _find_file_ids_from_xml_inventory_lines(self, line_iterator,
2094
"""Helper routine for fileids_altered_by_revision_ids.
2096
This performs the translation of xml lines to revision ids.
2098
:param line_iterator: An iterator of lines, origin_version_id
2099
:param revision_keys: The revision ids to filter for. This should be a
2100
set or other type which supports efficient __contains__ lookups, as
2101
the revision key from each parsed line will be looked up in the
2102
revision_keys filter.
2103
:return: a dictionary mapping altered file-ids to an iterable of
2104
revision_ids. Each altered file-ids has the exact revision_ids that
2105
altered it listed explicitly.
2107
seen = set(self._find_text_key_references_from_xml_inventory_lines(
2108
line_iterator).iterkeys())
2109
parent_keys = self._find_parent_keys_of_revisions(revision_keys)
2110
parent_seen = set(self._find_text_key_references_from_xml_inventory_lines(
2111
self._inventory_xml_lines_for_keys(parent_keys)))
2112
new_keys = seen - parent_seen
2114
setdefault = result.setdefault
2115
for key in new_keys:
2116
setdefault(key[0], set()).add(key[-1])
2119
def _find_parent_ids_of_revisions(self, revision_ids):
2120
"""Find all parent ids that are mentioned in the revision graph.
2122
:return: set of revisions that are parents of revision_ids which are
2123
not part of revision_ids themselves
2125
parent_map = self.get_parent_map(revision_ids)
2127
map(parent_ids.update, parent_map.itervalues())
2128
parent_ids.difference_update(revision_ids)
2129
parent_ids.discard(_mod_revision.NULL_REVISION)
2132
def _find_parent_keys_of_revisions(self, revision_keys):
2133
"""Similar to _find_parent_ids_of_revisions, but used with keys.
2135
:param revision_keys: An iterable of revision_keys.
2136
:return: The parents of all revision_keys that are not already in
2139
parent_map = self.revisions.get_parent_map(revision_keys)
2141
map(parent_keys.update, parent_map.itervalues())
2142
parent_keys.difference_update(revision_keys)
2143
parent_keys.discard(_mod_revision.NULL_REVISION)
2146
def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
1128
2147
"""Find the file ids and versions affected by revisions.
1130
2149
:param revisions: an iterable containing revision ids.
2150
:param _inv_weave: The inventory weave from this repository or None.
2151
If None, the inventory weave will be opened automatically.
1131
2152
:return: a dictionary mapping altered file-ids to an iterable of
1132
2153
revision_ids. Each altered file-ids has the exact revision_ids that
1133
2154
altered it listed explicitly.
1135
assert self._serializer.support_altered_by_hack, \
1136
("fileids_altered_by_revision_ids only supported for branches "
1137
"which store inventory as unnested xml, not on %r" % self)
1138
selected_revision_ids = set(revision_ids)
1139
w = self.get_inventory_weave()
2156
selected_keys = set((revid,) for revid in revision_ids)
2157
w = _inv_weave or self.inventories
1140
2158
pb = ui.ui_factory.nested_progress_bar()
1142
2160
return self._find_file_ids_from_xml_inventory_lines(
1143
w.iter_lines_added_or_present_in_versions(
1144
selected_revision_ids, pb=pb),
1145
selected_revision_ids)
2161
w.iter_lines_added_or_present_in_keys(
2162
selected_keys, pb=pb),
1160
2178
bytes_iterator is an iterable of bytestrings for the file. The
1161
2179
kind of iterable and length of the bytestrings are unspecified, but for
1162
this implementation, it is a list of lines produced by
1163
VersionedFile.get_lines().
2180
this implementation, it is a list of bytes produced by
2181
VersionedFile.get_record_stream().
1165
2183
:param desired_files: a list of (file_id, revision_id, identifier)
1168
transaction = self.get_transaction()
1169
2187
for file_id, revision_id, callable_data in desired_files:
1171
weave = self.weave_store.get_weave(file_id, transaction)
1172
except errors.NoSuchFile:
1173
raise errors.NoSuchIdInRepository(self, file_id)
1174
yield callable_data, weave.get_lines(revision_id)
2188
text_keys[(file_id, revision_id)] = callable_data
2189
for record in self.texts.get_record_stream(text_keys, 'unordered', True):
2190
if record.storage_kind == 'absent':
2191
raise errors.RevisionNotPresent(record.key, self)
2192
yield text_keys[record.key], record.get_bytes_as('chunked')
2194
def _generate_text_key_index(self, text_key_references=None,
2196
"""Generate a new text key index for the repository.
2198
This is an expensive function that will take considerable time to run.
2200
:return: A dict mapping text keys ((file_id, revision_id) tuples) to a
2201
list of parents, also text keys. When a given key has no parents,
2202
the parents list will be [NULL_REVISION].
2204
# All revisions, to find inventory parents.
2205
if ancestors is None:
2206
graph = self.get_graph()
2207
ancestors = graph.get_parent_map(self.all_revision_ids())
2208
if text_key_references is None:
2209
text_key_references = self.find_text_key_references()
2210
pb = ui.ui_factory.nested_progress_bar()
2212
return self._do_generate_text_key_index(ancestors,
2213
text_key_references, pb)
2217
def _do_generate_text_key_index(self, ancestors, text_key_references, pb):
2218
"""Helper for _generate_text_key_index to avoid deep nesting."""
2219
revision_order = tsort.topo_sort(ancestors)
2220
invalid_keys = set()
2222
for revision_id in revision_order:
2223
revision_keys[revision_id] = set()
2224
text_count = len(text_key_references)
2225
# a cache of the text keys to allow reuse; costs a dict of all the
2226
# keys, but saves a 2-tuple for every child of a given key.
2228
for text_key, valid in text_key_references.iteritems():
2230
invalid_keys.add(text_key)
2232
revision_keys[text_key[1]].add(text_key)
2233
text_key_cache[text_key] = text_key
2234
del text_key_references
2236
text_graph = graph.Graph(graph.DictParentsProvider(text_index))
2237
NULL_REVISION = _mod_revision.NULL_REVISION
2238
# Set a cache with a size of 10 - this suffices for bzr.dev but may be
2239
# too small for large or very branchy trees. However, for 55K path
2240
# trees, it would be easy to use too much memory trivially. Ideally we
2241
# could gauge this by looking at available real memory etc, but this is
2242
# always a tricky proposition.
2243
inventory_cache = lru_cache.LRUCache(10)
2244
batch_size = 10 # should be ~150MB on a 55K path tree
2245
batch_count = len(revision_order) / batch_size + 1
2247
pb.update("Calculating text parents", processed_texts, text_count)
2248
for offset in xrange(batch_count):
2249
to_query = revision_order[offset * batch_size:(offset + 1) *
2253
for revision_id in to_query:
2254
parent_ids = ancestors[revision_id]
2255
for text_key in revision_keys[revision_id]:
2256
pb.update("Calculating text parents", processed_texts)
2257
processed_texts += 1
2258
candidate_parents = []
2259
for parent_id in parent_ids:
2260
parent_text_key = (text_key[0], parent_id)
2262
check_parent = parent_text_key not in \
2263
revision_keys[parent_id]
2265
# the parent parent_id is a ghost:
2266
check_parent = False
2267
# truncate the derived graph against this ghost.
2268
parent_text_key = None
2270
# look at the parent commit details inventories to
2271
# determine possible candidates in the per file graph.
2274
inv = inventory_cache[parent_id]
2276
inv = self.revision_tree(parent_id).inventory
2277
inventory_cache[parent_id] = inv
2279
parent_entry = inv[text_key[0]]
2280
except (KeyError, errors.NoSuchId):
2282
if parent_entry is not None:
2284
text_key[0], parent_entry.revision)
2286
parent_text_key = None
2287
if parent_text_key is not None:
2288
candidate_parents.append(
2289
text_key_cache[parent_text_key])
2290
parent_heads = text_graph.heads(candidate_parents)
2291
new_parents = list(parent_heads)
2292
new_parents.sort(key=lambda x:candidate_parents.index(x))
2293
if new_parents == []:
2294
new_parents = [NULL_REVISION]
2295
text_index[text_key] = new_parents
2297
for text_key in invalid_keys:
2298
text_index[text_key] = [NULL_REVISION]
1176
2301
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1177
2302
"""Get an iterable listing the keys of all the data introduced by a set
1184
2309
versions). knit-kind is one of 'file', 'inventory', 'signatures',
1185
2310
'revisions'. file-id is None unless knit-kind is 'file'.
2312
for result in self._find_file_keys_to_fetch(revision_ids, _files_pb):
2315
for result in self._find_non_file_keys_to_fetch(revision_ids):
2318
def _find_file_keys_to_fetch(self, revision_ids, pb):
1187
2319
# XXX: it's a bit weird to control the inventory weave caching in this
1188
2320
# generator. Ideally the caching would be done in fetch.py I think. Or
1189
2321
# maybe this generator should explicitly have the contract that it
1190
2322
# should not be iterated until the previously yielded item has been
1193
inv_w = self.get_inventory_weave()
1194
inv_w.enable_cache()
2324
inv_w = self.inventories
1196
2326
# file ids that changed
1197
file_ids = self.fileids_altered_by_revision_ids(revision_ids)
2327
file_ids = self.fileids_altered_by_revision_ids(revision_ids, inv_w)
1199
2329
num_file_ids = len(file_ids)
1200
2330
for file_id, altered_versions in file_ids.iteritems():
1201
if _files_pb is not None:
1202
_files_pb.update("fetch texts", count, num_file_ids)
2332
pb.update("fetch texts", count, num_file_ids)
1204
2334
yield ("file", file_id, altered_versions)
1205
# We're done with the files_pb. Note that it finished by the caller,
1206
# just as it was created by the caller.
2336
def _find_non_file_keys_to_fetch(self, revision_ids):
1210
2338
yield ("inventory", None, revision_ids)
1214
revisions_with_signatures = set()
1215
for rev_id in revision_ids:
1217
self.get_signature_text(rev_id)
1218
except errors.NoSuchRevision:
1222
revisions_with_signatures.add(rev_id)
2341
# XXX: Note ATM no callers actually pay attention to this return
2342
# instead they just use the list of revision ids and ignore
2343
# missing sigs. Consider removing this work entirely
2344
revisions_with_signatures = set(self.signatures.get_parent_map(
2345
[(r,) for r in revision_ids]))
2346
revisions_with_signatures = set(
2347
[r for (r,) in revisions_with_signatures])
2348
revisions_with_signatures.intersection_update(revision_ids)
1224
2349
yield ("signatures", None, revisions_with_signatures)
1227
2352
yield ("revisions", None, revision_ids)
1229
2354
@needs_read_lock
1230
def get_inventory_weave(self):
1231
return self.control_weaves.get_weave('inventory',
1232
self.get_transaction())
1235
2355
def get_inventory(self, revision_id):
1236
"""Get Inventory object by hash."""
1237
return self.deserialise_inventory(
1238
revision_id, self.get_inventory_xml(revision_id))
2356
"""Get Inventory object by revision id."""
2357
return self.iter_inventories([revision_id]).next()
2359
def iter_inventories(self, revision_ids, ordering=None):
2360
"""Get many inventories by revision_ids.
2362
This will buffer some or all of the texts used in constructing the
2363
inventories in memory, but will only parse a single inventory at a
2366
:param revision_ids: The expected revision ids of the inventories.
2367
:param ordering: optional ordering, e.g. 'topological'. If not
2368
specified, the order of revision_ids will be preserved (by
2369
buffering if necessary).
2370
:return: An iterator of inventories.
2372
if ((None in revision_ids)
2373
or (_mod_revision.NULL_REVISION in revision_ids)):
2374
raise ValueError('cannot get null revision inventory')
2375
return self._iter_inventories(revision_ids, ordering)
2377
def _iter_inventories(self, revision_ids, ordering):
2378
"""single-document based inventory iteration."""
2379
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2380
for text, revision_id in inv_xmls:
2381
yield self.deserialise_inventory(revision_id, text)
2383
def _iter_inventory_xmls(self, revision_ids, ordering):
2384
if ordering is None:
2385
order_as_requested = True
2386
ordering = 'unordered'
2388
order_as_requested = False
2389
keys = [(revision_id,) for revision_id in revision_ids]
2392
if order_as_requested:
2393
key_iter = iter(keys)
2394
next_key = key_iter.next()
2395
stream = self.inventories.get_record_stream(keys, ordering, True)
2397
for record in stream:
2398
if record.storage_kind != 'absent':
2399
chunks = record.get_bytes_as('chunked')
2400
if order_as_requested:
2401
text_chunks[record.key] = chunks
2403
yield ''.join(chunks), record.key[-1]
2405
raise errors.NoSuchRevision(self, record.key)
2406
if order_as_requested:
2407
# Yield as many results as we can while preserving order.
2408
while next_key in text_chunks:
2409
chunks = text_chunks.pop(next_key)
2410
yield ''.join(chunks), next_key[-1]
2412
next_key = key_iter.next()
2413
except StopIteration:
2414
# We still want to fully consume the get_record_stream,
2415
# just in case it is not actually finished at this point
1240
2419
def deserialise_inventory(self, revision_id, xml):
1241
"""Transform the xml into an inventory object.
2420
"""Transform the xml into an inventory object.
1243
2422
:param revision_id: The expected revision id of the inventory.
1244
2423
:param xml: A serialised inventory.
1246
return self._serializer.read_inventory_from_string(xml, revision_id)
2425
result = self._serializer.read_inventory_from_string(xml, revision_id,
2426
entry_cache=self._inventory_entry_cache)
2427
if result.revision_id != revision_id:
2428
raise AssertionError('revision id mismatch %s != %s' % (
2429
result.revision_id, revision_id))
1248
2432
def serialise_inventory(self, inv):
1249
2433
return self._serializer.write_inventory_to_string(inv)
1386
2545
for repositories to maintain loaded indices across multiple locks
1387
2546
by checking inside their implementation of this method to see
1388
2547
whether their indices are still valid. This depends of course on
1389
the disk format being validatable in this manner.
2548
the disk format being validatable in this manner. This method is
2549
also called by the refresh_data() public interface to cause a refresh
2550
to occur while in a write lock so that data inserted by a smart server
2551
push operation is visible on the client's instance of the physical
1392
2555
@needs_read_lock
1393
2556
def revision_tree(self, revision_id):
1394
2557
"""Return Tree for a revision on this branch.
1396
`revision_id` may be None for the empty tree revision.
2559
`revision_id` may be NULL_REVISION for the empty tree revision.
2561
revision_id = _mod_revision.ensure_null(revision_id)
1398
2562
# TODO: refactor this to use an existing revision object
1399
2563
# so we don't need to read it in twice.
1400
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
1401
return RevisionTree(self, Inventory(root_id=None),
2564
if revision_id == _mod_revision.NULL_REVISION:
2565
return RevisionTree(self, Inventory(root_id=None),
1402
2566
_mod_revision.NULL_REVISION)
1404
2568
inv = self.get_revision_inventory(revision_id)
1405
2569
return RevisionTree(self, inv, revision_id)
1408
2571
def revision_trees(self, revision_ids):
1409
"""Return Tree for a revision on this branch.
1411
`revision_id` may not be None or 'null:'"""
1412
assert None not in revision_ids
1413
assert _mod_revision.NULL_REVISION not in revision_ids
1414
texts = self.get_inventory_weave().get_texts(revision_ids)
1415
for text, revision_id in zip(texts, revision_ids):
1416
inv = self.deserialise_inventory(revision_id, text)
1417
yield RevisionTree(self, inv, revision_id)
2572
"""Return Trees for revisions in this repository.
2574
:param revision_ids: a sequence of revision-ids;
2575
a revision-id may not be None or 'null:'
2577
inventories = self.iter_inventories(revision_ids)
2578
for inv in inventories:
2579
yield RevisionTree(self, inv, inv.revision_id)
2581
def _filtered_revision_trees(self, revision_ids, file_ids):
2582
"""Return Tree for a revision on this branch with only some files.
2584
:param revision_ids: a sequence of revision-ids;
2585
a revision-id may not be None or 'null:'
2586
:param file_ids: if not None, the result is filtered
2587
so that only those file-ids, their parents and their
2588
children are included.
2590
inventories = self.iter_inventories(revision_ids)
2591
for inv in inventories:
2592
# Should we introduce a FilteredRevisionTree class rather
2593
# than pre-filter the inventory here?
2594
filtered_inv = inv.filter(file_ids)
2595
yield RevisionTree(self, filtered_inv, filtered_inv.revision_id)
1419
2597
@needs_read_lock
1420
2598
def get_ancestry(self, revision_id, topo_sorted=True):
1421
2599
"""Return a list of revision-ids integrated by a revision.
1423
The first element of the list is always None, indicating the origin
1424
revision. This might change when we have history horizons, or
2601
The first element of the list is always None, indicating the origin
2602
revision. This might change when we have history horizons, or
1425
2603
perhaps we should have a new API.
1427
2605
This is topologically sorted.
1429
2607
if _mod_revision.is_null(revision_id):
1431
2609
if not self.has_revision(revision_id):
1432
2610
raise errors.NoSuchRevision(self, revision_id)
1433
w = self.get_inventory_weave()
1434
candidates = w.get_ancestry(revision_id, topo_sorted)
1435
return [None] + candidates # self._eliminate_revisions_not_present(candidates)
2611
graph = self.get_graph()
2613
search = graph._make_breadth_first_searcher([revision_id])
2616
found, ghosts = search.next_with_ghosts()
2617
except StopIteration:
2620
if _mod_revision.NULL_REVISION in keys:
2621
keys.remove(_mod_revision.NULL_REVISION)
2623
parent_map = graph.get_parent_map(keys)
2624
keys = tsort.topo_sort(parent_map)
2625
return [None] + list(keys)
2627
def pack(self, hint=None):
1438
2628
"""Compress the data within the repository.
1440
2630
This operation only makes sense for some repository types. For other
1441
2631
types it should be a no-op that just returns.
1443
2633
This stub method does not require a lock, but subclasses should use
1444
@needs_write_lock as this is a long running call its reasonable to
2634
@needs_write_lock as this is a long running call its reasonable to
1445
2635
implicitly lock for the user.
1449
def print_file(self, file, revision_id):
1450
"""Print `file` to stdout.
1452
FIXME RBC 20060125 as John Meinel points out this is a bad api
1453
- it writes to stdout, it assumes that that is valid etc. Fix
1454
by creating a new more flexible convenience function.
2637
:param hint: If not supplied, the whole repository is packed.
2638
If supplied, the repository may use the hint parameter as a
2639
hint for the parts of the repository to pack. A hint can be
2640
obtained from the result of commit_write_group(). Out of
2641
date hints are simply ignored, because concurrent operations
2642
can obsolete them rapidly.
1456
tree = self.revision_tree(revision_id)
1457
# use inventory as it was in that revision
1458
file_id = tree.inventory.path2id(file)
1460
# TODO: jam 20060427 Write a test for this code path
1461
# it had a bug in it, and was raising the wrong
1463
raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
1464
tree.print_file(file_id)
1466
2645
def get_transaction(self):
1467
2646
return self.control_files.get_transaction()
1469
def revision_parents(self, revision_id):
1470
return self.get_inventory_weave().parent_names(revision_id)
1472
def get_parents(self, revision_ids):
1473
"""See StackedParentsProvider.get_parents"""
2648
def get_parent_map(self, revision_ids):
2649
"""See graph.StackedParentsProvider.get_parent_map"""
2650
# revisions index works in keys; this just works in revisions
2651
# therefore wrap and unwrap
1475
2654
for revision_id in revision_ids:
1476
2655
if revision_id == _mod_revision.NULL_REVISION:
1480
parents = self.get_revision(revision_id).parent_ids
1481
except errors.NoSuchRevision:
1484
if len(parents) == 0:
1485
parents = [_mod_revision.NULL_REVISION]
1486
parents_list.append(parents)
2656
result[revision_id] = ()
2657
elif revision_id is None:
2658
raise ValueError('get_parent_map(None) is not valid')
2660
query_keys.append((revision_id ,))
2661
for ((revision_id,), parent_keys) in \
2662
self.revisions.get_parent_map(query_keys).iteritems():
2664
result[revision_id] = tuple(parent_revid
2665
for (parent_revid,) in parent_keys)
2667
result[revision_id] = (_mod_revision.NULL_REVISION,)
1489
2670
def _make_parents_provider(self):
2022
3403
content is copied.
2023
3404
:param pb: optional progress bar to use for progress reports. If not
2024
3405
provided a default one will be created.
2026
Returns the copied revision count and the failed revisions in a tuple:
2029
raise NotImplementedError(self.fetch)
3408
from bzrlib.fetch import RepoFetcher
3409
f = RepoFetcher(to_repository=self.target,
3410
from_repository=self.source,
3411
last_revision=revision_id,
3412
fetch_spec=fetch_spec,
3413
pb=pb, find_ghosts=find_ghosts)
3415
def _walk_to_common_revisions(self, revision_ids):
3416
"""Walk out from revision_ids in source to revisions target has.
3418
:param revision_ids: The start point for the search.
3419
:return: A set of revision ids.
3421
target_graph = self.target.get_graph()
3422
revision_ids = frozenset(revision_ids)
3423
missing_revs = set()
3424
source_graph = self.source.get_graph()
3425
# ensure we don't pay silly lookup costs.
3426
searcher = source_graph._make_breadth_first_searcher(revision_ids)
3427
null_set = frozenset([_mod_revision.NULL_REVISION])
3428
searcher_exhausted = False
3432
# Iterate the searcher until we have enough next_revs
3433
while len(next_revs) < self._walk_to_common_revisions_batch_size:
3435
next_revs_part, ghosts_part = searcher.next_with_ghosts()
3436
next_revs.update(next_revs_part)
3437
ghosts.update(ghosts_part)
3438
except StopIteration:
3439
searcher_exhausted = True
3441
# If there are ghosts in the source graph, and the caller asked for
3442
# them, make sure that they are present in the target.
3443
# We don't care about other ghosts as we can't fetch them and
3444
# haven't been asked to.
3445
ghosts_to_check = set(revision_ids.intersection(ghosts))
3446
revs_to_get = set(next_revs).union(ghosts_to_check)
3448
have_revs = set(target_graph.get_parent_map(revs_to_get))
3449
# we always have NULL_REVISION present.
3450
have_revs = have_revs.union(null_set)
3451
# Check if the target is missing any ghosts we need.
3452
ghosts_to_check.difference_update(have_revs)
3454
# One of the caller's revision_ids is a ghost in both the
3455
# source and the target.
3456
raise errors.NoSuchRevision(
3457
self.source, ghosts_to_check.pop())
3458
missing_revs.update(next_revs - have_revs)
3459
# Because we may have walked past the original stop point, make
3460
# sure everything is stopped
3461
stop_revs = searcher.find_seen_ancestors(have_revs)
3462
searcher.stop_searching_any(stop_revs)
3463
if searcher_exhausted:
3465
return searcher.get_result()
2031
3467
@needs_read_lock
2032
def missing_revision_ids(self, revision_id=None):
3468
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
2033
3469
"""Return the revision ids that source has that target does not.
2035
These are returned in topological order.
2037
3471
:param revision_id: only return revision ids included by this
3473
:param find_ghosts: If True find missing revisions in deep history
3474
rather than just finding the surface difference.
3475
:return: A bzrlib.graph.SearchResult.
3477
# stop searching at found target revisions.
3478
if not find_ghosts and revision_id is not None:
3479
return self._walk_to_common_revisions([revision_id])
2040
3480
# generic, possibly worst case, slow code path.
2041
3481
target_ids = set(self.target.all_revision_ids())
2042
3482
if revision_id is not None:
2043
3483
source_ids = self.source.get_ancestry(revision_id)
2044
assert source_ids[0] is None
3484
if source_ids[0] is not None:
3485
raise AssertionError()
2045
3486
source_ids.pop(0)
2047
3488
source_ids = self.source.all_revision_ids()
2048
3489
result_set = set(source_ids).difference(target_ids)
2049
# this may look like a no-op: its not. It preserves the ordering
2050
# other_ids had while only returning the members from other_ids
2051
# that we've decided we need.
2052
return [rev_id for rev_id in source_ids if rev_id in result_set]
3490
return self.source.revision_ids_to_search_result(result_set)
2055
3493
def _same_model(source, target):
2056
"""True if source and target have the same data representation."""
3494
"""True if source and target have the same data representation.
3496
Note: this is always called on the base class; overriding it in a
3497
subclass will have no effect.
3500
InterRepository._assert_same_model(source, target)
3502
except errors.IncompatibleRepositories, e:
3506
def _assert_same_model(source, target):
3507
"""Raise an exception if two repositories do not use the same model.
2057
3509
if source.supports_rich_root() != target.supports_rich_root():
3510
raise errors.IncompatibleRepositories(source, target,
3511
"different rich-root support")
2059
3512
if source._serializer != target._serializer:
3513
raise errors.IncompatibleRepositories(source, target,
3514
"different serializers")
2064
3517
class InterSameDataRepository(InterRepository):
2065
3518
"""Code for converting between repositories that represent the same data.
2067
3520
Data format and model must match for this to work.
2071
3524
def _get_repo_format_to_test(self):
2072
3525
"""Repository format for testing with.
2074
3527
InterSameData can pull from subtree to subtree and from non-subtree to
2075
3528
non-subtree, so we test this with the richest repository format.
2289
3688
# we do not have a revision as that would be pointless.
2290
3689
target_ids = set(self.target.all_revision_ids())
2291
3690
possibly_present_revisions = target_ids.intersection(source_ids_set)
2292
actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
3691
actually_present_revisions = set(
3692
self.target._eliminate_revisions_not_present(possibly_present_revisions))
2293
3693
required_revisions = source_ids_set.difference(actually_present_revisions)
2294
required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2295
3694
if revision_id is not None:
2296
3695
# we used get_ancestry to determine source_ids then we are assured all
2297
3696
# revisions referenced are present as they are installed in topological order.
2298
3697
# and the tip revision was validated by get_ancestry.
2299
return required_topo_revisions
3698
result_set = required_revisions
2301
# if we just grabbed the possibly available ids, then
3700
# if we just grabbed the possibly available ids, then
2302
3701
# we only have an estimate of whats available and need to validate
2303
3702
# that against the revision records.
2304
return self.source._eliminate_revisions_not_present(required_topo_revisions)
2307
class InterPackRepo(InterSameDataRepository):
2308
"""Optimised code paths between Pack based repositories."""
3704
self.source._eliminate_revisions_not_present(required_revisions))
3705
return self.source.revision_ids_to_search_result(result_set)
3708
class InterDifferingSerializer(InterRepository):
2311
3711
def _get_repo_format_to_test(self):
2312
from bzrlib.repofmt import pack_repo
2313
return pack_repo.RepositoryFormatKnitPack1()
2316
3715
def is_compatible(source, target):
2317
"""Be compatible with known Pack formats.
2319
We don't test for the stores being of specific types because that
2320
could lead to confusing results, and there is no need to be
2323
from bzrlib.repofmt.pack_repo import RepositoryFormatPack
2325
are_packs = (isinstance(source._format, RepositoryFormatPack) and
2326
isinstance(target._format, RepositoryFormatPack))
2327
except AttributeError:
2329
return are_packs and InterRepository._same_model(source, target)
2332
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2333
"""See InterRepository.fetch()."""
2334
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2335
self.source, self.source._format, self.target, self.target._format)
2336
self.count_copied = 0
2337
if revision_id is None:
2339
# everything to do - use pack logic
2340
# to fetch from all packs to one without
2341
# inventory parsing etc, IFF nothing to be copied is in the target.
2343
revision_ids = self.source.all_revision_ids()
2344
# implementing the TODO will involve:
2345
# - detecting when all of a pack is selected
2346
# - avoiding as much as possible pre-selection, so the
2347
# more-core routines such as create_pack_from_packs can filter in
2348
# a just-in-time fashion. (though having a HEADS list on a
2349
# repository might make this a lot easier, because we could
2350
# sensibly detect 'new revisions' without doing a full index scan.
2351
elif _mod_revision.is_null(revision_id):
3716
"""Be compatible with Knit2 source and Knit3 target"""
3717
# This is redundant with format.check_conversion_target(), however that
3718
# raises an exception, and we just want to say "False" as in we won't
3719
# support converting between these formats.
3720
if 'IDS_never' in debug.debug_flags:
3722
if source.supports_rich_root() and not target.supports_rich_root():
3724
if (source._format.supports_tree_reference
3725
and not target._format.supports_tree_reference):
3727
if target._fallback_repositories and target._format.supports_chks:
3728
# IDS doesn't know how to copy CHKs for the parent inventories it
3729
# adds to stacked repos.
3731
if 'IDS_always' in debug.debug_flags:
3733
# Only use this code path for local source and target. IDS does far
3734
# too much IO (both bandwidth and roundtrips) over a network.
3735
if not source.bzrdir.transport.base.startswith('file:///'):
3737
if not target.bzrdir.transport.base.startswith('file:///'):
3741
def _get_trees(self, revision_ids, cache):
3743
for rev_id in revision_ids:
3745
possible_trees.append((rev_id, cache[rev_id]))
3747
# Not cached, but inventory might be present anyway.
3749
tree = self.source.revision_tree(rev_id)
3750
except errors.NoSuchRevision:
3751
# Nope, parent is ghost.
3754
cache[rev_id] = tree
3755
possible_trees.append((rev_id, tree))
3756
return possible_trees
3758
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3759
"""Get the best delta and base for this revision.
3761
:return: (basis_id, delta)
3764
# Generate deltas against each tree, to find the shortest.
3765
texts_possibly_new_in_tree = set()
3766
for basis_id, basis_tree in possible_trees:
3767
delta = tree.inventory._make_delta(basis_tree.inventory)
3768
for old_path, new_path, file_id, new_entry in delta:
3769
if new_path is None:
3770
# This file_id isn't present in the new rev, so we don't
3774
# Rich roots are handled elsewhere...
3776
kind = new_entry.kind
3777
if kind != 'directory' and kind != 'file':
3778
# No text record associated with this inventory entry.
3780
# This is a directory or file that has changed somehow.
3781
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3782
deltas.append((len(delta), basis_id, delta))
3784
return deltas[0][1:]
3786
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3787
"""Find all parent revisions that are absent, but for which the
3788
inventory is present, and copy those inventories.
3790
This is necessary to preserve correctness when the source is stacked
3791
without fallbacks configured. (Note that in cases like upgrade the
3792
source may be not have _fallback_repositories even though it is
3796
for parents in parent_map.values():
3797
parent_revs.update(parents)
3798
present_parents = self.source.get_parent_map(parent_revs)
3799
absent_parents = set(parent_revs).difference(present_parents)
3800
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3801
(rev_id,) for rev_id in absent_parents)
3802
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3803
for parent_tree in self.source.revision_trees(parent_inv_ids):
3804
current_revision_id = parent_tree.get_revision_id()
3805
parents_parents_keys = parent_invs_keys_for_stacking[
3806
(current_revision_id,)]
3807
parents_parents = [key[-1] for key in parents_parents_keys]
3808
basis_id = _mod_revision.NULL_REVISION
3809
basis_tree = self.source.revision_tree(basis_id)
3810
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3811
self.target.add_inventory_by_delta(
3812
basis_id, delta, current_revision_id, parents_parents)
3813
cache[current_revision_id] = parent_tree
3815
def _fetch_batch(self, revision_ids, basis_id, cache):
3816
"""Fetch across a few revisions.
3818
:param revision_ids: The revisions to copy
3819
:param basis_id: The revision_id of a tree that must be in cache, used
3820
as a basis for delta when no other base is available
3821
:param cache: A cache of RevisionTrees that we can use.
3822
:return: The revision_id of the last converted tree. The RevisionTree
3823
for it will be in cache
3825
# Walk though all revisions; get inventory deltas, copy referenced
3826
# texts that delta references, insert the delta, revision and
3828
root_keys_to_create = set()
3831
pending_revisions = []
3832
parent_map = self.source.get_parent_map(revision_ids)
3833
self._fetch_parent_invs_for_stacking(parent_map, cache)
3834
for tree in self.source.revision_trees(revision_ids):
3835
# Find a inventory delta for this revision.
3836
# Find text entries that need to be copied, too.
3837
current_revision_id = tree.get_revision_id()
3838
parent_ids = parent_map.get(current_revision_id, ())
3839
parent_trees = self._get_trees(parent_ids, cache)
3840
possible_trees = list(parent_trees)
3841
if len(possible_trees) == 0:
3842
# There either aren't any parents, or the parents are ghosts,
3843
# so just use the last converted tree.
3844
possible_trees.append((basis_id, cache[basis_id]))
3845
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3847
revision = self.source.get_revision(current_revision_id)
3848
pending_deltas.append((basis_id, delta,
3849
current_revision_id, revision.parent_ids))
3850
if self._converting_to_rich_root:
3851
self._revision_id_to_root_id[current_revision_id] = \
3853
# Determine which texts are in present in this revision but not in
3854
# any of the available parents.
3855
texts_possibly_new_in_tree = set()
3856
for old_path, new_path, file_id, entry in delta:
3857
if new_path is None:
3858
# This file_id isn't present in the new rev
3862
if not self.target.supports_rich_root():
3863
# The target doesn't support rich root, so we don't
3866
if self._converting_to_rich_root:
3867
# This can't be copied normally, we have to insert
3869
root_keys_to_create.add((file_id, entry.revision))
3872
texts_possibly_new_in_tree.add((file_id, entry.revision))
3873
for basis_id, basis_tree in possible_trees:
3874
basis_inv = basis_tree.inventory
3875
for file_key in list(texts_possibly_new_in_tree):
3876
file_id, file_revision = file_key
3878
entry = basis_inv[file_id]
3879
except errors.NoSuchId:
3881
if entry.revision == file_revision:
3882
texts_possibly_new_in_tree.remove(file_key)
3883
text_keys.update(texts_possibly_new_in_tree)
3884
pending_revisions.append(revision)
3885
cache[current_revision_id] = tree
3886
basis_id = current_revision_id
3888
from_texts = self.source.texts
3889
to_texts = self.target.texts
3890
if root_keys_to_create:
3891
from bzrlib.fetch import _new_root_data_stream
3892
root_stream = _new_root_data_stream(
3893
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3895
to_texts.insert_record_stream(root_stream)
3896
to_texts.insert_record_stream(from_texts.get_record_stream(
3897
text_keys, self.target._format._fetch_order,
3898
not self.target._format._fetch_uses_deltas))
3899
# insert inventory deltas
3900
for delta in pending_deltas:
3901
self.target.add_inventory_by_delta(*delta)
3902
if self.target._fallback_repositories:
3903
# Make sure this stacked repository has all the parent inventories
3904
# for the new revisions that we are about to insert. We do this
3905
# before adding the revisions so that no revision is added until
3906
# all the inventories it may depend on are added.
3907
# Note that this is overzealous, as we may have fetched these in an
3910
revision_ids = set()
3911
for revision in pending_revisions:
3912
revision_ids.add(revision.revision_id)
3913
parent_ids.update(revision.parent_ids)
3914
parent_ids.difference_update(revision_ids)
3915
parent_ids.discard(_mod_revision.NULL_REVISION)
3916
parent_map = self.source.get_parent_map(parent_ids)
3917
# we iterate over parent_map and not parent_ids because we don't
3918
# want to try copying any revision which is a ghost
3919
for parent_tree in self.source.revision_trees(parent_map):
3920
current_revision_id = parent_tree.get_revision_id()
3921
parents_parents = parent_map[current_revision_id]
3922
possible_trees = self._get_trees(parents_parents, cache)
3923
if len(possible_trees) == 0:
3924
# There either aren't any parents, or the parents are
3925
# ghosts, so just use the last converted tree.
3926
possible_trees.append((basis_id, cache[basis_id]))
3927
basis_id, delta = self._get_delta_for_revision(parent_tree,
3928
parents_parents, possible_trees)
3929
self.target.add_inventory_by_delta(
3930
basis_id, delta, current_revision_id, parents_parents)
3931
# insert signatures and revisions
3932
for revision in pending_revisions:
2356
revision_ids = self.missing_revision_ids(revision_id,
2357
find_ghosts=find_ghosts)
3934
signature = self.source.get_signature_text(
3935
revision.revision_id)
3936
self.target.add_signature_text(revision.revision_id,
2358
3938
except errors.NoSuchRevision:
2359
raise errors.InstallFailed([revision_id])
2360
packs = self.source._pack_collection.all_packs()
2361
pack = self.target._pack_collection.create_pack_from_packs(
2362
packs, '.fetch', revision_ids,
2364
if pack is not None:
2365
self.target._pack_collection._save_pack_names()
2366
# Trigger an autopack. This may duplicate effort as we've just done
2367
# a pack creation, but for now it is simpler to think about as
2368
# 'upload data, then repack if needed'.
2369
self.target._pack_collection.autopack()
2370
return pack.get_revision_count()
2375
def missing_revision_ids(self, revision_id=None, find_ghosts=True):
2376
"""See InterRepository.missing_revision_ids().
2378
:param find_ghosts: Find ghosts throughough the ancestry of
2381
if not find_ghosts and revision_id is not None:
2382
graph = self.source.get_graph()
2383
missing_revs = set()
2384
searcher = graph._make_breadth_first_searcher([revision_id])
2386
self.target._pack_collection.revision_index.combined_index
2387
null_set = frozenset([_mod_revision.NULL_REVISION])
2390
next_revs = set(searcher.next())
2391
except StopIteration:
2393
next_revs.difference_update(null_set)
2394
target_keys = [(key,) for key in next_revs]
2395
have_revs = frozenset(node[1][0] for node in
2396
target_index.iter_entries(target_keys))
2397
missing_revs.update(next_revs - have_revs)
2398
searcher.stop_searching_any(have_revs)
2400
elif revision_id is not None:
2401
source_ids = self.source.get_ancestry(revision_id)
2402
assert source_ids[0] is None
2405
source_ids = self.source.all_revision_ids()
2406
# source_ids is the worst possible case we may need to pull.
2407
# now we want to filter source_ids against what we actually
2408
# have in target, but don't try to check for existence where we know
2409
# we do not have a revision as that would be pointless.
2410
target_ids = set(self.target.all_revision_ids())
2411
return [r for r in source_ids if (r not in target_ids)]
2414
class InterModel1and2(InterRepository):
2417
def _get_repo_format_to_test(self):
2421
def is_compatible(source, target):
2422
if not source.supports_rich_root() and target.supports_rich_root():
2428
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2429
"""See InterRepository.fetch()."""
2430
from bzrlib.fetch import Model1toKnit2Fetcher
2431
f = Model1toKnit2Fetcher(to_repository=self.target,
2432
from_repository=self.source,
2433
last_revision=revision_id,
2435
return f.count_copied, f.failed_revisions
2438
def copy_content(self, revision_id=None):
2439
"""Make a complete copy of the content in self into destination.
2441
This is a destructive operation! Do not use it on existing
2444
:param revision_id: Only copy the content needed to construct
2445
revision_id and its parents.
2448
self.target.set_make_working_trees(self.source.make_working_trees())
2449
except NotImplementedError:
2451
# but don't bother fetching if we have the needed data now.
2452
if (revision_id not in (None, _mod_revision.NULL_REVISION) and
2453
self.target.has_revision(revision_id)):
2455
self.target.fetch(self.source, revision_id=revision_id)
2458
class InterKnit1and2(InterKnitRepo):
2461
def _get_repo_format_to_test(self):
2465
def is_compatible(source, target):
2466
"""Be compatible with Knit1 source and Knit3 target"""
2467
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit3
2469
from bzrlib.repofmt.knitrepo import (RepositoryFormatKnit1,
2470
RepositoryFormatKnit3)
2471
from bzrlib.repofmt.pack_repo import (RepositoryFormatKnitPack1,
2472
RepositoryFormatKnitPack3)
2473
return (isinstance(source._format,
2474
(RepositoryFormatKnit1, RepositoryFormatKnitPack1)) and
2475
isinstance(target._format,
2476
(RepositoryFormatKnit3, RepositoryFormatKnitPack3))
2478
except AttributeError:
2482
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2483
"""See InterRepository.fetch()."""
2484
from bzrlib.fetch import Knit1to2Fetcher
2485
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2486
self.source, self.source._format, self.target,
2487
self.target._format)
2488
f = Knit1to2Fetcher(to_repository=self.target,
2489
from_repository=self.source,
2490
last_revision=revision_id,
2492
return f.count_copied, f.failed_revisions
2495
class InterRemoteToOther(InterRepository):
2497
def __init__(self, source, target):
2498
InterRepository.__init__(self, source, target)
2499
self._real_inter = None
2502
def is_compatible(source, target):
2503
if not isinstance(source, remote.RemoteRepository):
2505
source._ensure_real()
2506
real_source = source._real_repository
2507
# Is source's model compatible with target's model, and are they the
2508
# same format? Currently we can only optimise fetching from an
2509
# identical model & format repo.
2510
assert not isinstance(real_source, remote.RemoteRepository), (
2511
"We don't support remote repos backed by remote repos yet.")
2512
return real_source._format == target._format
2515
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2516
"""See InterRepository.fetch()."""
2517
from bzrlib.fetch import RemoteToOtherFetcher
2518
mutter("Using fetch logic to copy between %s(remote) and %s(%s)",
2519
self.source, self.target, self.target._format)
2520
# TODO: jam 20070210 This should be an assert, not a translate
2521
revision_id = osutils.safe_revision_id(revision_id)
2522
f = RemoteToOtherFetcher(to_repository=self.target,
2523
from_repository=self.source,
2524
last_revision=revision_id,
2526
return f.count_copied, f.failed_revisions
2529
def _get_repo_format_to_test(self):
2533
class InterOtherToRemote(InterRepository):
2535
def __init__(self, source, target):
2536
InterRepository.__init__(self, source, target)
2537
self._real_inter = None
2540
def is_compatible(source, target):
2541
if isinstance(target, remote.RemoteRepository):
2545
def _ensure_real_inter(self):
2546
if self._real_inter is None:
2547
self.target._ensure_real()
2548
real_target = self.target._real_repository
2549
self._real_inter = InterRepository.get(self.source, real_target)
2551
def copy_content(self, revision_id=None):
2552
self._ensure_real_inter()
2553
self._real_inter.copy_content(revision_id=revision_id)
2555
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2556
self._ensure_real_inter()
2557
self._real_inter.fetch(revision_id=revision_id, pb=pb)
2560
def _get_repo_format_to_test(self):
3940
self.target.add_revision(revision.revision_id, revision)
3943
def _fetch_all_revisions(self, revision_ids, pb):
3944
"""Fetch everything for the list of revisions.
3946
:param revision_ids: The list of revisions to fetch. Must be in
3948
:param pb: A ProgressTask
3951
basis_id, basis_tree = self._get_basis(revision_ids[0])
3953
cache = lru_cache.LRUCache(100)
3954
cache[basis_id] = basis_tree
3955
del basis_tree # We don't want to hang on to it here
3957
for offset in range(0, len(revision_ids), batch_size):
3958
self.target.start_write_group()
3960
pb.update('Transferring revisions', offset,
3962
batch = revision_ids[offset:offset+batch_size]
3963
basis_id = self._fetch_batch(batch, basis_id, cache)
3965
self.target.abort_write_group()
3968
hint = self.target.commit_write_group()
3971
if hints and self.target._format.pack_compresses:
3972
self.target.pack(hint=hints)
3973
pb.update('Transferring revisions', len(revision_ids),
3977
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
3979
"""See InterRepository.fetch()."""
3980
if fetch_spec is not None:
3981
raise AssertionError("Not implemented yet...")
3982
if (not self.source.supports_rich_root()
3983
and self.target.supports_rich_root()):
3984
self._converting_to_rich_root = True
3985
self._revision_id_to_root_id = {}
3987
self._converting_to_rich_root = False
3988
revision_ids = self.target.search_missing_revision_ids(self.source,
3989
revision_id, find_ghosts=find_ghosts).get_keys()
3990
if not revision_ids:
3992
revision_ids = tsort.topo_sort(
3993
self.source.get_graph().get_parent_map(revision_ids))
3994
if not revision_ids:
3996
# Walk though all revisions; get inventory deltas, copy referenced
3997
# texts that delta references, insert the delta, revision and
4000
my_pb = ui.ui_factory.nested_progress_bar()
4003
symbol_versioning.warn(
4004
symbol_versioning.deprecated_in((1, 14, 0))
4005
% "pb parameter to fetch()")
4008
self._fetch_all_revisions(revision_ids, pb)
4010
if my_pb is not None:
4012
return len(revision_ids), 0
4014
def _get_basis(self, first_revision_id):
4015
"""Get a revision and tree which exists in the target.
4017
This assumes that first_revision_id is selected for transmission
4018
because all other ancestors are already present. If we can't find an
4019
ancestor we fall back to NULL_REVISION since we know that is safe.
4021
:return: (basis_id, basis_tree)
4023
first_rev = self.source.get_revision(first_revision_id)
4025
basis_id = first_rev.parent_ids[0]
4026
# only valid as a basis if the target has it
4027
self.target.get_revision(basis_id)
4028
# Try to get a basis tree - if its a ghost it will hit the
4029
# NoSuchRevision case.
4030
basis_tree = self.source.revision_tree(basis_id)
4031
except (IndexError, errors.NoSuchRevision):
4032
basis_id = _mod_revision.NULL_REVISION
4033
basis_tree = self.source.revision_tree(basis_id)
4034
return basis_id, basis_tree
4037
InterRepository.register_optimiser(InterDifferingSerializer)
2564
4038
InterRepository.register_optimiser(InterSameDataRepository)
2565
4039
InterRepository.register_optimiser(InterWeaveRepo)
2566
4040
InterRepository.register_optimiser(InterKnitRepo)
2567
InterRepository.register_optimiser(InterModel1and2)
2568
InterRepository.register_optimiser(InterKnit1and2)
2569
InterRepository.register_optimiser(InterPackRepo)
2570
InterRepository.register_optimiser(InterRemoteToOther)
2571
InterRepository.register_optimiser(InterOtherToRemote)
2574
4043
class CopyConverter(object):
2575
4044
"""A repository conversion tool which just performs a copy of the content.
2577
4046
This is slow but quite reliable.
2653
4122
return _unescape_re.sub(_unescaper, data)
2656
class _RevisionTextVersionCache(object):
2657
"""A cache of the versionedfile versions for revision and file-id."""
2659
def __init__(self, repository):
2660
self.repository = repository
2661
self.revision_versions = {}
2662
self.revision_parents = {}
2663
self.repo_graph = self.repository.get_graph()
2664
# XXX: RBC: I haven't tracked down what uses this, but it would be
2665
# better to use the headscache directly I think.
2666
self.heads = graph.HeadsCache(self.repo_graph).heads
2668
def add_revision_text_versions(self, tree):
2669
"""Cache text version data from the supplied revision tree"""
2671
for path, entry in tree.iter_entries_by_dir():
2672
inv_revisions[entry.file_id] = entry.revision
2673
self.revision_versions[tree.get_revision_id()] = inv_revisions
2674
return inv_revisions
2676
def get_text_version(self, file_id, revision_id):
2677
"""Determine the text version for a given file-id and revision-id"""
2679
inv_revisions = self.revision_versions[revision_id]
2682
tree = self.repository.revision_tree(revision_id)
2683
except errors.RevisionNotPresent:
2684
self.revision_versions[revision_id] = inv_revisions = {}
2686
inv_revisions = self.add_revision_text_versions(tree)
2687
return inv_revisions.get(file_id)
2689
def prepopulate_revs(self, revision_ids):
2690
# Filter out versions that we don't have an inventory for, so that the
2691
# revision_trees() call won't fail.
2692
inv_weave = self.repository.get_inventory_weave()
2693
revs = [r for r in revision_ids if inv_weave.has_version(r)]
2694
# XXX: this loop is very similar to
2695
# bzrlib.fetch.Inter1and2Helper.iter_rev_trees.
2697
mutter('%d revisions left to prepopulate', len(revs))
2698
for tree in self.repository.revision_trees(revs[:100]):
2699
if tree.inventory.revision_id is None:
2700
tree.inventory.revision_id = tree.get_revision_id()
2701
self.add_revision_text_versions(tree)
2704
def get_parents(self, revision_id):
2706
return self.revision_parents[revision_id]
2708
parents = self.repository.get_parents([revision_id])[0]
2709
self.revision_parents[revision_id] = parents
2712
def used_file_versions(self):
2713
"""Return a set of (revision_id, file_id) pairs for each file version
2714
referenced by any inventory cached by this _RevisionTextVersionCache.
2716
If the entire repository has been cached, this can be used to find all
2717
file versions that are actually referenced by inventories. Thus any
2718
other file version is completely unused and can be removed safely.
2721
for inventory_summary in self.revision_versions.itervalues():
2722
result.update(inventory_summary.items())
2726
class VersionedFileChecker(object):
2728
def __init__(self, planned_revisions, revision_versions, repository):
2729
self.planned_revisions = planned_revisions
2730
self.revision_versions = revision_versions
2731
self.repository = repository
2733
def calculate_file_version_parents(self, revision_id, file_id):
4125
class _VersionedFileChecker(object):
4127
def __init__(self, repository, text_key_references=None, ancestors=None):
4128
self.repository = repository
4129
self.text_index = self.repository._generate_text_key_index(
4130
text_key_references=text_key_references, ancestors=ancestors)
4132
def calculate_file_version_parents(self, text_key):
2734
4133
"""Calculate the correct parents for a file version according to
2735
4134
the inventories.
2737
text_revision = self.revision_versions.get_text_version(
2738
file_id, revision_id)
2739
if text_revision is None:
2741
parents_of_text_revision = self.revision_versions.get_parents(
2743
parents_from_inventories = []
2744
for parent in parents_of_text_revision:
2745
if parent == _mod_revision.NULL_REVISION:
2747
introduced_in = self.revision_versions.get_text_version(file_id,
2749
if introduced_in is not None:
2750
parents_from_inventories.append(introduced_in)
2751
heads = set(self.revision_versions.heads(parents_from_inventories))
2753
for parent in parents_from_inventories:
2754
if parent in heads and parent not in new_parents:
2755
new_parents.append(parent)
2756
return tuple(new_parents)
4136
parent_keys = self.text_index[text_key]
4137
if parent_keys == [_mod_revision.NULL_REVISION]:
4139
return tuple(parent_keys)
2758
def check_file_version_parents(self, weave, file_id):
4141
def check_file_version_parents(self, texts, progress_bar=None):
2759
4142
"""Check the parents stored in a versioned file are correct.
2761
4144
It also detects file versions that are not referenced by their
2768
4151
revision_id) tuples for versions that are present in this versioned
2769
4152
file, but not used by the corresponding inventory.
4154
local_progress = None
4155
if progress_bar is None:
4156
local_progress = ui.ui_factory.nested_progress_bar()
4157
progress_bar = local_progress
4159
return self._check_file_version_parents(texts, progress_bar)
4162
local_progress.finished()
4164
def _check_file_version_parents(self, texts, progress_bar):
4165
"""See check_file_version_parents."""
2771
4166
wrong_parents = {}
2772
dangling_file_versions = set()
2773
for num, revision_id in enumerate(self.planned_revisions):
2774
correct_parents = self.calculate_file_version_parents(
2775
revision_id, file_id)
2776
if correct_parents is None:
2778
text_revision = self.revision_versions.get_text_version(
2779
file_id, revision_id)
4167
self.file_ids = set([file_id for file_id, _ in
4168
self.text_index.iterkeys()])
4169
# text keys is now grouped by file_id
4170
n_versions = len(self.text_index)
4171
progress_bar.update('loading text store', 0, n_versions)
4172
parent_map = self.repository.texts.get_parent_map(self.text_index)
4173
# On unlistable transports this could well be empty/error...
4174
text_keys = self.repository.texts.keys()
4175
unused_keys = frozenset(text_keys) - set(self.text_index)
4176
for num, key in enumerate(self.text_index.iterkeys()):
4177
progress_bar.update('checking text graph', num, n_versions)
4178
correct_parents = self.calculate_file_version_parents(key)
2781
knit_parents = tuple(weave.get_parents(revision_id))
4180
knit_parents = parent_map[key]
2782
4181
except errors.RevisionNotPresent:
2783
4183
knit_parents = None
2784
if text_revision != revision_id:
2785
# This file version is not referenced by its corresponding
2787
dangling_file_versions.add((file_id, revision_id))
2788
4184
if correct_parents != knit_parents:
2789
wrong_parents[revision_id] = (knit_parents, correct_parents)
2790
return wrong_parents, dangling_file_versions
4185
wrong_parents[key] = (knit_parents, correct_parents)
4186
return wrong_parents, unused_keys
4189
def _old_get_graph(repository, revision_id):
4190
"""DO NOT USE. That is all. I'm serious."""
4191
graph = repository.get_graph()
4192
revision_graph = dict(((key, value) for key, value in
4193
graph.iter_ancestry([revision_id]) if value is not None))
4194
return _strip_NULL_ghosts(revision_graph)
4197
def _strip_NULL_ghosts(revision_graph):
4198
"""Also don't use this. more compatibility code for unmigrated clients."""
4199
# Filter ghosts, and null:
4200
if _mod_revision.NULL_REVISION in revision_graph:
4201
del revision_graph[_mod_revision.NULL_REVISION]
4202
for key, parents in revision_graph.items():
4203
revision_graph[key] = tuple(parent for parent in parents if parent
4205
return revision_graph
4208
class StreamSink(object):
4209
"""An object that can insert a stream into a repository.
4211
This interface handles the complexity of reserialising inventories and
4212
revisions from different formats, and allows unidirectional insertion into
4213
stacked repositories without looking for the missing basis parents
4217
def __init__(self, target_repo):
4218
self.target_repo = target_repo
4220
def insert_stream(self, stream, src_format, resume_tokens):
4221
"""Insert a stream's content into the target repository.
4223
:param src_format: a bzr repository format.
4225
:return: a list of resume tokens and an iterable of keys additional
4226
items required before the insertion can be completed.
4228
self.target_repo.lock_write()
4231
self.target_repo.resume_write_group(resume_tokens)
4234
self.target_repo.start_write_group()
4237
# locked_insert_stream performs a commit|suspend.
4238
return self._locked_insert_stream(stream, src_format, is_resume)
4240
self.target_repo.abort_write_group(suppress_errors=True)
4243
self.target_repo.unlock()
4245
def _locked_insert_stream(self, stream, src_format, is_resume):
4246
to_serializer = self.target_repo._format._serializer
4247
src_serializer = src_format._serializer
4249
if to_serializer == src_serializer:
4250
# If serializers match and the target is a pack repository, set the
4251
# write cache size on the new pack. This avoids poor performance
4252
# on transports where append is unbuffered (such as
4253
# RemoteTransport). This is safe to do because nothing should read
4254
# back from the target repository while a stream with matching
4255
# serialization is being inserted.
4256
# The exception is that a delta record from the source that should
4257
# be a fulltext may need to be expanded by the target (see
4258
# test_fetch_revisions_with_deltas_into_pack); but we take care to
4259
# explicitly flush any buffered writes first in that rare case.
4261
new_pack = self.target_repo._pack_collection._new_pack
4262
except AttributeError:
4263
# Not a pack repository
4266
new_pack.set_write_cache_size(1024*1024)
4267
for substream_type, substream in stream:
4268
if 'stream' in debug.debug_flags:
4269
mutter('inserting substream: %s', substream_type)
4270
if substream_type == 'texts':
4271
self.target_repo.texts.insert_record_stream(substream)
4272
elif substream_type == 'inventories':
4273
if src_serializer == to_serializer:
4274
self.target_repo.inventories.insert_record_stream(
4277
self._extract_and_insert_inventories(
4278
substream, src_serializer)
4279
elif substream_type == 'inventory-deltas':
4280
self._extract_and_insert_inventory_deltas(
4281
substream, src_serializer)
4282
elif substream_type == 'chk_bytes':
4283
# XXX: This doesn't support conversions, as it assumes the
4284
# conversion was done in the fetch code.
4285
self.target_repo.chk_bytes.insert_record_stream(substream)
4286
elif substream_type == 'revisions':
4287
# This may fallback to extract-and-insert more often than
4288
# required if the serializers are different only in terms of
4290
if src_serializer == to_serializer:
4291
self.target_repo.revisions.insert_record_stream(
4294
self._extract_and_insert_revisions(substream,
4296
elif substream_type == 'signatures':
4297
self.target_repo.signatures.insert_record_stream(substream)
4299
raise AssertionError('kaboom! %s' % (substream_type,))
4300
# Done inserting data, and the missing_keys calculations will try to
4301
# read back from the inserted data, so flush the writes to the new pack
4302
# (if this is pack format).
4303
if new_pack is not None:
4304
new_pack._write_data('', flush=True)
4305
# Find all the new revisions (including ones from resume_tokens)
4306
missing_keys = self.target_repo.get_missing_parent_inventories(
4307
check_for_missing_texts=is_resume)
4309
for prefix, versioned_file in (
4310
('texts', self.target_repo.texts),
4311
('inventories', self.target_repo.inventories),
4312
('revisions', self.target_repo.revisions),
4313
('signatures', self.target_repo.signatures),
4314
('chk_bytes', self.target_repo.chk_bytes),
4316
if versioned_file is None:
4318
missing_keys.update((prefix,) + key for key in
4319
versioned_file.get_missing_compression_parent_keys())
4320
except NotImplementedError:
4321
# cannot even attempt suspending, and missing would have failed
4322
# during stream insertion.
4323
missing_keys = set()
4326
# suspend the write group and tell the caller what we is
4327
# missing. We know we can suspend or else we would not have
4328
# entered this code path. (All repositories that can handle
4329
# missing keys can handle suspending a write group).
4330
write_group_tokens = self.target_repo.suspend_write_group()
4331
return write_group_tokens, missing_keys
4332
hint = self.target_repo.commit_write_group()
4333
if (to_serializer != src_serializer and
4334
self.target_repo._format.pack_compresses):
4335
self.target_repo.pack(hint=hint)
4338
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4339
target_rich_root = self.target_repo._format.rich_root_data
4340
target_tree_refs = self.target_repo._format.supports_tree_reference
4341
for record in substream:
4342
# Insert the delta directly
4343
inventory_delta_bytes = record.get_bytes_as('fulltext')
4344
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4346
parse_result = deserialiser.parse_text_bytes(
4347
inventory_delta_bytes)
4348
except inventory_delta.IncompatibleInventoryDelta, err:
4349
trace.mutter("Incompatible delta: %s", err.msg)
4350
raise errors.IncompatibleRevision(self.target_repo._format)
4351
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4352
revision_id = new_id
4353
parents = [key[0] for key in record.parents]
4354
self.target_repo.add_inventory_by_delta(
4355
basis_id, inv_delta, revision_id, parents)
4357
def _extract_and_insert_inventories(self, substream, serializer,
4359
"""Generate a new inventory versionedfile in target, converting data.
4361
The inventory is retrieved from the source, (deserializing it), and
4362
stored in the target (reserializing it in a different format).
4364
target_rich_root = self.target_repo._format.rich_root_data
4365
target_tree_refs = self.target_repo._format.supports_tree_reference
4366
for record in substream:
4367
# It's not a delta, so it must be a fulltext in the source
4368
# serializer's format.
4369
bytes = record.get_bytes_as('fulltext')
4370
revision_id = record.key[0]
4371
inv = serializer.read_inventory_from_string(bytes, revision_id)
4372
parents = [key[0] for key in record.parents]
4373
self.target_repo.add_inventory(revision_id, inv, parents)
4374
# No need to keep holding this full inv in memory when the rest of
4375
# the substream is likely to be all deltas.
4378
def _extract_and_insert_revisions(self, substream, serializer):
4379
for record in substream:
4380
bytes = record.get_bytes_as('fulltext')
4381
revision_id = record.key[0]
4382
rev = serializer.read_revision_from_string(bytes)
4383
if rev.revision_id != revision_id:
4384
raise AssertionError('wtf: %s != %s' % (rev, revision_id))
4385
self.target_repo.add_revision(revision_id, rev)
4388
if self.target_repo._format._fetch_reconcile:
4389
self.target_repo.reconcile()
4392
class StreamSource(object):
4393
"""A source of a stream for fetching between repositories."""
4395
def __init__(self, from_repository, to_format):
4396
"""Create a StreamSource streaming from from_repository."""
4397
self.from_repository = from_repository
4398
self.to_format = to_format
4400
def delta_on_metadata(self):
4401
"""Return True if delta's are permitted on metadata streams.
4403
That is on revisions and signatures.
4405
src_serializer = self.from_repository._format._serializer
4406
target_serializer = self.to_format._serializer
4407
return (self.to_format._fetch_uses_deltas and
4408
src_serializer == target_serializer)
4410
def _fetch_revision_texts(self, revs):
4411
# fetch signatures first and then the revision texts
4412
# may need to be a InterRevisionStore call here.
4413
from_sf = self.from_repository.signatures
4414
# A missing signature is just skipped.
4415
keys = [(rev_id,) for rev_id in revs]
4416
signatures = versionedfile.filter_absent(from_sf.get_record_stream(
4418
self.to_format._fetch_order,
4419
not self.to_format._fetch_uses_deltas))
4420
# If a revision has a delta, this is actually expanded inside the
4421
# insert_record_stream code now, which is an alternate fix for
4423
from_rf = self.from_repository.revisions
4424
revisions = from_rf.get_record_stream(
4426
self.to_format._fetch_order,
4427
not self.delta_on_metadata())
4428
return [('signatures', signatures), ('revisions', revisions)]
4430
def _generate_root_texts(self, revs):
4431
"""This will be called by get_stream between fetching weave texts and
4432
fetching the inventory weave.
4434
if self._rich_root_upgrade():
4436
return bzrlib.fetch.Inter1and2Helper(
4437
self.from_repository).generate_root_texts(revs)
4441
def get_stream(self, search):
4443
revs = search.get_keys()
4444
graph = self.from_repository.get_graph()
4445
revs = tsort.topo_sort(graph.get_parent_map(revs))
4446
data_to_fetch = self.from_repository.item_keys_introduced_by(revs)
4448
for knit_kind, file_id, revisions in data_to_fetch:
4449
if knit_kind != phase:
4451
# Make a new progress bar for this phase
4452
if knit_kind == "file":
4453
# Accumulate file texts
4454
text_keys.extend([(file_id, revision) for revision in
4456
elif knit_kind == "inventory":
4457
# Now copy the file texts.
4458
from_texts = self.from_repository.texts
4459
yield ('texts', from_texts.get_record_stream(
4460
text_keys, self.to_format._fetch_order,
4461
not self.to_format._fetch_uses_deltas))
4462
# Cause an error if a text occurs after we have done the
4465
# Before we process the inventory we generate the root
4466
# texts (if necessary) so that the inventories references
4468
for _ in self._generate_root_texts(revs):
4470
# we fetch only the referenced inventories because we do not
4471
# know for unselected inventories whether all their required
4472
# texts are present in the other repository - it could be
4474
for info in self._get_inventory_stream(revs):
4476
elif knit_kind == "signatures":
4477
# Nothing to do here; this will be taken care of when
4478
# _fetch_revision_texts happens.
4480
elif knit_kind == "revisions":
4481
for record in self._fetch_revision_texts(revs):
4484
raise AssertionError("Unknown knit kind %r" % knit_kind)
4486
def get_stream_for_missing_keys(self, missing_keys):
4487
# missing keys can only occur when we are byte copying and not
4488
# translating (because translation means we don't send
4489
# unreconstructable deltas ever).
4491
keys['texts'] = set()
4492
keys['revisions'] = set()
4493
keys['inventories'] = set()
4494
keys['chk_bytes'] = set()
4495
keys['signatures'] = set()
4496
for key in missing_keys:
4497
keys[key[0]].add(key[1:])
4498
if len(keys['revisions']):
4499
# If we allowed copying revisions at this point, we could end up
4500
# copying a revision without copying its required texts: a
4501
# violation of the requirements for repository integrity.
4502
raise AssertionError(
4503
'cannot copy revisions to fill in missing deltas %s' % (
4504
keys['revisions'],))
4505
for substream_kind, keys in keys.iteritems():
4506
vf = getattr(self.from_repository, substream_kind)
4507
if vf is None and keys:
4508
raise AssertionError(
4509
"cannot fill in keys for a versioned file we don't"
4510
" have: %s needs %s" % (substream_kind, keys))
4512
# No need to stream something we don't have
4514
if substream_kind == 'inventories':
4515
# Some missing keys are genuinely ghosts, filter those out.
4516
present = self.from_repository.inventories.get_parent_map(keys)
4517
revs = [key[0] for key in present]
4518
# Get the inventory stream more-or-less as we do for the
4519
# original stream; there's no reason to assume that records
4520
# direct from the source will be suitable for the sink. (Think
4521
# e.g. 2a -> 1.9-rich-root).
4522
for info in self._get_inventory_stream(revs, missing=True):
4526
# Ask for full texts always so that we don't need more round trips
4527
# after this stream.
4528
# Some of the missing keys are genuinely ghosts, so filter absent
4529
# records. The Sink is responsible for doing another check to
4530
# ensure that ghosts don't introduce missing data for future
4532
stream = versionedfile.filter_absent(vf.get_record_stream(keys,
4533
self.to_format._fetch_order, True))
4534
yield substream_kind, stream
4536
def inventory_fetch_order(self):
4537
if self._rich_root_upgrade():
4538
return 'topological'
4540
return self.to_format._fetch_order
4542
def _rich_root_upgrade(self):
4543
return (not self.from_repository._format.rich_root_data and
4544
self.to_format.rich_root_data)
4546
def _get_inventory_stream(self, revision_ids, missing=False):
4547
from_format = self.from_repository._format
4548
if (from_format.supports_chks and self.to_format.supports_chks and
4549
from_format.network_name() == self.to_format.network_name()):
4550
raise AssertionError(
4551
"this case should be handled by GroupCHKStreamSource")
4552
elif 'forceinvdeltas' in debug.debug_flags:
4553
return self._get_convertable_inventory_stream(revision_ids,
4554
delta_versus_null=missing)
4555
elif from_format.network_name() == self.to_format.network_name():
4557
return self._get_simple_inventory_stream(revision_ids,
4559
elif (not from_format.supports_chks and not self.to_format.supports_chks
4560
and from_format._serializer == self.to_format._serializer):
4561
# Essentially the same format.
4562
return self._get_simple_inventory_stream(revision_ids,
4565
# Any time we switch serializations, we want to use an
4566
# inventory-delta based approach.
4567
return self._get_convertable_inventory_stream(revision_ids,
4568
delta_versus_null=missing)
4570
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4571
# NB: This currently reopens the inventory weave in source;
4572
# using a single stream interface instead would avoid this.
4573
from_weave = self.from_repository.inventories
4575
delta_closure = True
4577
delta_closure = not self.delta_on_metadata()
4578
yield ('inventories', from_weave.get_record_stream(
4579
[(rev_id,) for rev_id in revision_ids],
4580
self.inventory_fetch_order(), delta_closure))
4582
def _get_convertable_inventory_stream(self, revision_ids,
4583
delta_versus_null=False):
4584
# The source is using CHKs, but the target either doesn't or it has a
4585
# different serializer. The StreamSink code expects to be able to
4586
# convert on the target, so we need to put bytes-on-the-wire that can
4587
# be converted. That means inventory deltas (if the remote is <1.19,
4588
# RemoteStreamSink will fallback to VFS to insert the deltas).
4589
yield ('inventory-deltas',
4590
self._stream_invs_as_deltas(revision_ids,
4591
delta_versus_null=delta_versus_null))
4593
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4594
"""Return a stream of inventory-deltas for the given rev ids.
4596
:param revision_ids: The list of inventories to transmit
4597
:param delta_versus_null: Don't try to find a minimal delta for this
4598
entry, instead compute the delta versus the NULL_REVISION. This
4599
effectively streams a complete inventory. Used for stuff like
4600
filling in missing parents, etc.
4602
from_repo = self.from_repository
4603
revision_keys = [(rev_id,) for rev_id in revision_ids]
4604
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4605
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4607
inventories = self.from_repository.iter_inventories(
4608
revision_ids, 'topological')
4609
format = from_repo._format
4610
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4611
inventory_cache = lru_cache.LRUCache(50)
4612
null_inventory = from_repo.revision_tree(
4613
_mod_revision.NULL_REVISION).inventory
4614
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4615
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4616
# repo back into a non-rich-root repo ought to be allowed)
4617
serializer = inventory_delta.InventoryDeltaSerializer(
4618
versioned_root=format.rich_root_data,
4619
tree_references=format.supports_tree_reference)
4620
for inv in inventories:
4621
key = (inv.revision_id,)
4622
parent_keys = parent_map.get(key, ())
4624
if not delta_versus_null and parent_keys:
4625
# The caller did not ask for complete inventories and we have
4626
# some parents that we can delta against. Make a delta against
4627
# each parent so that we can find the smallest.
4628
parent_ids = [parent_key[0] for parent_key in parent_keys]
4629
for parent_id in parent_ids:
4630
if parent_id not in invs_sent_so_far:
4631
# We don't know that the remote side has this basis, so
4634
if parent_id == _mod_revision.NULL_REVISION:
4635
parent_inv = null_inventory
4637
parent_inv = inventory_cache.get(parent_id, None)
4638
if parent_inv is None:
4639
parent_inv = from_repo.get_inventory(parent_id)
4640
candidate_delta = inv._make_delta(parent_inv)
4641
if (delta is None or
4642
len(delta) > len(candidate_delta)):
4643
delta = candidate_delta
4644
basis_id = parent_id
4646
# Either none of the parents ended up being suitable, or we
4647
# were asked to delta against NULL
4648
basis_id = _mod_revision.NULL_REVISION
4649
delta = inv._make_delta(null_inventory)
4650
invs_sent_so_far.add(inv.revision_id)
4651
inventory_cache[inv.revision_id] = inv
4652
delta_serialized = ''.join(
4653
serializer.delta_to_lines(basis_id, key[-1], delta))
4654
yield versionedfile.FulltextContentFactory(
4655
key, parent_keys, None, delta_serialized)
4658
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4659
stop_revision=None):
4660
"""Extend the partial history to include a given index
4662
If a stop_index is supplied, stop when that index has been reached.
4663
If a stop_revision is supplied, stop when that revision is
4664
encountered. Otherwise, stop when the beginning of history is
4667
:param stop_index: The index which should be present. When it is
4668
present, history extension will stop.
4669
:param stop_revision: The revision id which should be present. When
4670
it is encountered, history extension will stop.
4672
start_revision = partial_history_cache[-1]
4673
iterator = repo.iter_reverse_revision_history(start_revision)
4675
#skip the last revision in the list
4678
if (stop_index is not None and
4679
len(partial_history_cache) > stop_index):
4681
if partial_history_cache[-1] == stop_revision:
4683
revision_id = iterator.next()
4684
partial_history_cache.append(revision_id)
4685
except StopIteration:
added
removed
bzrlib/repository.py
