492
547
ie.revision = parent_entry.revision
493
548
return self._get_delta(ie, basis_inv, path), False, None
494
549
ie.reference_revision = content_summary[3]
496
self._add_text_to_weave(ie.file_id, lines, heads, None)
550
if ie.reference_revision is None:
551
raise AssertionError("invalid content_summary for nested tree: %r"
552
% (content_summary,))
553
self._add_text_to_weave(ie.file_id, '', heads, None)
498
555
raise NotImplementedError('unknown kind')
499
556
ie.revision = self._new_revision_id
557
self._any_changes = True
500
558
return self._get_delta(ie, basis_inv, path), True, fingerprint
502
def _add_text_to_weave(self, file_id, new_lines, parents, nostore_sha):
503
# Note: as we read the content directly from the tree, we know its not
504
# been turned into unicode or badly split - but a broken tree
505
# implementation could give us bad output from readlines() so this is
506
# not a guarantee of safety. What would be better is always checking
507
# the content during test suite execution. RBC 20070912
508
parent_keys = tuple((file_id, parent) for parent in parents)
509
return self.repository.texts.add_lines(
510
(file_id, self._new_revision_id), parent_keys, new_lines,
511
nostore_sha=nostore_sha, random_id=self.random_revid,
512
check_content=False)[0:2]
560
def record_iter_changes(self, tree, basis_revision_id, iter_changes,
561
_entry_factory=entry_factory):
562
"""Record a new tree via iter_changes.
564
:param tree: The tree to obtain text contents from for changed objects.
565
:param basis_revision_id: The revision id of the tree the iter_changes
566
has been generated against. Currently assumed to be the same
567
as self.parents[0] - if it is not, errors may occur.
568
:param iter_changes: An iter_changes iterator with the changes to apply
569
to basis_revision_id. The iterator must not include any items with
570
a current kind of None - missing items must be either filtered out
571
or errored-on beefore record_iter_changes sees the item.
572
:param _entry_factory: Private method to bind entry_factory locally for
574
:return: A generator of (file_id, relpath, fs_hash) tuples for use with
577
# Create an inventory delta based on deltas between all the parents and
578
# deltas between all the parent inventories. We use inventory delta's
579
# between the inventory objects because iter_changes masks
580
# last-changed-field only changes.
582
# file_id -> change map, change is fileid, paths, changed, versioneds,
583
# parents, names, kinds, executables
585
# {file_id -> revision_id -> inventory entry, for entries in parent
586
# trees that are not parents[0]
590
revtrees = list(self.repository.revision_trees(self.parents))
591
except errors.NoSuchRevision:
592
# one or more ghosts, slow path.
594
for revision_id in self.parents:
596
revtrees.append(self.repository.revision_tree(revision_id))
597
except errors.NoSuchRevision:
599
basis_revision_id = _mod_revision.NULL_REVISION
601
revtrees.append(self.repository.revision_tree(
602
_mod_revision.NULL_REVISION))
603
# The basis inventory from a repository
605
basis_inv = revtrees[0].inventory
607
basis_inv = self.repository.revision_tree(
608
_mod_revision.NULL_REVISION).inventory
609
if len(self.parents) > 0:
610
if basis_revision_id != self.parents[0] and not ghost_basis:
612
"arbitrary basis parents not yet supported with merges")
613
for revtree in revtrees[1:]:
614
for change in revtree.inventory._make_delta(basis_inv):
615
if change[1] is None:
616
# Not present in this parent.
618
if change[2] not in merged_ids:
619
if change[0] is not None:
620
basis_entry = basis_inv[change[2]]
621
merged_ids[change[2]] = [
623
basis_entry.revision,
626
parent_entries[change[2]] = {
628
basis_entry.revision:basis_entry,
630
change[3].revision:change[3],
633
merged_ids[change[2]] = [change[3].revision]
634
parent_entries[change[2]] = {change[3].revision:change[3]}
636
merged_ids[change[2]].append(change[3].revision)
637
parent_entries[change[2]][change[3].revision] = change[3]
640
# Setup the changes from the tree:
641
# changes maps file_id -> (change, [parent revision_ids])
643
for change in iter_changes:
644
# This probably looks up in basis_inv way to much.
645
if change[1][0] is not None:
646
head_candidate = [basis_inv[change[0]].revision]
649
changes[change[0]] = change, merged_ids.get(change[0],
651
unchanged_merged = set(merged_ids) - set(changes)
652
# Extend the changes dict with synthetic changes to record merges of
654
for file_id in unchanged_merged:
655
# Record a merged version of these items that did not change vs the
656
# basis. This can be either identical parallel changes, or a revert
657
# of a specific file after a merge. The recorded content will be
658
# that of the current tree (which is the same as the basis), but
659
# the per-file graph will reflect a merge.
660
# NB:XXX: We are reconstructing path information we had, this
661
# should be preserved instead.
662
# inv delta change: (file_id, (path_in_source, path_in_target),
663
# changed_content, versioned, parent, name, kind,
666
basis_entry = basis_inv[file_id]
667
except errors.NoSuchId:
668
# a change from basis->some_parents but file_id isn't in basis
669
# so was new in the merge, which means it must have changed
670
# from basis -> current, and as it hasn't the add was reverted
671
# by the user. So we discard this change.
675
(basis_inv.id2path(file_id), tree.id2path(file_id)),
677
(basis_entry.parent_id, basis_entry.parent_id),
678
(basis_entry.name, basis_entry.name),
679
(basis_entry.kind, basis_entry.kind),
680
(basis_entry.executable, basis_entry.executable))
681
changes[file_id] = (change, merged_ids[file_id])
682
# changes contains tuples with the change and a set of inventory
683
# candidates for the file.
685
# old_path, new_path, file_id, new_inventory_entry
686
seen_root = False # Is the root in the basis delta?
687
inv_delta = self._basis_delta
688
modified_rev = self._new_revision_id
689
for change, head_candidates in changes.values():
690
if change[3][1]: # versioned in target.
691
# Several things may be happening here:
692
# We may have a fork in the per-file graph
693
# - record a change with the content from tree
694
# We may have a change against < all trees
695
# - carry over the tree that hasn't changed
696
# We may have a change against all trees
697
# - record the change with the content from tree
700
entry = _entry_factory[kind](file_id, change[5][1],
702
head_set = self._heads(change[0], set(head_candidates))
705
for head_candidate in head_candidates:
706
if head_candidate in head_set:
707
heads.append(head_candidate)
708
head_set.remove(head_candidate)
711
# Could be a carry-over situation:
712
parent_entry_revs = parent_entries.get(file_id, None)
713
if parent_entry_revs:
714
parent_entry = parent_entry_revs.get(heads[0], None)
717
if parent_entry is None:
718
# The parent iter_changes was called against is the one
719
# that is the per-file head, so any change is relevant
720
# iter_changes is valid.
721
carry_over_possible = False
723
# could be a carry over situation
724
# A change against the basis may just indicate a merge,
725
# we need to check the content against the source of the
726
# merge to determine if it was changed after the merge
728
if (parent_entry.kind != entry.kind or
729
parent_entry.parent_id != entry.parent_id or
730
parent_entry.name != entry.name):
731
# Metadata common to all entries has changed
732
# against per-file parent
733
carry_over_possible = False
735
carry_over_possible = True
736
# per-type checks for changes against the parent_entry
739
# Cannot be a carry-over situation
740
carry_over_possible = False
741
# Populate the entry in the delta
743
# XXX: There is still a small race here: If someone reverts the content of a file
744
# after iter_changes examines and decides it has changed,
745
# we will unconditionally record a new version even if some
746
# other process reverts it while commit is running (with
747
# the revert happening after iter_changes did it's
750
entry.executable = True
752
entry.executable = False
753
if (carry_over_possible and
754
parent_entry.executable == entry.executable):
755
# Check the file length, content hash after reading
757
nostore_sha = parent_entry.text_sha1
760
file_obj, stat_value = tree.get_file_with_stat(file_id, change[1][1])
762
text = file_obj.read()
766
entry.text_sha1, entry.text_size = self._add_text_to_weave(
767
file_id, text, heads, nostore_sha)
768
yield file_id, change[1][1], (entry.text_sha1, stat_value)
769
except errors.ExistingContent:
770
# No content change against a carry_over parent
771
# Perhaps this should also yield a fs hash update?
773
entry.text_size = parent_entry.text_size
774
entry.text_sha1 = parent_entry.text_sha1
775
elif kind == 'symlink':
777
entry.symlink_target = tree.get_symlink_target(file_id)
778
if (carry_over_possible and
779
parent_entry.symlink_target == entry.symlink_target):
782
self._add_text_to_weave(change[0], '', heads, None)
783
elif kind == 'directory':
784
if carry_over_possible:
787
# Nothing to set on the entry.
788
# XXX: split into the Root and nonRoot versions.
789
if change[1][1] != '' or self.repository.supports_rich_root():
790
self._add_text_to_weave(change[0], '', heads, None)
791
elif kind == 'tree-reference':
792
if not self.repository._format.supports_tree_reference:
793
# This isn't quite sane as an error, but we shouldn't
794
# ever see this code path in practice: tree's don't
795
# permit references when the repo doesn't support tree
797
raise errors.UnsupportedOperation(tree.add_reference,
799
reference_revision = tree.get_reference_revision(change[0])
800
entry.reference_revision = reference_revision
801
if (carry_over_possible and
802
parent_entry.reference_revision == reference_revision):
805
self._add_text_to_weave(change[0], '', heads, None)
807
raise AssertionError('unknown kind %r' % kind)
809
entry.revision = modified_rev
811
entry.revision = parent_entry.revision
814
new_path = change[1][1]
815
inv_delta.append((change[1][0], new_path, change[0], entry))
818
self.new_inventory = None
820
# This should perhaps be guarded by a check that the basis we
821
# commit against is the basis for the commit and if not do a delta
823
self._any_changes = True
825
# housekeeping root entry changes do not affect no-change commits.
826
self._require_root_change(tree)
827
self.basis_delta_revision = basis_revision_id
829
def _add_text_to_weave(self, file_id, new_text, parents, nostore_sha):
830
parent_keys = tuple([(file_id, parent) for parent in parents])
831
return self.repository.texts._add_text(
832
(file_id, self._new_revision_id), parent_keys, new_text,
833
nostore_sha=nostore_sha, random_id=self.random_revid)[0:2]
515
836
class RootCommitBuilder(CommitBuilder):
516
837
"""This commitbuilder actually records the root id"""
518
839
# the root entry gets versioned properly by this builder.
519
840
_versioned_root = True
797
1167
# The old API returned a list, should this actually be a set?
798
1168
return parent_map.keys()
1170
def _check_inventories(self, checker):
1171
"""Check the inventories found from the revision scan.
1173
This is responsible for verifying the sha1 of inventories and
1174
creating a pending_keys set that covers data referenced by inventories.
1176
bar = ui.ui_factory.nested_progress_bar()
1178
self._do_check_inventories(checker, bar)
1182
def _do_check_inventories(self, checker, bar):
1183
"""Helper for _check_inventories."""
1185
keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1186
kinds = ['chk_bytes', 'texts']
1187
count = len(checker.pending_keys)
1188
bar.update("inventories", 0, 2)
1189
current_keys = checker.pending_keys
1190
checker.pending_keys = {}
1191
# Accumulate current checks.
1192
for key in current_keys:
1193
if key[0] != 'inventories' and key[0] not in kinds:
1194
checker._report_items.append('unknown key type %r' % (key,))
1195
keys[key[0]].add(key[1:])
1196
if keys['inventories']:
1197
# NB: output order *should* be roughly sorted - topo or
1198
# inverse topo depending on repository - either way decent
1199
# to just delta against. However, pre-CHK formats didn't
1200
# try to optimise inventory layout on disk. As such the
1201
# pre-CHK code path does not use inventory deltas.
1203
for record in self.inventories.check(keys=keys['inventories']):
1204
if record.storage_kind == 'absent':
1205
checker._report_items.append(
1206
'Missing inventory {%s}' % (record.key,))
1208
last_object = self._check_record('inventories', record,
1209
checker, last_object,
1210
current_keys[('inventories',) + record.key])
1211
del keys['inventories']
1214
bar.update("texts", 1)
1215
while (checker.pending_keys or keys['chk_bytes']
1217
# Something to check.
1218
current_keys = checker.pending_keys
1219
checker.pending_keys = {}
1220
# Accumulate current checks.
1221
for key in current_keys:
1222
if key[0] not in kinds:
1223
checker._report_items.append('unknown key type %r' % (key,))
1224
keys[key[0]].add(key[1:])
1225
# Check the outermost kind only - inventories || chk_bytes || texts
1229
for record in getattr(self, kind).check(keys=keys[kind]):
1230
if record.storage_kind == 'absent':
1231
checker._report_items.append(
1232
'Missing %s {%s}' % (kind, record.key,))
1234
last_object = self._check_record(kind, record,
1235
checker, last_object, current_keys[(kind,) + record.key])
1239
def _check_record(self, kind, record, checker, last_object, item_data):
1240
"""Check a single text from this repository."""
1241
if kind == 'inventories':
1242
rev_id = record.key[0]
1243
inv = self.deserialise_inventory(rev_id,
1244
record.get_bytes_as('fulltext'))
1245
if last_object is not None:
1246
delta = inv._make_delta(last_object)
1247
for old_path, path, file_id, ie in delta:
1250
ie.check(checker, rev_id, inv)
1252
for path, ie in inv.iter_entries():
1253
ie.check(checker, rev_id, inv)
1254
if self._format.fast_deltas:
1256
elif kind == 'chk_bytes':
1257
# No code written to check chk_bytes for this repo format.
1258
checker._report_items.append(
1259
'unsupported key type chk_bytes for %s' % (record.key,))
1260
elif kind == 'texts':
1261
self._check_text(record, checker, item_data)
1263
checker._report_items.append(
1264
'unknown key type %s for %s' % (kind, record.key))
1266
def _check_text(self, record, checker, item_data):
1267
"""Check a single text."""
1268
# Check it is extractable.
1269
# TODO: check length.
1270
if record.storage_kind == 'chunked':
1271
chunks = record.get_bytes_as(record.storage_kind)
1272
sha1 = osutils.sha_strings(chunks)
1273
length = sum(map(len, chunks))
1275
content = record.get_bytes_as('fulltext')
1276
sha1 = osutils.sha_string(content)
1277
length = len(content)
1278
if item_data and sha1 != item_data[1]:
1279
checker._report_items.append(
1280
'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1281
(record.key, sha1, item_data[1], item_data[2]))
801
1284
def create(a_bzrdir):
802
1285
"""Construct the current default format repository in a_bzrdir."""
1076
1552
"""Commit the contents accrued within the current write group.
1078
1554
:seealso: start_write_group.
1556
:return: it may return an opaque hint that can be passed to 'pack'.
1080
1558
if self._write_group is not self.get_transaction():
1081
1559
# has an unlock or relock occured ?
1082
1560
raise errors.BzrError('mismatched lock context %r and '
1083
1561
'write group %r.' %
1084
1562
(self.get_transaction(), self._write_group))
1085
self._commit_write_group()
1563
result = self._commit_write_group()
1086
1564
self._write_group = None
1088
1567
def _commit_write_group(self):
1089
1568
"""Template method for per-repository write group cleanup.
1091
This is called before the write group is considered to be
1570
This is called before the write group is considered to be
1092
1571
finished and should ensure that all data handed to the repository
1093
for writing during the write group is safely committed (to the
1572
for writing during the write group is safely committed (to the
1094
1573
extent possible considering file system caching etc).
1097
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
1576
def suspend_write_group(self):
1577
raise errors.UnsuspendableWriteGroup(self)
1579
def get_missing_parent_inventories(self, check_for_missing_texts=True):
1580
"""Return the keys of missing inventory parents for revisions added in
1583
A revision is not complete if the inventory delta for that revision
1584
cannot be calculated. Therefore if the parent inventories of a
1585
revision are not present, the revision is incomplete, and e.g. cannot
1586
be streamed by a smart server. This method finds missing inventory
1587
parents for revisions added in this write group.
1589
if not self._format.supports_external_lookups:
1590
# This is only an issue for stacked repositories
1592
if not self.is_in_write_group():
1593
raise AssertionError('not in a write group')
1595
# XXX: We assume that every added revision already has its
1596
# corresponding inventory, so we only check for parent inventories that
1597
# might be missing, rather than all inventories.
1598
parents = set(self.revisions._index.get_missing_parents())
1599
parents.discard(_mod_revision.NULL_REVISION)
1600
unstacked_inventories = self.inventories._index
1601
present_inventories = unstacked_inventories.get_parent_map(
1602
key[-1:] for key in parents)
1603
parents.difference_update(present_inventories)
1604
if len(parents) == 0:
1605
# No missing parent inventories.
1607
if not check_for_missing_texts:
1608
return set(('inventories', rev_id) for (rev_id,) in parents)
1609
# Ok, now we have a list of missing inventories. But these only matter
1610
# if the inventories that reference them are missing some texts they
1611
# appear to introduce.
1612
# XXX: Texts referenced by all added inventories need to be present,
1613
# but at the moment we're only checking for texts referenced by
1614
# inventories at the graph's edge.
1615
key_deps = self.revisions._index._key_dependencies
1616
key_deps.satisfy_refs_for_keys(present_inventories)
1617
referrers = frozenset(r[0] for r in key_deps.get_referrers())
1618
file_ids = self.fileids_altered_by_revision_ids(referrers)
1619
missing_texts = set()
1620
for file_id, version_ids in file_ids.iteritems():
1621
missing_texts.update(
1622
(file_id, version_id) for version_id in version_ids)
1623
present_texts = self.texts.get_parent_map(missing_texts)
1624
missing_texts.difference_update(present_texts)
1625
if not missing_texts:
1626
# No texts are missing, so all revisions and their deltas are
1629
# Alternatively the text versions could be returned as the missing
1630
# keys, but this is likely to be less data.
1631
missing_keys = set(('inventories', rev_id) for (rev_id,) in parents)
1634
def refresh_data(self):
1635
"""Re-read any data needed to to synchronise with disk.
1637
This method is intended to be called after another repository instance
1638
(such as one used by a smart server) has inserted data into the
1639
repository. It may not be called during a write group, but may be
1640
called at any other time.
1642
if self.is_in_write_group():
1643
raise errors.InternalBzrError(
1644
"May not refresh_data while in a write group.")
1645
self._refresh_data()
1647
def resume_write_group(self, tokens):
1648
if not self.is_write_locked():
1649
raise errors.NotWriteLocked(self)
1650
if self._write_group:
1651
raise errors.BzrError('already in a write group')
1652
self._resume_write_group(tokens)
1653
# so we can detect unlock/relock - the write group is now entered.
1654
self._write_group = self.get_transaction()
1656
def _resume_write_group(self, tokens):
1657
raise errors.UnsuspendableWriteGroup(self)
1659
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1098
1661
"""Fetch the content required to construct revision_id from source.
1100
If revision_id is None all content is copied.
1663
If revision_id is None and fetch_spec is None, then all content is
1666
fetch() may not be used when the repository is in a write group -
1667
either finish the current write group before using fetch, or use
1668
fetch before starting the write group.
1101
1670
:param find_ghosts: Find and copy revisions in the source that are
1102
1671
ghosts in the target (and not reachable directly by walking out to
1103
1672
the first-present revision in target from revision_id).
1673
:param revision_id: If specified, all the content needed for this
1674
revision ID will be copied to the target. Fetch will determine for
1675
itself which content needs to be copied.
1676
:param fetch_spec: If specified, a SearchResult or
1677
PendingAncestryResult that describes which revisions to copy. This
1678
allows copying multiple heads at once. Mutually exclusive with
1681
if fetch_spec is not None and revision_id is not None:
1682
raise AssertionError(
1683
"fetch_spec and revision_id are mutually exclusive.")
1684
if self.is_in_write_group():
1685
raise errors.InternalBzrError(
1686
"May not fetch while in a write group.")
1105
1687
# fast path same-url fetch operations
1106
if self.has_same_location(source):
1688
# TODO: lift out to somewhere common with RemoteRepository
1689
# <https://bugs.edge.launchpad.net/bzr/+bug/401646>
1690
if (self.has_same_location(source)
1691
and fetch_spec is None
1692
and self._has_same_fallbacks(source)):
1107
1693
# check that last_revision is in 'from' and then return a
1108
1694
# no-operation.
1109
1695
if (revision_id is not None and
2909
3724
return self.source.revision_ids_to_search_result(result_set)
2912
class InterPackRepo(InterSameDataRepository):
2913
"""Optimised code paths between Pack based repositories."""
2916
def _get_repo_format_to_test(self):
2917
from bzrlib.repofmt import pack_repo
2918
return pack_repo.RepositoryFormatKnitPack1()
2921
def is_compatible(source, target):
2922
"""Be compatible with known Pack formats.
2924
We don't test for the stores being of specific types because that
2925
could lead to confusing results, and there is no need to be
2928
from bzrlib.repofmt.pack_repo import RepositoryFormatPack
2930
are_packs = (isinstance(source._format, RepositoryFormatPack) and
2931
isinstance(target._format, RepositoryFormatPack))
2932
except AttributeError:
2934
return are_packs and InterRepository._same_model(source, target)
2937
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2938
"""See InterRepository.fetch()."""
2939
if (len(self.source._fallback_repositories) > 0 or
2940
len(self.target._fallback_repositories) > 0):
2941
# The pack layer is not aware of fallback repositories, so when
2942
# fetching from a stacked repository or into a stacked repository
2943
# we use the generic fetch logic which uses the VersionedFiles
2944
# attributes on repository.
2945
from bzrlib.fetch import RepoFetcher
2946
fetcher = RepoFetcher(self.target, self.source, revision_id,
2948
return fetcher.count_copied, fetcher.failed_revisions
2949
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2950
self.source, self.source._format, self.target, self.target._format)
2951
self.count_copied = 0
2952
if revision_id is None:
2954
# everything to do - use pack logic
2955
# to fetch from all packs to one without
2956
# inventory parsing etc, IFF nothing to be copied is in the target.
2958
source_revision_ids = frozenset(self.source.all_revision_ids())
2959
revision_ids = source_revision_ids - \
2960
frozenset(self.target_get_parent_map(source_revision_ids))
2961
revision_keys = [(revid,) for revid in revision_ids]
2962
target_pack_collection = self._get_target_pack_collection()
2963
index = target_pack_collection.revision_index.combined_index
2964
present_revision_ids = set(item[1][0] for item in
2965
index.iter_entries(revision_keys))
2966
revision_ids = set(revision_ids) - present_revision_ids
2967
# implementing the TODO will involve:
2968
# - detecting when all of a pack is selected
2969
# - avoiding as much as possible pre-selection, so the
2970
# more-core routines such as create_pack_from_packs can filter in
2971
# a just-in-time fashion. (though having a HEADS list on a
2972
# repository might make this a lot easier, because we could
2973
# sensibly detect 'new revisions' without doing a full index scan.
2974
elif _mod_revision.is_null(revision_id):
2979
revision_ids = self.search_missing_revision_ids(revision_id,
2980
find_ghosts=find_ghosts).get_keys()
2981
except errors.NoSuchRevision:
2982
raise errors.InstallFailed([revision_id])
2983
if len(revision_ids) == 0:
2985
return self._pack(self.source, self.target, revision_ids)
2987
def _pack(self, source, target, revision_ids):
2988
from bzrlib.repofmt.pack_repo import Packer
2989
target_pack_collection = self._get_target_pack_collection()
2990
packs = source._pack_collection.all_packs()
2991
pack = Packer(target_pack_collection, packs, '.fetch',
2992
revision_ids).pack()
2993
if pack is not None:
2994
target_pack_collection._save_pack_names()
2995
copied_revs = pack.get_revision_count()
2996
# Trigger an autopack. This may duplicate effort as we've just done
2997
# a pack creation, but for now it is simpler to think about as
2998
# 'upload data, then repack if needed'.
3000
return (copied_revs, [])
3004
def _autopack(self):
3005
self.target._pack_collection.autopack()
3007
def _get_target_pack_collection(self):
3008
return self.target._pack_collection
3011
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
3012
"""See InterRepository.missing_revision_ids().
3014
:param find_ghosts: Find ghosts throughout the ancestry of
3017
if not find_ghosts and revision_id is not None:
3018
return self._walk_to_common_revisions([revision_id])
3019
elif revision_id is not None:
3020
# Find ghosts: search for revisions pointing from one repository to
3021
# the other, and vice versa, anywhere in the history of revision_id.
3022
graph = self.target_get_graph(other_repository=self.source)
3023
searcher = graph._make_breadth_first_searcher([revision_id])
3027
next_revs, ghosts = searcher.next_with_ghosts()
3028
except StopIteration:
3030
if revision_id in ghosts:
3031
raise errors.NoSuchRevision(self.source, revision_id)
3032
found_ids.update(next_revs)
3033
found_ids.update(ghosts)
3034
found_ids = frozenset(found_ids)
3035
# Double query here: should be able to avoid this by changing the
3036
# graph api further.
3037
result_set = found_ids - frozenset(
3038
self.target_get_parent_map(found_ids))
3040
source_ids = self.source.all_revision_ids()
3041
# source_ids is the worst possible case we may need to pull.
3042
# now we want to filter source_ids against what we actually
3043
# have in target, but don't try to check for existence where we know
3044
# we do not have a revision as that would be pointless.
3045
target_ids = set(self.target.all_revision_ids())
3046
result_set = set(source_ids).difference(target_ids)
3047
return self.source.revision_ids_to_search_result(result_set)
3050
class InterModel1and2(InterRepository):
3053
def _get_repo_format_to_test(self):
3057
def is_compatible(source, target):
3058
if not source.supports_rich_root() and target.supports_rich_root():
3064
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
3065
"""See InterRepository.fetch()."""
3066
from bzrlib.fetch import Model1toKnit2Fetcher
3067
f = Model1toKnit2Fetcher(to_repository=self.target,
3068
from_repository=self.source,
3069
last_revision=revision_id,
3070
pb=pb, find_ghosts=find_ghosts)
3071
return f.count_copied, f.failed_revisions
3074
def copy_content(self, revision_id=None):
3075
"""Make a complete copy of the content in self into destination.
3077
This is a destructive operation! Do not use it on existing
3080
:param revision_id: Only copy the content needed to construct
3081
revision_id and its parents.
3084
self.target.set_make_working_trees(self.source.make_working_trees())
3085
except NotImplementedError:
3087
# but don't bother fetching if we have the needed data now.
3088
if (revision_id not in (None, _mod_revision.NULL_REVISION) and
3089
self.target.has_revision(revision_id)):
3091
self.target.fetch(self.source, revision_id=revision_id)
3094
class InterKnit1and2(InterKnitRepo):
3097
def _get_repo_format_to_test(self):
3101
def is_compatible(source, target):
3102
"""Be compatible with Knit1 source and Knit3 target"""
3104
from bzrlib.repofmt.knitrepo import (
3105
RepositoryFormatKnit1,
3106
RepositoryFormatKnit3,
3108
from bzrlib.repofmt.pack_repo import (
3109
RepositoryFormatKnitPack1,
3110
RepositoryFormatKnitPack3,
3111
RepositoryFormatKnitPack4,
3112
RepositoryFormatKnitPack5,
3113
RepositoryFormatKnitPack5RichRoot,
3114
RepositoryFormatKnitPack6,
3115
RepositoryFormatKnitPack6RichRoot,
3116
RepositoryFormatPackDevelopment2,
3117
RepositoryFormatPackDevelopment2Subtree,
3120
RepositoryFormatKnit1, # no rr, no subtree
3121
RepositoryFormatKnitPack1, # no rr, no subtree
3122
RepositoryFormatPackDevelopment2, # no rr, no subtree
3123
RepositoryFormatKnitPack5, # no rr, no subtree
3124
RepositoryFormatKnitPack6, # no rr, no subtree
3127
RepositoryFormatKnit3, # rr, subtree
3128
RepositoryFormatKnitPack3, # rr, subtree
3129
RepositoryFormatKnitPack4, # rr, no subtree
3130
RepositoryFormatKnitPack5RichRoot,# rr, no subtree
3131
RepositoryFormatKnitPack6RichRoot,# rr, no subtree
3132
RepositoryFormatPackDevelopment2Subtree, # rr, subtree
3134
for format in norichroot:
3135
if format.rich_root_data:
3136
raise AssertionError('Format %s is a rich-root format'
3137
' but is included in the non-rich-root list'
3139
for format in richroot:
3140
if not format.rich_root_data:
3141
raise AssertionError('Format %s is not a rich-root format'
3142
' but is included in the rich-root list'
3144
# TODO: One alternative is to just check format.rich_root_data,
3145
# instead of keeping membership lists. However, the formats
3146
# *also* have to use the same 'Knit' style of storage
3147
# (line-deltas, fulltexts, etc.)
3148
return (isinstance(source._format, norichroot) and
3149
isinstance(target._format, richroot))
3150
except AttributeError:
3154
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
3155
"""See InterRepository.fetch()."""
3156
from bzrlib.fetch import Knit1to2Fetcher
3157
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
3158
self.source, self.source._format, self.target,
3159
self.target._format)
3160
f = Knit1to2Fetcher(to_repository=self.target,
3161
from_repository=self.source,
3162
last_revision=revision_id,
3163
pb=pb, find_ghosts=find_ghosts)
3164
return f.count_copied, f.failed_revisions
3167
class InterDifferingSerializer(InterKnitRepo):
3727
class InterDifferingSerializer(InterRepository):
3170
3730
def _get_repo_format_to_test(self):
3174
3734
def is_compatible(source, target):
3175
3735
"""Be compatible with Knit2 source and Knit3 target"""
3176
if source.supports_rich_root() != target.supports_rich_root():
3178
# Ideally, we'd support fetching if the source had no tree references
3179
# even if it supported them...
3180
if (getattr(source, '_format.supports_tree_reference', False) and
3181
not getattr(target, '_format.supports_tree_reference', False)):
3736
# This is redundant with format.check_conversion_target(), however that
3737
# raises an exception, and we just want to say "False" as in we won't
3738
# support converting between these formats.
3739
if 'IDS_never' in debug.debug_flags:
3741
if source.supports_rich_root() and not target.supports_rich_root():
3743
if (source._format.supports_tree_reference
3744
and not target._format.supports_tree_reference):
3746
if target._fallback_repositories and target._format.supports_chks:
3747
# IDS doesn't know how to copy CHKs for the parent inventories it
3748
# adds to stacked repos.
3750
if 'IDS_always' in debug.debug_flags:
3752
# Only use this code path for local source and target. IDS does far
3753
# too much IO (both bandwidth and roundtrips) over a network.
3754
if not source.bzrdir.transport.base.startswith('file:///'):
3756
if not target.bzrdir.transport.base.startswith('file:///'):
3185
def _fetch_batch(self, revision_ids, basis_id, basis_tree):
3760
def _get_trees(self, revision_ids, cache):
3762
for rev_id in revision_ids:
3764
possible_trees.append((rev_id, cache[rev_id]))
3766
# Not cached, but inventory might be present anyway.
3768
tree = self.source.revision_tree(rev_id)
3769
except errors.NoSuchRevision:
3770
# Nope, parent is ghost.
3773
cache[rev_id] = tree
3774
possible_trees.append((rev_id, tree))
3775
return possible_trees
3777
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3778
"""Get the best delta and base for this revision.
3780
:return: (basis_id, delta)
3783
# Generate deltas against each tree, to find the shortest.
3784
texts_possibly_new_in_tree = set()
3785
for basis_id, basis_tree in possible_trees:
3786
delta = tree.inventory._make_delta(basis_tree.inventory)
3787
for old_path, new_path, file_id, new_entry in delta:
3788
if new_path is None:
3789
# This file_id isn't present in the new rev, so we don't
3793
# Rich roots are handled elsewhere...
3795
kind = new_entry.kind
3796
if kind != 'directory' and kind != 'file':
3797
# No text record associated with this inventory entry.
3799
# This is a directory or file that has changed somehow.
3800
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3801
deltas.append((len(delta), basis_id, delta))
3803
return deltas[0][1:]
3805
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3806
"""Find all parent revisions that are absent, but for which the
3807
inventory is present, and copy those inventories.
3809
This is necessary to preserve correctness when the source is stacked
3810
without fallbacks configured. (Note that in cases like upgrade the
3811
source may be not have _fallback_repositories even though it is
3815
for parents in parent_map.values():
3816
parent_revs.update(parents)
3817
present_parents = self.source.get_parent_map(parent_revs)
3818
absent_parents = set(parent_revs).difference(present_parents)
3819
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3820
(rev_id,) for rev_id in absent_parents)
3821
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3822
for parent_tree in self.source.revision_trees(parent_inv_ids):
3823
current_revision_id = parent_tree.get_revision_id()
3824
parents_parents_keys = parent_invs_keys_for_stacking[
3825
(current_revision_id,)]
3826
parents_parents = [key[-1] for key in parents_parents_keys]
3827
basis_id = _mod_revision.NULL_REVISION
3828
basis_tree = self.source.revision_tree(basis_id)
3829
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3830
self.target.add_inventory_by_delta(
3831
basis_id, delta, current_revision_id, parents_parents)
3832
cache[current_revision_id] = parent_tree
3834
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3186
3835
"""Fetch across a few revisions.
3188
3837
:param revision_ids: The revisions to copy
3189
:param basis_id: The revision_id of basis_tree
3190
:param basis_tree: A tree that is not in revision_ids which should
3191
already exist in the target.
3192
:return: (basis_id, basis_tree) A new basis to use now that these trees
3838
:param basis_id: The revision_id of a tree that must be in cache, used
3839
as a basis for delta when no other base is available
3840
:param cache: A cache of RevisionTrees that we can use.
3841
:param a_graph: A Graph object to determine the heads() of the
3842
rich-root data stream.
3843
:return: The revision_id of the last converted tree. The RevisionTree
3844
for it will be in cache
3195
3846
# Walk though all revisions; get inventory deltas, copy referenced
3196
3847
# texts that delta references, insert the delta, revision and
3849
root_keys_to_create = set()
3198
3850
text_keys = set()
3199
3851
pending_deltas = []
3200
3852
pending_revisions = []
3853
parent_map = self.source.get_parent_map(revision_ids)
3854
self._fetch_parent_invs_for_stacking(parent_map, cache)
3855
self.source._safe_to_return_from_cache = True
3201
3856
for tree in self.source.revision_trees(revision_ids):
3857
# Find a inventory delta for this revision.
3858
# Find text entries that need to be copied, too.
3202
3859
current_revision_id = tree.get_revision_id()
3203
delta = tree.inventory._make_delta(basis_tree.inventory)
3204
for old_path, new_path, file_id, entry in delta:
3205
if new_path is not None:
3206
if not (new_path or self.target.supports_rich_root()):
3207
# We leave the inventory delta in, because that
3208
# will have the deserialised inventory root
3212
# "if entry.revision == current_revision_id" ?
3213
if entry.revision == current_revision_id:
3214
text_keys.add((file_id, entry.revision))
3860
parent_ids = parent_map.get(current_revision_id, ())
3861
parent_trees = self._get_trees(parent_ids, cache)
3862
possible_trees = list(parent_trees)
3863
if len(possible_trees) == 0:
3864
# There either aren't any parents, or the parents are ghosts,
3865
# so just use the last converted tree.
3866
possible_trees.append((basis_id, cache[basis_id]))
3867
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3215
3869
revision = self.source.get_revision(current_revision_id)
3216
3870
pending_deltas.append((basis_id, delta,
3217
3871
current_revision_id, revision.parent_ids))
3872
if self._converting_to_rich_root:
3873
self._revision_id_to_root_id[current_revision_id] = \
3875
# Determine which texts are in present in this revision but not in
3876
# any of the available parents.
3877
texts_possibly_new_in_tree = set()
3878
for old_path, new_path, file_id, entry in delta:
3879
if new_path is None:
3880
# This file_id isn't present in the new rev
3884
if not self.target.supports_rich_root():
3885
# The target doesn't support rich root, so we don't
3888
if self._converting_to_rich_root:
3889
# This can't be copied normally, we have to insert
3891
root_keys_to_create.add((file_id, entry.revision))
3894
texts_possibly_new_in_tree.add((file_id, entry.revision))
3895
for basis_id, basis_tree in possible_trees:
3896
basis_inv = basis_tree.inventory
3897
for file_key in list(texts_possibly_new_in_tree):
3898
file_id, file_revision = file_key
3900
entry = basis_inv[file_id]
3901
except errors.NoSuchId:
3903
if entry.revision == file_revision:
3904
texts_possibly_new_in_tree.remove(file_key)
3905
text_keys.update(texts_possibly_new_in_tree)
3218
3906
pending_revisions.append(revision)
3907
cache[current_revision_id] = tree
3219
3908
basis_id = current_revision_id
3909
self.source._safe_to_return_from_cache = False
3221
3910
# Copy file texts
3222
3911
from_texts = self.source.texts
3223
3912
to_texts = self.target.texts
3913
if root_keys_to_create:
3914
root_stream = _mod_fetch._new_root_data_stream(
3915
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3916
self.source, graph=a_graph)
3917
to_texts.insert_record_stream(root_stream)
3224
3918
to_texts.insert_record_stream(from_texts.get_record_stream(
3225
text_keys, self.target._fetch_order,
3226
not self.target._fetch_uses_deltas))
3919
text_keys, self.target._format._fetch_order,
3920
not self.target._format._fetch_uses_deltas))
3921
# insert inventory deltas
3228
3922
for delta in pending_deltas:
3229
3923
self.target.add_inventory_by_delta(*delta)
3924
if self.target._fallback_repositories:
3925
# Make sure this stacked repository has all the parent inventories
3926
# for the new revisions that we are about to insert. We do this
3927
# before adding the revisions so that no revision is added until
3928
# all the inventories it may depend on are added.
3929
# Note that this is overzealous, as we may have fetched these in an
3932
revision_ids = set()
3933
for revision in pending_revisions:
3934
revision_ids.add(revision.revision_id)
3935
parent_ids.update(revision.parent_ids)
3936
parent_ids.difference_update(revision_ids)
3937
parent_ids.discard(_mod_revision.NULL_REVISION)
3938
parent_map = self.source.get_parent_map(parent_ids)
3939
# we iterate over parent_map and not parent_ids because we don't
3940
# want to try copying any revision which is a ghost
3941
for parent_tree in self.source.revision_trees(parent_map):
3942
current_revision_id = parent_tree.get_revision_id()
3943
parents_parents = parent_map[current_revision_id]
3944
possible_trees = self._get_trees(parents_parents, cache)
3945
if len(possible_trees) == 0:
3946
# There either aren't any parents, or the parents are
3947
# ghosts, so just use the last converted tree.
3948
possible_trees.append((basis_id, cache[basis_id]))
3949
basis_id, delta = self._get_delta_for_revision(parent_tree,
3950
parents_parents, possible_trees)
3951
self.target.add_inventory_by_delta(
3952
basis_id, delta, current_revision_id, parents_parents)
3230
3953
# insert signatures and revisions
3231
3954
for revision in pending_revisions:
3309
4073
return basis_id, basis_tree
3312
class InterOtherToRemote(InterRepository):
3313
"""An InterRepository that simply delegates to the 'real' InterRepository
3314
calculated for (source, target._real_repository).
3317
_walk_to_common_revisions_batch_size = 50
3319
def __init__(self, source, target):
3320
InterRepository.__init__(self, source, target)
3321
self._real_inter = None
3324
def is_compatible(source, target):
3325
if isinstance(target, remote.RemoteRepository):
3329
def _ensure_real_inter(self):
3330
if self._real_inter is None:
3331
self.target._ensure_real()
3332
real_target = self.target._real_repository
3333
self._real_inter = InterRepository.get(self.source, real_target)
3334
# Make _real_inter use the RemoteRepository for get_parent_map
3335
self._real_inter.target_get_graph = self.target.get_graph
3336
self._real_inter.target_get_parent_map = self.target.get_parent_map
3338
def copy_content(self, revision_id=None):
3339
self._ensure_real_inter()
3340
self._real_inter.copy_content(revision_id=revision_id)
3342
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
3343
self._ensure_real_inter()
3344
return self._real_inter.fetch(revision_id=revision_id, pb=pb,
3345
find_ghosts=find_ghosts)
3348
def _get_repo_format_to_test(self):
3352
class InterRemoteToOther(InterRepository):
3354
def __init__(self, source, target):
3355
InterRepository.__init__(self, source, target)
3356
self._real_inter = None
3359
def is_compatible(source, target):
3360
if not isinstance(source, remote.RemoteRepository):
3362
# Is source's model compatible with target's model?
3363
source._ensure_real()
3364
real_source = source._real_repository
3365
if isinstance(real_source, remote.RemoteRepository):
3366
raise NotImplementedError(
3367
"We don't support remote repos backed by remote repos yet.")
3368
return InterRepository._same_model(real_source, target)
3370
def _ensure_real_inter(self):
3371
if self._real_inter is None:
3372
self.source._ensure_real()
3373
real_source = self.source._real_repository
3374
self._real_inter = InterRepository.get(real_source, self.target)
3376
def fetch(self, revision_id=None, pb=None, find_ghosts=False):
3377
self._ensure_real_inter()
3378
return self._real_inter.fetch(revision_id=revision_id, pb=pb,
3379
find_ghosts=find_ghosts)
3381
def copy_content(self, revision_id=None):
3382
self._ensure_real_inter()
3383
self._real_inter.copy_content(revision_id=revision_id)
3386
def _get_repo_format_to_test(self):
3391
class InterPackToRemotePack(InterPackRepo):
3392
"""A specialisation of InterPackRepo for a target that is a
3395
This will use the get_parent_map RPC rather than plain readvs, and also
3396
uses an RPC for autopacking.
3399
_walk_to_common_revisions_batch_size = 50
3402
def is_compatible(source, target):
3403
from bzrlib.repofmt.pack_repo import RepositoryFormatPack
3404
if isinstance(source._format, RepositoryFormatPack):
3405
if isinstance(target, remote.RemoteRepository):
3406
target._ensure_real()
3407
if isinstance(target._real_repository._format,
3408
RepositoryFormatPack):
3409
if InterRepository._same_model(source, target):
3413
def _autopack(self):
3414
self.target.autopack()
3416
def _get_target_pack_collection(self):
3417
return self.target._real_repository._pack_collection
3420
def _get_repo_format_to_test(self):
3424
4076
InterRepository.register_optimiser(InterDifferingSerializer)
3425
4077
InterRepository.register_optimiser(InterSameDataRepository)
3426
4078
InterRepository.register_optimiser(InterWeaveRepo)
3427
4079
InterRepository.register_optimiser(InterKnitRepo)
3428
InterRepository.register_optimiser(InterModel1and2)
3429
InterRepository.register_optimiser(InterKnit1and2)
3430
InterRepository.register_optimiser(InterPackRepo)
3431
InterRepository.register_optimiser(InterOtherToRemote)
3432
InterRepository.register_optimiser(InterRemoteToOther)
3433
InterRepository.register_optimiser(InterPackToRemotePack)
3436
4082
class CopyConverter(object):
3437
4083
"""A repository conversion tool which just performs a copy of the content.
3439
4085
This is slow but quite reliable.
3587
4242
revision_graph[key] = tuple(parent for parent in parents if parent
3588
4243
in revision_graph)
3589
4244
return revision_graph
4247
class StreamSink(object):
4248
"""An object that can insert a stream into a repository.
4250
This interface handles the complexity of reserialising inventories and
4251
revisions from different formats, and allows unidirectional insertion into
4252
stacked repositories without looking for the missing basis parents
4256
def __init__(self, target_repo):
4257
self.target_repo = target_repo
4259
def insert_stream(self, stream, src_format, resume_tokens):
4260
"""Insert a stream's content into the target repository.
4262
:param src_format: a bzr repository format.
4264
:return: a list of resume tokens and an iterable of keys additional
4265
items required before the insertion can be completed.
4267
self.target_repo.lock_write()
4270
self.target_repo.resume_write_group(resume_tokens)
4273
self.target_repo.start_write_group()
4276
# locked_insert_stream performs a commit|suspend.
4277
return self._locked_insert_stream(stream, src_format, is_resume)
4279
self.target_repo.abort_write_group(suppress_errors=True)
4282
self.target_repo.unlock()
4284
def _locked_insert_stream(self, stream, src_format, is_resume):
4285
to_serializer = self.target_repo._format._serializer
4286
src_serializer = src_format._serializer
4288
if to_serializer == src_serializer:
4289
# If serializers match and the target is a pack repository, set the
4290
# write cache size on the new pack. This avoids poor performance
4291
# on transports where append is unbuffered (such as
4292
# RemoteTransport). This is safe to do because nothing should read
4293
# back from the target repository while a stream with matching
4294
# serialization is being inserted.
4295
# The exception is that a delta record from the source that should
4296
# be a fulltext may need to be expanded by the target (see
4297
# test_fetch_revisions_with_deltas_into_pack); but we take care to
4298
# explicitly flush any buffered writes first in that rare case.
4300
new_pack = self.target_repo._pack_collection._new_pack
4301
except AttributeError:
4302
# Not a pack repository
4305
new_pack.set_write_cache_size(1024*1024)
4306
for substream_type, substream in stream:
4307
if 'stream' in debug.debug_flags:
4308
mutter('inserting substream: %s', substream_type)
4309
if substream_type == 'texts':
4310
self.target_repo.texts.insert_record_stream(substream)
4311
elif substream_type == 'inventories':
4312
if src_serializer == to_serializer:
4313
self.target_repo.inventories.insert_record_stream(
4316
self._extract_and_insert_inventories(
4317
substream, src_serializer)
4318
elif substream_type == 'inventory-deltas':
4319
self._extract_and_insert_inventory_deltas(
4320
substream, src_serializer)
4321
elif substream_type == 'chk_bytes':
4322
# XXX: This doesn't support conversions, as it assumes the
4323
# conversion was done in the fetch code.
4324
self.target_repo.chk_bytes.insert_record_stream(substream)
4325
elif substream_type == 'revisions':
4326
# This may fallback to extract-and-insert more often than
4327
# required if the serializers are different only in terms of
4329
if src_serializer == to_serializer:
4330
self.target_repo.revisions.insert_record_stream(
4333
self._extract_and_insert_revisions(substream,
4335
elif substream_type == 'signatures':
4336
self.target_repo.signatures.insert_record_stream(substream)
4338
raise AssertionError('kaboom! %s' % (substream_type,))
4339
# Done inserting data, and the missing_keys calculations will try to
4340
# read back from the inserted data, so flush the writes to the new pack
4341
# (if this is pack format).
4342
if new_pack is not None:
4343
new_pack._write_data('', flush=True)
4344
# Find all the new revisions (including ones from resume_tokens)
4345
missing_keys = self.target_repo.get_missing_parent_inventories(
4346
check_for_missing_texts=is_resume)
4348
for prefix, versioned_file in (
4349
('texts', self.target_repo.texts),
4350
('inventories', self.target_repo.inventories),
4351
('revisions', self.target_repo.revisions),
4352
('signatures', self.target_repo.signatures),
4353
('chk_bytes', self.target_repo.chk_bytes),
4355
if versioned_file is None:
4357
# TODO: key is often going to be a StaticTuple object
4358
# I don't believe we can define a method by which
4359
# (prefix,) + StaticTuple will work, though we could
4360
# define a StaticTuple.sq_concat that would allow you to
4361
# pass in either a tuple or a StaticTuple as the second
4362
# object, so instead we could have:
4363
# StaticTuple(prefix) + key here...
4364
missing_keys.update((prefix,) + key for key in
4365
versioned_file.get_missing_compression_parent_keys())
4366
except NotImplementedError:
4367
# cannot even attempt suspending, and missing would have failed
4368
# during stream insertion.
4369
missing_keys = set()
4372
# suspend the write group and tell the caller what we is
4373
# missing. We know we can suspend or else we would not have
4374
# entered this code path. (All repositories that can handle
4375
# missing keys can handle suspending a write group).
4376
write_group_tokens = self.target_repo.suspend_write_group()
4377
return write_group_tokens, missing_keys
4378
hint = self.target_repo.commit_write_group()
4379
if (to_serializer != src_serializer and
4380
self.target_repo._format.pack_compresses):
4381
self.target_repo.pack(hint=hint)
4384
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4385
target_rich_root = self.target_repo._format.rich_root_data
4386
target_tree_refs = self.target_repo._format.supports_tree_reference
4387
for record in substream:
4388
# Insert the delta directly
4389
inventory_delta_bytes = record.get_bytes_as('fulltext')
4390
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4392
parse_result = deserialiser.parse_text_bytes(
4393
inventory_delta_bytes)
4394
except inventory_delta.IncompatibleInventoryDelta, err:
4395
trace.mutter("Incompatible delta: %s", err.msg)
4396
raise errors.IncompatibleRevision(self.target_repo._format)
4397
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4398
revision_id = new_id
4399
parents = [key[0] for key in record.parents]
4400
self.target_repo.add_inventory_by_delta(
4401
basis_id, inv_delta, revision_id, parents)
4403
def _extract_and_insert_inventories(self, substream, serializer,
4405
"""Generate a new inventory versionedfile in target, converting data.
4407
The inventory is retrieved from the source, (deserializing it), and
4408
stored in the target (reserializing it in a different format).
4410
target_rich_root = self.target_repo._format.rich_root_data
4411
target_tree_refs = self.target_repo._format.supports_tree_reference
4412
for record in substream:
4413
# It's not a delta, so it must be a fulltext in the source
4414
# serializer's format.
4415
bytes = record.get_bytes_as('fulltext')
4416
revision_id = record.key[0]
4417
inv = serializer.read_inventory_from_string(bytes, revision_id)
4418
parents = [key[0] for key in record.parents]
4419
self.target_repo.add_inventory(revision_id, inv, parents)
4420
# No need to keep holding this full inv in memory when the rest of
4421
# the substream is likely to be all deltas.
4424
def _extract_and_insert_revisions(self, substream, serializer):
4425
for record in substream:
4426
bytes = record.get_bytes_as('fulltext')
4427
revision_id = record.key[0]
4428
rev = serializer.read_revision_from_string(bytes)
4429
if rev.revision_id != revision_id:
4430
raise AssertionError('wtf: %s != %s' % (rev, revision_id))
4431
self.target_repo.add_revision(revision_id, rev)
4434
if self.target_repo._format._fetch_reconcile:
4435
self.target_repo.reconcile()
4438
class StreamSource(object):
4439
"""A source of a stream for fetching between repositories."""
4441
def __init__(self, from_repository, to_format):
4442
"""Create a StreamSource streaming from from_repository."""
4443
self.from_repository = from_repository
4444
self.to_format = to_format
4446
def delta_on_metadata(self):
4447
"""Return True if delta's are permitted on metadata streams.
4449
That is on revisions and signatures.
4451
src_serializer = self.from_repository._format._serializer
4452
target_serializer = self.to_format._serializer
4453
return (self.to_format._fetch_uses_deltas and
4454
src_serializer == target_serializer)
4456
def _fetch_revision_texts(self, revs):
4457
# fetch signatures first and then the revision texts
4458
# may need to be a InterRevisionStore call here.
4459
from_sf = self.from_repository.signatures
4460
# A missing signature is just skipped.
4461
keys = [(rev_id,) for rev_id in revs]
4462
signatures = versionedfile.filter_absent(from_sf.get_record_stream(
4464
self.to_format._fetch_order,
4465
not self.to_format._fetch_uses_deltas))
4466
# If a revision has a delta, this is actually expanded inside the
4467
# insert_record_stream code now, which is an alternate fix for
4469
from_rf = self.from_repository.revisions
4470
revisions = from_rf.get_record_stream(
4472
self.to_format._fetch_order,
4473
not self.delta_on_metadata())
4474
return [('signatures', signatures), ('revisions', revisions)]
4476
def _generate_root_texts(self, revs):
4477
"""This will be called by get_stream between fetching weave texts and
4478
fetching the inventory weave.
4480
if self._rich_root_upgrade():
4481
return _mod_fetch.Inter1and2Helper(
4482
self.from_repository).generate_root_texts(revs)
4486
def get_stream(self, search):
4488
revs = search.get_keys()
4489
graph = self.from_repository.get_graph()
4490
revs = tsort.topo_sort(graph.get_parent_map(revs))
4491
data_to_fetch = self.from_repository.item_keys_introduced_by(revs)
4493
for knit_kind, file_id, revisions in data_to_fetch:
4494
if knit_kind != phase:
4496
# Make a new progress bar for this phase
4497
if knit_kind == "file":
4498
# Accumulate file texts
4499
text_keys.extend([(file_id, revision) for revision in
4501
elif knit_kind == "inventory":
4502
# Now copy the file texts.
4503
from_texts = self.from_repository.texts
4504
yield ('texts', from_texts.get_record_stream(
4505
text_keys, self.to_format._fetch_order,
4506
not self.to_format._fetch_uses_deltas))
4507
# Cause an error if a text occurs after we have done the
4510
# Before we process the inventory we generate the root
4511
# texts (if necessary) so that the inventories references
4513
for _ in self._generate_root_texts(revs):
4515
# we fetch only the referenced inventories because we do not
4516
# know for unselected inventories whether all their required
4517
# texts are present in the other repository - it could be
4519
for info in self._get_inventory_stream(revs):
4521
elif knit_kind == "signatures":
4522
# Nothing to do here; this will be taken care of when
4523
# _fetch_revision_texts happens.
4525
elif knit_kind == "revisions":
4526
for record in self._fetch_revision_texts(revs):
4529
raise AssertionError("Unknown knit kind %r" % knit_kind)
4531
def get_stream_for_missing_keys(self, missing_keys):
4532
# missing keys can only occur when we are byte copying and not
4533
# translating (because translation means we don't send
4534
# unreconstructable deltas ever).
4536
keys['texts'] = set()
4537
keys['revisions'] = set()
4538
keys['inventories'] = set()
4539
keys['chk_bytes'] = set()
4540
keys['signatures'] = set()
4541
for key in missing_keys:
4542
keys[key[0]].add(key[1:])
4543
if len(keys['revisions']):
4544
# If we allowed copying revisions at this point, we could end up
4545
# copying a revision without copying its required texts: a
4546
# violation of the requirements for repository integrity.
4547
raise AssertionError(
4548
'cannot copy revisions to fill in missing deltas %s' % (
4549
keys['revisions'],))
4550
for substream_kind, keys in keys.iteritems():
4551
vf = getattr(self.from_repository, substream_kind)
4552
if vf is None and keys:
4553
raise AssertionError(
4554
"cannot fill in keys for a versioned file we don't"
4555
" have: %s needs %s" % (substream_kind, keys))
4557
# No need to stream something we don't have
4559
if substream_kind == 'inventories':
4560
# Some missing keys are genuinely ghosts, filter those out.
4561
present = self.from_repository.inventories.get_parent_map(keys)
4562
revs = [key[0] for key in present]
4563
# Get the inventory stream more-or-less as we do for the
4564
# original stream; there's no reason to assume that records
4565
# direct from the source will be suitable for the sink. (Think
4566
# e.g. 2a -> 1.9-rich-root).
4567
for info in self._get_inventory_stream(revs, missing=True):
4571
# Ask for full texts always so that we don't need more round trips
4572
# after this stream.
4573
# Some of the missing keys are genuinely ghosts, so filter absent
4574
# records. The Sink is responsible for doing another check to
4575
# ensure that ghosts don't introduce missing data for future
4577
stream = versionedfile.filter_absent(vf.get_record_stream(keys,
4578
self.to_format._fetch_order, True))
4579
yield substream_kind, stream
4581
def inventory_fetch_order(self):
4582
if self._rich_root_upgrade():
4583
return 'topological'
4585
return self.to_format._fetch_order
4587
def _rich_root_upgrade(self):
4588
return (not self.from_repository._format.rich_root_data and
4589
self.to_format.rich_root_data)
4591
def _get_inventory_stream(self, revision_ids, missing=False):
4592
from_format = self.from_repository._format
4593
if (from_format.supports_chks and self.to_format.supports_chks and
4594
from_format.network_name() == self.to_format.network_name()):
4595
raise AssertionError(
4596
"this case should be handled by GroupCHKStreamSource")
4597
elif 'forceinvdeltas' in debug.debug_flags:
4598
return self._get_convertable_inventory_stream(revision_ids,
4599
delta_versus_null=missing)
4600
elif from_format.network_name() == self.to_format.network_name():
4602
return self._get_simple_inventory_stream(revision_ids,
4604
elif (not from_format.supports_chks and not self.to_format.supports_chks
4605
and from_format._serializer == self.to_format._serializer):
4606
# Essentially the same format.
4607
return self._get_simple_inventory_stream(revision_ids,
4610
# Any time we switch serializations, we want to use an
4611
# inventory-delta based approach.
4612
return self._get_convertable_inventory_stream(revision_ids,
4613
delta_versus_null=missing)
4615
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4616
# NB: This currently reopens the inventory weave in source;
4617
# using a single stream interface instead would avoid this.
4618
from_weave = self.from_repository.inventories
4620
delta_closure = True
4622
delta_closure = not self.delta_on_metadata()
4623
yield ('inventories', from_weave.get_record_stream(
4624
[(rev_id,) for rev_id in revision_ids],
4625
self.inventory_fetch_order(), delta_closure))
4627
def _get_convertable_inventory_stream(self, revision_ids,
4628
delta_versus_null=False):
4629
# The source is using CHKs, but the target either doesn't or it has a
4630
# different serializer. The StreamSink code expects to be able to
4631
# convert on the target, so we need to put bytes-on-the-wire that can
4632
# be converted. That means inventory deltas (if the remote is <1.19,
4633
# RemoteStreamSink will fallback to VFS to insert the deltas).
4634
yield ('inventory-deltas',
4635
self._stream_invs_as_deltas(revision_ids,
4636
delta_versus_null=delta_versus_null))
4638
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4639
"""Return a stream of inventory-deltas for the given rev ids.
4641
:param revision_ids: The list of inventories to transmit
4642
:param delta_versus_null: Don't try to find a minimal delta for this
4643
entry, instead compute the delta versus the NULL_REVISION. This
4644
effectively streams a complete inventory. Used for stuff like
4645
filling in missing parents, etc.
4647
from_repo = self.from_repository
4648
revision_keys = [(rev_id,) for rev_id in revision_ids]
4649
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4650
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4652
inventories = self.from_repository.iter_inventories(
4653
revision_ids, 'topological')
4654
format = from_repo._format
4655
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4656
inventory_cache = lru_cache.LRUCache(50)
4657
null_inventory = from_repo.revision_tree(
4658
_mod_revision.NULL_REVISION).inventory
4659
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4660
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4661
# repo back into a non-rich-root repo ought to be allowed)
4662
serializer = inventory_delta.InventoryDeltaSerializer(
4663
versioned_root=format.rich_root_data,
4664
tree_references=format.supports_tree_reference)
4665
for inv in inventories:
4666
key = (inv.revision_id,)
4667
parent_keys = parent_map.get(key, ())
4669
if not delta_versus_null and parent_keys:
4670
# The caller did not ask for complete inventories and we have
4671
# some parents that we can delta against. Make a delta against
4672
# each parent so that we can find the smallest.
4673
parent_ids = [parent_key[0] for parent_key in parent_keys]
4674
for parent_id in parent_ids:
4675
if parent_id not in invs_sent_so_far:
4676
# We don't know that the remote side has this basis, so
4679
if parent_id == _mod_revision.NULL_REVISION:
4680
parent_inv = null_inventory
4682
parent_inv = inventory_cache.get(parent_id, None)
4683
if parent_inv is None:
4684
parent_inv = from_repo.get_inventory(parent_id)
4685
candidate_delta = inv._make_delta(parent_inv)
4686
if (delta is None or
4687
len(delta) > len(candidate_delta)):
4688
delta = candidate_delta
4689
basis_id = parent_id
4691
# Either none of the parents ended up being suitable, or we
4692
# were asked to delta against NULL
4693
basis_id = _mod_revision.NULL_REVISION
4694
delta = inv._make_delta(null_inventory)
4695
invs_sent_so_far.add(inv.revision_id)
4696
inventory_cache[inv.revision_id] = inv
4697
delta_serialized = ''.join(
4698
serializer.delta_to_lines(basis_id, key[-1], delta))
4699
yield versionedfile.FulltextContentFactory(
4700
key, parent_keys, None, delta_serialized)
4703
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4704
stop_revision=None):
4705
"""Extend the partial history to include a given index
4707
If a stop_index is supplied, stop when that index has been reached.
4708
If a stop_revision is supplied, stop when that revision is
4709
encountered. Otherwise, stop when the beginning of history is
4712
:param stop_index: The index which should be present. When it is
4713
present, history extension will stop.
4714
:param stop_revision: The revision id which should be present. When
4715
it is encountered, history extension will stop.
4717
start_revision = partial_history_cache[-1]
4718
iterator = repo.iter_reverse_revision_history(start_revision)
4720
#skip the last revision in the list
4723
if (stop_index is not None and
4724
len(partial_history_cache) > stop_index):
4726
if partial_history_cache[-1] == stop_revision:
4728
revision_id = iterator.next()
4729
partial_history_cache.append(revision_id)
4730
except StopIteration:
added
removed
bzrlib/repository.py
