583
540
class GCRepositoryPackCollection(RepositoryPackCollection):
585
542
pack_factory = GCPack
586
resumed_pack_factory = ResumedGCPack
588
def _check_new_inventories(self):
589
"""Detect missing inventories or chk root entries for the new revisions
592
:returns: list of strs, summarising any problems found. If the list is
593
empty no problems were found.
595
# Ensure that all revisions added in this write group have:
596
# - corresponding inventories,
597
# - chk root entries for those inventories,
598
# - and any present parent inventories have their chk root
600
# And all this should be independent of any fallback repository.
602
key_deps = self.repo.revisions._index._key_dependencies
603
new_revisions_keys = key_deps.get_new_keys()
604
no_fallback_inv_index = self.repo.inventories._index
605
no_fallback_chk_bytes_index = self.repo.chk_bytes._index
606
no_fallback_texts_index = self.repo.texts._index
607
inv_parent_map = no_fallback_inv_index.get_parent_map(
609
# Are any inventories for corresponding to the new revisions missing?
610
corresponding_invs = set(inv_parent_map)
611
missing_corresponding = set(new_revisions_keys)
612
missing_corresponding.difference_update(corresponding_invs)
613
if missing_corresponding:
614
problems.append("inventories missing for revisions %s" %
615
(sorted(missing_corresponding),))
617
# Are any chk root entries missing for any inventories? This includes
618
# any present parent inventories, which may be used when calculating
619
# deltas for streaming.
620
all_inv_keys = set(corresponding_invs)
621
for parent_inv_keys in inv_parent_map.itervalues():
622
all_inv_keys.update(parent_inv_keys)
623
# Filter out ghost parents.
624
all_inv_keys.intersection_update(
625
no_fallback_inv_index.get_parent_map(all_inv_keys))
626
parent_invs_only_keys = all_inv_keys.symmetric_difference(
629
inv_ids = [key[-1] for key in all_inv_keys]
630
parent_invs_only_ids = [key[-1] for key in parent_invs_only_keys]
631
root_key_info = _build_interesting_key_sets(
632
self.repo, inv_ids, parent_invs_only_ids)
633
expected_chk_roots = root_key_info.all_keys()
634
present_chk_roots = no_fallback_chk_bytes_index.get_parent_map(
636
missing_chk_roots = expected_chk_roots.difference(present_chk_roots)
637
if missing_chk_roots:
638
problems.append("missing referenced chk root keys: %s"
639
% (sorted(missing_chk_roots),))
640
# Don't bother checking any further.
642
# Find all interesting chk_bytes records, and make sure they are
643
# present, as well as the text keys they reference.
644
chk_bytes_no_fallbacks = self.repo.chk_bytes.without_fallbacks()
645
chk_bytes_no_fallbacks._search_key_func = \
646
self.repo.chk_bytes._search_key_func
647
chk_diff = chk_map.iter_interesting_nodes(
648
chk_bytes_no_fallbacks, root_key_info.interesting_root_keys,
649
root_key_info.uninteresting_root_keys)
650
bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
653
for record in _filter_text_keys(chk_diff, text_keys, bytes_to_info):
655
except errors.NoSuchRevision, e:
656
# XXX: It would be nice if we could give a more precise error here.
657
problems.append("missing chk node(s) for id_to_entry maps")
658
chk_diff = chk_map.iter_interesting_nodes(
659
chk_bytes_no_fallbacks, root_key_info.interesting_pid_root_keys,
660
root_key_info.uninteresting_pid_root_keys)
662
for interesting_rec, interesting_map in chk_diff:
664
except errors.NoSuchRevision, e:
666
"missing chk node(s) for parent_id_basename_to_file_id maps")
667
present_text_keys = no_fallback_texts_index.get_parent_map(text_keys)
668
missing_text_keys = text_keys.difference(present_text_keys)
669
if missing_text_keys:
670
problems.append("missing text keys: %r"
671
% (sorted(missing_text_keys),))
544
def _already_packed(self):
545
"""Is the collection already packed?"""
546
# Always repack GC repositories for now
674
549
def _execute_pack_operations(self, pack_operations,
675
550
_packer_class=GCCHKPacker,
733
604
self.inventories = GroupCompressVersionedFiles(
734
605
_GCGraphIndex(self._pack_collection.inventory_index.combined_index,
735
606
add_callback=self._pack_collection.inventory_index.add_callback,
736
parents=True, is_locked=self.is_locked,
737
inconsistency_fatal=False),
607
parents=True, is_locked=self.is_locked),
738
608
access=self._pack_collection.inventory_index.data_access)
739
609
self.revisions = GroupCompressVersionedFiles(
740
610
_GCGraphIndex(self._pack_collection.revision_index.combined_index,
741
611
add_callback=self._pack_collection.revision_index.add_callback,
742
parents=True, is_locked=self.is_locked,
743
track_external_parent_refs=True, track_new_keys=True),
612
parents=True, is_locked=self.is_locked),
744
613
access=self._pack_collection.revision_index.data_access,
746
615
self.signatures = GroupCompressVersionedFiles(
747
616
_GCGraphIndex(self._pack_collection.signature_index.combined_index,
748
617
add_callback=self._pack_collection.signature_index.add_callback,
749
parents=False, is_locked=self.is_locked,
750
inconsistency_fatal=False),
618
parents=False, is_locked=self.is_locked),
751
619
access=self._pack_collection.signature_index.data_access,
753
621
self.texts = GroupCompressVersionedFiles(
754
622
_GCGraphIndex(self._pack_collection.text_index.combined_index,
755
623
add_callback=self._pack_collection.text_index.add_callback,
756
parents=True, is_locked=self.is_locked,
757
inconsistency_fatal=False),
624
parents=True, is_locked=self.is_locked),
758
625
access=self._pack_collection.text_index.data_access)
759
626
# No parents, individual CHK pages don't have specific ancestry
760
627
self.chk_bytes = GroupCompressVersionedFiles(
761
628
_GCGraphIndex(self._pack_collection.chk_index.combined_index,
762
629
add_callback=self._pack_collection.chk_index.add_callback,
763
parents=False, is_locked=self.is_locked,
764
inconsistency_fatal=False),
630
parents=False, is_locked=self.is_locked),
765
631
access=self._pack_collection.chk_index.data_access)
766
search_key_name = self._format._serializer.search_key_name
767
search_key_func = chk_map.search_key_registry.get(search_key_name)
768
self.chk_bytes._search_key_func = search_key_func
769
632
# True when the repository object is 'write locked' (as opposed to the
770
633
# physical lock only taken out around changes to the pack-names list.)
771
634
# Another way to represent this would be a decorator around the control
794
657
return self._inventory_add_lines(revision_id, parents,
795
658
inv_lines, check_content=False)
797
def _create_inv_from_null(self, delta, revision_id):
798
"""This will mutate new_inv directly.
800
This is a simplified form of create_by_apply_delta which knows that all
801
the old values must be None, so everything is a create.
803
serializer = self._format._serializer
804
new_inv = inventory.CHKInventory(serializer.search_key_name)
805
new_inv.revision_id = revision_id
806
entry_to_bytes = new_inv._entry_to_bytes
807
id_to_entry_dict = {}
808
parent_id_basename_dict = {}
809
for old_path, new_path, file_id, entry in delta:
810
if old_path is not None:
811
raise ValueError('Invalid delta, somebody tried to delete %r'
812
' from the NULL_REVISION'
813
% ((old_path, file_id),))
815
raise ValueError('Invalid delta, delta from NULL_REVISION has'
816
' no new_path %r' % (file_id,))
818
new_inv.root_id = file_id
819
parent_id_basename_key = StaticTuple('', '').intern()
821
utf8_entry_name = entry.name.encode('utf-8')
822
parent_id_basename_key = StaticTuple(entry.parent_id,
823
utf8_entry_name).intern()
824
new_value = entry_to_bytes(entry)
826
# new_inv._path_to_fileid_cache[new_path] = file_id
827
key = StaticTuple(file_id).intern()
828
id_to_entry_dict[key] = new_value
829
parent_id_basename_dict[parent_id_basename_key] = file_id
831
new_inv._populate_from_dicts(self.chk_bytes, id_to_entry_dict,
832
parent_id_basename_dict, maximum_size=serializer.maximum_size)
835
660
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
836
661
parents, basis_inv=None, propagate_caches=False):
837
662
"""Add a new inventory expressed as a delta against another revision.
857
682
repository format specific) of the serialized inventory, and the
858
683
resulting inventory.
685
if basis_revision_id == _mod_revision.NULL_REVISION:
686
return KnitPackRepository.add_inventory_by_delta(self,
687
basis_revision_id, delta, new_revision_id, parents)
860
688
if not self.is_in_write_group():
861
689
raise AssertionError("%r not in write group" % (self,))
862
690
_mod_revision.check_not_reserved_id(new_revision_id)
864
if basis_inv is None:
865
if basis_revision_id == _mod_revision.NULL_REVISION:
866
new_inv = self._create_inv_from_null(delta, new_revision_id)
867
inv_lines = new_inv.to_lines()
868
return self._inventory_add_lines(new_revision_id, parents,
869
inv_lines, check_content=False), new_inv
871
basis_tree = self.revision_tree(basis_revision_id)
872
basis_tree.lock_read()
691
basis_tree = self.revision_tree(basis_revision_id)
692
basis_tree.lock_read()
694
if basis_inv is None:
873
695
basis_inv = basis_tree.inventory
875
696
result = basis_inv.create_by_apply_delta(delta, new_revision_id,
876
697
propagate_caches=propagate_caches)
877
698
inv_lines = result.to_lines()
878
699
return self._inventory_add_lines(new_revision_id, parents,
879
700
inv_lines, check_content=False), result
881
if basis_tree is not None:
884
def _deserialise_inventory(self, revision_id, bytes):
885
return inventory.CHKInventory.deserialise(self.chk_bytes, bytes,
888
def _iter_inventories(self, revision_ids, ordering):
704
def _iter_inventories(self, revision_ids):
889
705
"""Iterate over many inventory objects."""
891
ordering = 'unordered'
892
706
keys = [(revision_id,) for revision_id in revision_ids]
893
stream = self.inventories.get_record_stream(keys, ordering, True)
707
stream = self.inventories.get_record_stream(keys, 'unordered', True)
895
709
for record in stream:
896
710
if record.storage_kind != 'absent':
901
715
yield inventory.CHKInventory.deserialise(self.chk_bytes, texts[key], key)
903
def _iter_inventory_xmls(self, revision_ids, ordering):
904
# Without a native 'xml' inventory, this method doesn't make sense.
905
# However older working trees, and older bundles want it - so we supply
906
# it allowing _get_inventory_xml to work. Bundles currently use the
907
# serializer directly; this also isn't ideal, but there isn't an xml
908
# iteration interface offered at all for repositories. We could make
909
# _iter_inventory_xmls be part of the contract, even if kept private.
910
inv_to_str = self._serializer.write_inventory_to_string
911
for inv in self.iter_inventories(revision_ids, ordering=ordering):
912
yield inv_to_str(inv), inv.revision_id
914
def _find_present_inventory_keys(self, revision_keys):
915
parent_map = self.inventories.get_parent_map(revision_keys)
916
present_inventory_keys = set(k for k in parent_map)
917
return present_inventory_keys
717
def _iter_inventory_xmls(self, revision_ids):
718
# Without a native 'xml' inventory, this method doesn't make sense, so
719
# make it raise to trap naughty direct users.
720
raise NotImplementedError(self._iter_inventory_xmls)
722
def _find_revision_outside_set(self, revision_ids):
723
revision_set = frozenset(revision_ids)
724
for revid in revision_ids:
725
parent_ids = self.get_parent_map([revid]).get(revid, ())
726
for parent in parent_ids:
727
if parent in revision_set:
728
# Parent is not outside the set
730
if parent not in self.get_parent_map([parent]):
734
return _mod_revision.NULL_REVISION
736
def _find_file_keys_to_fetch(self, revision_ids, pb):
737
rich_root = self.supports_rich_root()
738
revision_outside_set = self._find_revision_outside_set(revision_ids)
739
if revision_outside_set == _mod_revision.NULL_REVISION:
740
uninteresting_root_keys = set()
742
uninteresting_inv = self.get_inventory(revision_outside_set)
743
uninteresting_root_keys = set([uninteresting_inv.id_to_entry.key()])
744
interesting_root_keys = set()
745
for idx, inv in enumerate(self.iter_inventories(revision_ids)):
746
interesting_root_keys.add(inv.id_to_entry.key())
747
revision_ids = frozenset(revision_ids)
748
file_id_revisions = {}
749
bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
750
for record, items in chk_map.iter_interesting_nodes(self.chk_bytes,
751
interesting_root_keys, uninteresting_root_keys,
753
# This is cheating a bit to use the last grabbed 'inv', but it
755
for name, bytes in items:
756
(name_utf8, file_id, revision_id) = bytes_to_info(bytes)
757
if not rich_root and name_utf8 == '':
759
if revision_id in revision_ids:
760
# Would we rather build this up into file_id => revision
763
file_id_revisions[file_id].add(revision_id)
765
file_id_revisions[file_id] = set([revision_id])
766
for file_id, revisions in file_id_revisions.iteritems():
767
yield ('file', file_id, revisions)
919
769
def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
920
770
"""Find the file ids and versions affected by revisions.
926
776
revision_ids. Each altered file-ids has the exact revision_ids that
927
777
altered it listed explicitly.
929
rich_root = self.supports_rich_root()
930
bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
931
file_id_revisions = {}
779
rich_roots = self.supports_rich_root()
932
781
pb = ui.ui_factory.nested_progress_bar()
934
revision_keys = [(r,) for r in revision_ids]
935
parent_keys = self._find_parent_keys_of_revisions(revision_keys)
936
# TODO: instead of using _find_present_inventory_keys, change the
937
# code paths to allow missing inventories to be tolerated.
938
# However, we only want to tolerate missing parent
939
# inventories, not missing inventories for revision_ids
940
present_parent_inv_keys = self._find_present_inventory_keys(
942
present_parent_inv_ids = set(
943
[k[-1] for k in present_parent_inv_keys])
944
inventories_to_read = set(revision_ids)
945
inventories_to_read.update(present_parent_inv_ids)
946
root_key_info = _build_interesting_key_sets(
947
self, inventories_to_read, present_parent_inv_ids)
948
interesting_root_keys = root_key_info.interesting_root_keys
949
uninteresting_root_keys = root_key_info.uninteresting_root_keys
950
chk_bytes = self.chk_bytes
951
for record, items in chk_map.iter_interesting_nodes(chk_bytes,
952
interesting_root_keys, uninteresting_root_keys,
954
for name, bytes in items:
955
(name_utf8, file_id, revision_id) = bytes_to_info(bytes)
956
# TODO: consider interning file_id, revision_id here, or
957
# pushing that intern() into bytes_to_info()
958
# TODO: rich_root should always be True here, for all
959
# repositories that support chk_bytes
960
if not rich_root and name_utf8 == '':
963
file_id_revisions[file_id].add(revision_id)
965
file_id_revisions[file_id] = set([revision_id])
783
total = len(revision_ids)
784
for pos, inv in enumerate(self.iter_inventories(revision_ids)):
785
pb.update("Finding text references", pos, total)
786
for entry in inv.iter_just_entries():
787
if entry.revision != inv.revision_id:
789
if not rich_roots and entry.file_id == inv.root_id:
791
alterations = result.setdefault(entry.file_id, set([]))
792
alterations.add(entry.revision)
968
return file_id_revisions
970
797
def find_text_key_references(self):
971
798
"""Find the text key references within the repository.
1006
833
def _get_source(self, to_format):
1007
834
"""Return a source for streaming from this repository."""
1008
if self._format._serializer == to_format._serializer:
835
if isinstance(to_format, remote.RemoteRepositoryFormat):
836
# Can't just check attributes on to_format with the current code,
838
to_format._ensure_real()
839
to_format = to_format._custom_format
840
if to_format.__class__ is self._format.__class__:
1009
841
# We must be exactly the same format, otherwise stuff like the chk
1010
# page layout might be different.
1011
# Actually, this test is just slightly looser than exact so that
1012
# CHK2 <-> 2a transfers will work.
842
# page layout might be different
1013
843
return GroupCHKStreamSource(self, to_format)
1014
844
return super(CHKInventoryRepository, self)._get_source(to_format)
1017
class GroupCHKStreamSource(KnitPackStreamSource):
846
def suspend_write_group(self):
847
raise errors.UnsuspendableWriteGroup(self)
849
def _resume_write_group(self, tokens):
850
raise errors.UnsuspendableWriteGroup(self)
853
class GroupCHKStreamSource(repository.StreamSource):
1018
854
"""Used when both the source and target repo are GroupCHK repos."""
1020
856
def __init__(self, from_repository, to_format):
1067
897
p_id_roots_set.clear()
1068
898
return ('inventories', _filtered_inv_stream())
1070
def _get_filtered_chk_streams(self, excluded_revision_keys):
900
def _get_filtered_chk_streams(self, excluded_keys):
1071
901
self._text_keys = set()
1072
excluded_revision_keys.discard(_mod_revision.NULL_REVISION)
1073
if not excluded_revision_keys:
902
excluded_keys.discard(_mod_revision.NULL_REVISION)
903
if not excluded_keys:
1074
904
uninteresting_root_keys = set()
1075
905
uninteresting_pid_root_keys = set()
1077
# filter out any excluded revisions whose inventories are not
1079
# TODO: Update Repository.iter_inventories() to add
1080
# ignore_missing=True
1081
present_keys = self.from_repository._find_present_inventory_keys(
1082
excluded_revision_keys)
1083
present_ids = [k[-1] for k in present_keys]
1084
907
uninteresting_root_keys = set()
1085
908
uninteresting_pid_root_keys = set()
1086
for inv in self.from_repository.iter_inventories(present_ids):
909
for inv in self.from_repository.iter_inventories(excluded_keys):
1087
910
uninteresting_root_keys.add(inv.id_to_entry.key())
1088
911
uninteresting_pid_root_keys.add(
1089
912
inv.parent_id_basename_to_file_id.key())
1090
913
bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
1091
914
chk_bytes = self.from_repository.chk_bytes
1092
915
def _filter_id_to_entry():
1093
interesting_nodes = chk_map.iter_interesting_nodes(chk_bytes,
1094
self._chk_id_roots, uninteresting_root_keys)
1095
for record in _filter_text_keys(interesting_nodes, self._text_keys,
916
for record, items in chk_map.iter_interesting_nodes(chk_bytes,
917
self._chk_id_roots, uninteresting_root_keys):
918
for name, bytes in items:
919
# Note: we don't care about name_utf8, because we are always
921
_, file_id, revision_id = bytes_to_info(bytes)
922
self._text_keys.add((file_id, revision_id))
1097
923
if record is not None:
1100
self._chk_id_roots = None
1101
925
yield 'chk_bytes', _filter_id_to_entry()
1102
926
def _get_parent_id_basename_to_file_id_pages():
1103
927
for record, items in chk_map.iter_interesting_nodes(chk_bytes,
1104
928
self._chk_p_id_roots, uninteresting_pid_root_keys):
1105
929
if record is not None:
1108
self._chk_p_id_roots = None
1109
931
yield 'chk_bytes', _get_parent_id_basename_to_file_id_pages()
933
def _get_text_stream(self):
934
# Note: We know we don't have to handle adding root keys, because both
935
# the source and target are GCCHK, and those always support rich-roots
936
# We may want to request as 'unordered', in case the source has done a
938
return ('texts', self.from_repository.texts.get_record_stream(
939
self._text_keys, 'groupcompress', False))
1111
941
def get_stream(self, search):
1112
942
revision_ids = search.get_keys()
1113
943
for stream_info in self._fetch_revision_texts(revision_ids):
1114
944
yield stream_info
1115
945
self._revision_keys = [(rev_id,) for rev_id in revision_ids]
1116
self.from_repository.revisions.clear_cache()
1117
self.from_repository.signatures.clear_cache()
1118
yield self._get_inventory_stream(self._revision_keys)
1119
self.from_repository.inventories.clear_cache()
1120
# TODO: The keys to exclude might be part of the search recipe
1121
# For now, exclude all parents that are at the edge of ancestry, for
1122
# which we have inventories
1123
from_repo = self.from_repository
1124
parent_keys = from_repo._find_parent_keys_of_revisions(
1125
self._revision_keys)
1126
for stream_info in self._get_filtered_chk_streams(parent_keys):
946
yield self._get_filtered_inv_stream()
947
# The keys to exclude are part of the search recipe
948
_, _, exclude_keys, _ = search.get_recipe()
949
for stream_info in self._get_filtered_chk_streams(exclude_keys):
1127
950
yield stream_info
1128
self.from_repository.chk_bytes.clear_cache()
1129
951
yield self._get_text_stream()
1130
self.from_repository.texts.clear_cache()
1132
def get_stream_for_missing_keys(self, missing_keys):
1133
# missing keys can only occur when we are byte copying and not
1134
# translating (because translation means we don't send
1135
# unreconstructable deltas ever).
1136
missing_inventory_keys = set()
1137
for key in missing_keys:
1138
if key[0] != 'inventories':
1139
raise AssertionError('The only missing keys we should'
1140
' be filling in are inventory keys, not %s'
1142
missing_inventory_keys.add(key[1:])
1143
if self._chk_id_roots or self._chk_p_id_roots:
1144
raise AssertionError('Cannot call get_stream_for_missing_keys'
1145
' until all of get_stream() has been consumed.')
1146
# Yield the inventory stream, so we can find the chk stream
1147
# Some of the missing_keys will be missing because they are ghosts.
1148
# As such, we can ignore them. The Sink is required to verify there are
1149
# no unavailable texts when the ghost inventories are not filled in.
1150
yield self._get_inventory_stream(missing_inventory_keys,
1152
# We use the empty set for excluded_revision_keys, to make it clear
1153
# that we want to transmit all referenced chk pages.
1154
for stream_info in self._get_filtered_chk_streams(set()):
1158
class _InterestingKeyInfo(object):
1160
self.interesting_root_keys = set()
1161
self.interesting_pid_root_keys = set()
1162
self.uninteresting_root_keys = set()
1163
self.uninteresting_pid_root_keys = set()
1165
def all_interesting(self):
1166
return self.interesting_root_keys.union(self.interesting_pid_root_keys)
1168
def all_uninteresting(self):
1169
return self.uninteresting_root_keys.union(
1170
self.uninteresting_pid_root_keys)
1173
return self.all_interesting().union(self.all_uninteresting())
1176
def _build_interesting_key_sets(repo, inventory_ids, parent_only_inv_ids):
1177
result = _InterestingKeyInfo()
1178
for inv in repo.iter_inventories(inventory_ids, 'unordered'):
1179
root_key = inv.id_to_entry.key()
1180
pid_root_key = inv.parent_id_basename_to_file_id.key()
1181
if inv.revision_id in parent_only_inv_ids:
1182
result.uninteresting_root_keys.add(root_key)
1183
result.uninteresting_pid_root_keys.add(pid_root_key)
1185
result.interesting_root_keys.add(root_key)
1186
result.interesting_pid_root_keys.add(pid_root_key)
1190
def _filter_text_keys(interesting_nodes_iterable, text_keys, bytes_to_info):
1191
"""Iterate the result of iter_interesting_nodes, yielding the records
1192
and adding to text_keys.
1194
for record, items in interesting_nodes_iterable:
1195
for name, bytes in items:
1196
# Note: we don't care about name_utf8, because groupcompress repos
1197
# are always rich-root, so there are no synthesised root records to
1199
_, file_id, revision_id = bytes_to_info(bytes)
1200
file_id = intern(file_id)
1201
revision_id = intern(revision_id)
1202
text_keys.add(StaticTuple(file_id, revision_id).intern())
1208
954
class RepositoryFormatCHK1(RepositoryFormatPack):
1209
955
"""A hashed CHK+group compress pack repository."""
1211
957
repository_class = CHKInventoryRepository
1212
supports_external_lookups = True
1213
958
supports_chks = True
1214
959
# For right now, setting this to True gives us InterModel1And2 rather
1215
960
# than InterDifferingSerializer
1249
993
return ("Development repository format - rich roots, group compression"
1250
994
" and chk inventories")
1253
class RepositoryFormatCHK2(RepositoryFormatCHK1):
1254
"""A CHK repository that uses the bencode revision serializer."""
1256
_serializer = chk_serializer.chk_bencode_serializer
1258
def _get_matching_bzrdir(self):
1259
return bzrdir.format_registry.make_bzrdir('development7-rich-root')
1261
def _ignore_setting_bzrdir(self, format):
1264
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1266
def get_format_string(self):
1267
"""See RepositoryFormat.get_format_string()."""
1268
return ('Bazaar development format - chk repository with bencode '
1269
'revision serialization (needs bzr.dev from 1.16)\n')
1272
class RepositoryFormat2a(RepositoryFormatCHK2):
1273
"""A CHK repository that uses the bencode revision serializer.
1275
This is the same as RepositoryFormatCHK2 but with a public name.
1278
_serializer = chk_serializer.chk_bencode_serializer
1280
def _get_matching_bzrdir(self):
1281
return bzrdir.format_registry.make_bzrdir('2a')
1283
def _ignore_setting_bzrdir(self, format):
1286
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1288
def get_format_string(self):
1289
return ('Bazaar repository format 2a (needs bzr 1.16 or later)\n')
1291
def get_format_description(self):
1292
"""See RepositoryFormat.get_format_description()."""
1293
return ("Repository format 2a - rich roots, group compression"
1294
" and chk inventories")
996
def check_conversion_target(self, target_format):
997
if not target_format.rich_root_data:
998
raise errors.BadConversionTarget(
999
'Does not support rich root data.', target_format)
1000
if not getattr(target_format, 'supports_tree_reference', False):
1001
raise errors.BadConversionTarget(
1002
'Does not support nested trees', target_format)
added
removed
bzrlib/repofmt/groupcompress_repo.py
