547
521
tree = self.make_branch_and_tree('.', format)
548
522
tree.commit("Dull commit", rev_id="dull")
549
523
revision_tree = tree.branch.repository.revision_tree('dull')
550
self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
551
revision_tree.inventory.root.file_id)
524
revision_tree.lock_read()
526
self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
527
revision_tree.get_root_id())
529
revision_tree.unlock()
552
530
format = bzrdir.BzrDirMetaFormat1()
553
531
format.repository_format = knitrepo.RepositoryFormatKnit3()
554
532
upgrade.Convert('.', format)
555
533
tree = workingtree.WorkingTree.open('.')
556
534
revision_tree = tree.branch.repository.revision_tree('dull')
557
revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
535
revision_tree.lock_read()
537
revision_tree.get_file_lines(revision_tree.get_root_id())
539
revision_tree.unlock()
558
540
tree.commit("Another dull commit", rev_id='dull2')
559
541
revision_tree = tree.branch.repository.revision_tree('dull2')
560
self.assertEqual('dull', revision_tree.inventory.root.revision)
542
revision_tree.lock_read()
543
self.addCleanup(revision_tree.unlock)
544
self.assertEqual('dull',
545
revision_tree.get_file_revision(revision_tree.get_root_id()))
547
def test_supports_external_lookups(self):
548
format = bzrdir.BzrDirMetaFormat1()
549
format.repository_format = knitrepo.RepositoryFormatKnit3()
550
repo = self.make_repository('.', format=format)
551
self.assertFalse(repo._format.supports_external_lookups)
554
class Test2a(tests.TestCaseWithMemoryTransport):
556
def test_chk_bytes_uses_custom_btree_parser(self):
557
mt = self.make_branch_and_memory_tree('test', format='2a')
559
self.addCleanup(mt.unlock)
560
mt.add([''], ['root-id'])
562
index = mt.branch.repository.chk_bytes._index._graph_index._indices[0]
563
self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
564
# It should also work if we re-open the repo
565
repo = mt.branch.repository.bzrdir.open_repository()
567
self.addCleanup(repo.unlock)
568
index = repo.chk_bytes._index._graph_index._indices[0]
569
self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
571
def test_fetch_combines_groups(self):
572
builder = self.make_branch_builder('source', format='2a')
573
builder.start_series()
574
builder.build_snapshot('1', None, [
575
('add', ('', 'root-id', 'directory', '')),
576
('add', ('file', 'file-id', 'file', 'content\n'))])
577
builder.build_snapshot('2', ['1'], [
578
('modify', ('file-id', 'content-2\n'))])
579
builder.finish_series()
580
source = builder.get_branch()
581
target = self.make_repository('target', format='2a')
582
target.fetch(source.repository)
584
self.addCleanup(target.unlock)
585
details = target.texts._index.get_build_details(
586
[('file-id', '1',), ('file-id', '2',)])
587
file_1_details = details[('file-id', '1')]
588
file_2_details = details[('file-id', '2')]
589
# The index, and what to read off disk, should be the same for both
590
# versions of the file.
591
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
593
def test_fetch_combines_groups(self):
594
builder = self.make_branch_builder('source', format='2a')
595
builder.start_series()
596
builder.build_snapshot('1', None, [
597
('add', ('', 'root-id', 'directory', '')),
598
('add', ('file', 'file-id', 'file', 'content\n'))])
599
builder.build_snapshot('2', ['1'], [
600
('modify', ('file-id', 'content-2\n'))])
601
builder.finish_series()
602
source = builder.get_branch()
603
target = self.make_repository('target', format='2a')
604
target.fetch(source.repository)
606
self.addCleanup(target.unlock)
607
details = target.texts._index.get_build_details(
608
[('file-id', '1',), ('file-id', '2',)])
609
file_1_details = details[('file-id', '1')]
610
file_2_details = details[('file-id', '2')]
611
# The index, and what to read off disk, should be the same for both
612
# versions of the file.
613
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
615
def test_fetch_combines_groups(self):
616
builder = self.make_branch_builder('source', format='2a')
617
builder.start_series()
618
builder.build_snapshot('1', None, [
619
('add', ('', 'root-id', 'directory', '')),
620
('add', ('file', 'file-id', 'file', 'content\n'))])
621
builder.build_snapshot('2', ['1'], [
622
('modify', ('file-id', 'content-2\n'))])
623
builder.finish_series()
624
source = builder.get_branch()
625
target = self.make_repository('target', format='2a')
626
target.fetch(source.repository)
628
self.addCleanup(target.unlock)
629
details = target.texts._index.get_build_details(
630
[('file-id', '1',), ('file-id', '2',)])
631
file_1_details = details[('file-id', '1')]
632
file_2_details = details[('file-id', '2')]
633
# The index, and what to read off disk, should be the same for both
634
# versions of the file.
635
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
637
def test_format_pack_compresses_True(self):
638
repo = self.make_repository('repo', format='2a')
639
self.assertTrue(repo._format.pack_compresses)
641
def test_inventories_use_chk_map_with_parent_base_dict(self):
642
tree = self.make_branch_and_memory_tree('repo', format="2a")
644
tree.add([''], ['TREE_ROOT'])
645
revid = tree.commit("foo")
648
self.addCleanup(tree.unlock)
649
inv = tree.branch.repository.get_inventory(revid)
650
self.assertNotEqual(None, inv.parent_id_basename_to_file_id)
651
inv.parent_id_basename_to_file_id._ensure_root()
652
inv.id_to_entry._ensure_root()
653
self.assertEqual(65536, inv.id_to_entry._root_node.maximum_size)
654
self.assertEqual(65536,
655
inv.parent_id_basename_to_file_id._root_node.maximum_size)
657
def test_autopack_unchanged_chk_nodes(self):
658
# at 20 unchanged commits, chk pages are packed that are split into
659
# two groups such that the new pack being made doesn't have all its
660
# pages in the source packs (though they are in the repository).
661
# Use a memory backed repository, we don't need to hit disk for this
662
tree = self.make_branch_and_memory_tree('tree', format='2a')
664
self.addCleanup(tree.unlock)
665
tree.add([''], ['TREE_ROOT'])
666
for pos in range(20):
667
tree.commit(str(pos))
669
def test_pack_with_hint(self):
670
tree = self.make_branch_and_memory_tree('tree', format='2a')
672
self.addCleanup(tree.unlock)
673
tree.add([''], ['TREE_ROOT'])
674
# 1 commit to leave untouched
676
to_keep = tree.branch.repository._pack_collection.names()
680
all = tree.branch.repository._pack_collection.names()
681
combine = list(set(all) - set(to_keep))
682
self.assertLength(3, all)
683
self.assertLength(2, combine)
684
tree.branch.repository.pack(hint=combine)
685
final = tree.branch.repository._pack_collection.names()
686
self.assertLength(2, final)
687
self.assertFalse(combine[0] in final)
688
self.assertFalse(combine[1] in final)
689
self.assertSubset(to_keep, final)
691
def test_stream_source_to_gc(self):
692
source = self.make_repository('source', format='2a')
693
target = self.make_repository('target', format='2a')
694
stream = source._get_source(target._format)
695
self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
697
def test_stream_source_to_non_gc(self):
698
source = self.make_repository('source', format='2a')
699
target = self.make_repository('target', format='rich-root-pack')
700
stream = source._get_source(target._format)
701
# We don't want the child GroupCHKStreamSource
702
self.assertIs(type(stream), vf_repository.StreamSource)
704
def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
705
source_builder = self.make_branch_builder('source',
707
# We have to build a fairly large tree, so that we are sure the chk
708
# pages will have split into multiple pages.
709
entries = [('add', ('', 'a-root-id', 'directory', None))]
710
for i in 'abcdefghijklmnopqrstuvwxyz123456789':
711
for j in 'abcdefghijklmnopqrstuvwxyz123456789':
714
content = 'content for %s\n' % (fname,)
715
entries.append(('add', (fname, fid, 'file', content)))
716
source_builder.start_series()
717
source_builder.build_snapshot('rev-1', None, entries)
718
# Now change a few of them, so we get a few new pages for the second
720
source_builder.build_snapshot('rev-2', ['rev-1'], [
721
('modify', ('aa-id', 'new content for aa-id\n')),
722
('modify', ('cc-id', 'new content for cc-id\n')),
723
('modify', ('zz-id', 'new content for zz-id\n')),
725
source_builder.finish_series()
726
source_branch = source_builder.get_branch()
727
source_branch.lock_read()
728
self.addCleanup(source_branch.unlock)
729
target = self.make_repository('target', format='2a')
730
source = source_branch.repository._get_source(target._format)
731
self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
733
# On a regular pass, getting the inventories and chk pages for rev-2
734
# would only get the newly created chk pages
735
search = vf_search.SearchResult(set(['rev-2']), set(['rev-1']), 1,
737
simple_chk_records = []
738
for vf_name, substream in source.get_stream(search):
739
if vf_name == 'chk_bytes':
740
for record in substream:
741
simple_chk_records.append(record.key)
745
# 3 pages, the root (InternalNode), + 2 pages which actually changed
746
self.assertEqual([('sha1:91481f539e802c76542ea5e4c83ad416bf219f73',),
747
('sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
748
('sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
749
('sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)],
751
# Now, when we do a similar call using 'get_stream_for_missing_keys'
752
# we should get a much larger set of pages.
753
missing = [('inventories', 'rev-2')]
754
full_chk_records = []
755
for vf_name, substream in source.get_stream_for_missing_keys(missing):
756
if vf_name == 'inventories':
757
for record in substream:
758
self.assertEqual(('rev-2',), record.key)
759
elif vf_name == 'chk_bytes':
760
for record in substream:
761
full_chk_records.append(record.key)
763
self.fail('Should not be getting a stream of %s' % (vf_name,))
764
# We have 257 records now. This is because we have 1 root page, and 256
765
# leaf pages in a complete listing.
766
self.assertEqual(257, len(full_chk_records))
767
self.assertSubset(simple_chk_records, full_chk_records)
769
def test_inconsistency_fatal(self):
770
repo = self.make_repository('repo', format='2a')
771
self.assertTrue(repo.revisions._index._inconsistency_fatal)
772
self.assertFalse(repo.texts._index._inconsistency_fatal)
773
self.assertFalse(repo.inventories._index._inconsistency_fatal)
774
self.assertFalse(repo.signatures._index._inconsistency_fatal)
775
self.assertFalse(repo.chk_bytes._index._inconsistency_fatal)
778
class TestKnitPackStreamSource(tests.TestCaseWithMemoryTransport):
780
def test_source_to_exact_pack_092(self):
781
source = self.make_repository('source', format='pack-0.92')
782
target = self.make_repository('target', format='pack-0.92')
783
stream_source = source._get_source(target._format)
784
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
786
def test_source_to_exact_pack_rich_root_pack(self):
787
source = self.make_repository('source', format='rich-root-pack')
788
target = self.make_repository('target', format='rich-root-pack')
789
stream_source = source._get_source(target._format)
790
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
792
def test_source_to_exact_pack_19(self):
793
source = self.make_repository('source', format='1.9')
794
target = self.make_repository('target', format='1.9')
795
stream_source = source._get_source(target._format)
796
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
798
def test_source_to_exact_pack_19_rich_root(self):
799
source = self.make_repository('source', format='1.9-rich-root')
800
target = self.make_repository('target', format='1.9-rich-root')
801
stream_source = source._get_source(target._format)
802
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
804
def test_source_to_remote_exact_pack_19(self):
805
trans = self.make_smart_server('target')
807
source = self.make_repository('source', format='1.9')
808
target = self.make_repository('target', format='1.9')
809
target = repository.Repository.open(trans.base)
810
stream_source = source._get_source(target._format)
811
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
813
def test_stream_source_to_non_exact(self):
814
source = self.make_repository('source', format='pack-0.92')
815
target = self.make_repository('target', format='1.9')
816
stream = source._get_source(target._format)
817
self.assertIs(type(stream), vf_repository.StreamSource)
819
def test_stream_source_to_non_exact_rich_root(self):
820
source = self.make_repository('source', format='1.9')
821
target = self.make_repository('target', format='1.9-rich-root')
822
stream = source._get_source(target._format)
823
self.assertIs(type(stream), vf_repository.StreamSource)
825
def test_source_to_remote_non_exact_pack_19(self):
826
trans = self.make_smart_server('target')
828
source = self.make_repository('source', format='1.9')
829
target = self.make_repository('target', format='1.6')
830
target = repository.Repository.open(trans.base)
831
stream_source = source._get_source(target._format)
832
self.assertIs(type(stream_source), vf_repository.StreamSource)
834
def test_stream_source_to_knit(self):
835
source = self.make_repository('source', format='pack-0.92')
836
target = self.make_repository('target', format='dirstate')
837
stream = source._get_source(target._format)
838
self.assertIs(type(stream), vf_repository.StreamSource)
841
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
842
"""Tests for _find_parent_ids_of_revisions."""
845
super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
846
self.builder = self.make_branch_builder('source')
847
self.builder.start_series()
848
self.builder.build_snapshot('initial', None,
849
[('add', ('', 'tree-root', 'directory', None))])
850
self.repo = self.builder.get_branch().repository
851
self.addCleanup(self.builder.finish_series)
853
def assertParentIds(self, expected_result, rev_set):
854
self.assertEqual(sorted(expected_result),
855
sorted(self.repo._find_parent_ids_of_revisions(rev_set)))
857
def test_simple(self):
858
self.builder.build_snapshot('revid1', None, [])
859
self.builder.build_snapshot('revid2', ['revid1'], [])
861
self.assertParentIds(['revid1'], rev_set)
863
def test_not_first_parent(self):
864
self.builder.build_snapshot('revid1', None, [])
865
self.builder.build_snapshot('revid2', ['revid1'], [])
866
self.builder.build_snapshot('revid3', ['revid2'], [])
867
rev_set = ['revid3', 'revid2']
868
self.assertParentIds(['revid1'], rev_set)
870
def test_not_null(self):
871
rev_set = ['initial']
872
self.assertParentIds([], rev_set)
874
def test_not_null_set(self):
875
self.builder.build_snapshot('revid1', None, [])
876
rev_set = [_mod_revision.NULL_REVISION]
877
self.assertParentIds([], rev_set)
879
def test_ghost(self):
880
self.builder.build_snapshot('revid1', None, [])
881
rev_set = ['ghost', 'revid1']
882
self.assertParentIds(['initial'], rev_set)
884
def test_ghost_parent(self):
885
self.builder.build_snapshot('revid1', None, [])
886
self.builder.build_snapshot('revid2', ['revid1', 'ghost'], [])
887
rev_set = ['revid2', 'revid1']
888
self.assertParentIds(['ghost', 'initial'], rev_set)
890
def test_righthand_parent(self):
891
self.builder.build_snapshot('revid1', None, [])
892
self.builder.build_snapshot('revid2a', ['revid1'], [])
893
self.builder.build_snapshot('revid2b', ['revid1'], [])
894
self.builder.build_snapshot('revid3', ['revid2a', 'revid2b'], [])
895
rev_set = ['revid3', 'revid2a']
896
self.assertParentIds(['revid1', 'revid2b'], rev_set)
899
class TestWithBrokenRepo(TestCaseWithTransport):
900
"""These tests seem to be more appropriate as interface tests?"""
902
def make_broken_repository(self):
903
# XXX: This function is borrowed from Aaron's "Reconcile can fix bad
904
# parent references" branch which is due to land in bzr.dev soon. Once
905
# it does, this duplication should be removed.
906
repo = self.make_repository('broken-repo')
910
cleanups.append(repo.unlock)
911
repo.start_write_group()
912
cleanups.append(repo.commit_write_group)
913
# make rev1a: A well-formed revision, containing 'file1'
914
inv = inventory.Inventory(revision_id='rev1a')
915
inv.root.revision = 'rev1a'
916
self.add_file(repo, inv, 'file1', 'rev1a', [])
917
repo.texts.add_lines((inv.root.file_id, 'rev1a'), [], [])
918
repo.add_inventory('rev1a', inv, [])
919
revision = _mod_revision.Revision('rev1a',
920
committer='jrandom@example.com', timestamp=0,
921
inventory_sha1='', timezone=0, message='foo', parent_ids=[])
922
repo.add_revision('rev1a', revision, inv)
924
# make rev1b, which has no Revision, but has an Inventory, and
926
inv = inventory.Inventory(revision_id='rev1b')
927
inv.root.revision = 'rev1b'
928
self.add_file(repo, inv, 'file1', 'rev1b', [])
929
repo.add_inventory('rev1b', inv, [])
931
# make rev2, with file1 and file2
933
# file1 has 'rev1b' as an ancestor, even though this is not
934
# mentioned by 'rev1a', making it an unreferenced ancestor
935
inv = inventory.Inventory()
936
self.add_file(repo, inv, 'file1', 'rev2', ['rev1a', 'rev1b'])
937
self.add_file(repo, inv, 'file2', 'rev2', [])
938
self.add_revision(repo, 'rev2', inv, ['rev1a'])
940
# make ghost revision rev1c
941
inv = inventory.Inventory()
942
self.add_file(repo, inv, 'file2', 'rev1c', [])
944
# make rev3 with file2
945
# file2 refers to 'rev1c', which is a ghost in this repository, so
946
# file2 cannot have rev1c as its ancestor.
947
inv = inventory.Inventory()
948
self.add_file(repo, inv, 'file2', 'rev3', ['rev1c'])
949
self.add_revision(repo, 'rev3', inv, ['rev1c'])
952
for cleanup in reversed(cleanups):
955
def add_revision(self, repo, revision_id, inv, parent_ids):
956
inv.revision_id = revision_id
957
inv.root.revision = revision_id
958
repo.texts.add_lines((inv.root.file_id, revision_id), [], [])
959
repo.add_inventory(revision_id, inv, parent_ids)
960
revision = _mod_revision.Revision(revision_id,
961
committer='jrandom@example.com', timestamp=0, inventory_sha1='',
962
timezone=0, message='foo', parent_ids=parent_ids)
963
repo.add_revision(revision_id, revision, inv)
965
def add_file(self, repo, inv, filename, revision, parents):
966
file_id = filename + '-id'
967
entry = inventory.InventoryFile(file_id, filename, 'TREE_ROOT')
968
entry.revision = revision
971
text_key = (file_id, revision)
972
parent_keys = [(file_id, parent) for parent in parents]
973
repo.texts.add_lines(text_key, parent_keys, ['line\n'])
975
def test_insert_from_broken_repo(self):
976
"""Inserting a data stream from a broken repository won't silently
977
corrupt the target repository.
979
broken_repo = self.make_broken_repository()
980
empty_repo = self.make_repository('empty-repo')
982
empty_repo.fetch(broken_repo)
983
except (errors.RevisionNotPresent, errors.BzrCheckError):
984
# Test successful: compression parent not being copied leads to
987
empty_repo.lock_read()
988
self.addCleanup(empty_repo.unlock)
989
text = empty_repo.texts.get_record_stream(
990
[('file2-id', 'rev3')], 'topological', True).next()
991
self.assertEqual('line\n', text.get_bytes_as('fulltext'))
994
class TestRepositoryPackCollection(TestCaseWithTransport):
996
def get_format(self):
997
return bzrdir.format_registry.make_bzrdir('pack-0.92')
1000
format = self.get_format()
1001
repo = self.make_repository('.', format=format)
1002
return repo._pack_collection
1004
def make_packs_and_alt_repo(self, write_lock=False):
1005
"""Create a pack repo with 3 packs, and access it via a second repo."""
1006
tree = self.make_branch_and_tree('.', format=self.get_format())
1008
self.addCleanup(tree.unlock)
1009
rev1 = tree.commit('one')
1010
rev2 = tree.commit('two')
1011
rev3 = tree.commit('three')
1012
r = repository.Repository.open('.')
1017
self.addCleanup(r.unlock)
1018
packs = r._pack_collection
1019
packs.ensure_loaded()
1020
return tree, r, packs, [rev1, rev2, rev3]
1022
def test__clear_obsolete_packs(self):
1023
packs = self.get_packs()
1024
obsolete_pack_trans = packs.transport.clone('obsolete_packs')
1025
obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
1026
obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
1027
obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
1028
obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
1029
obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
1030
res = packs._clear_obsolete_packs()
1031
self.assertEqual(['a-pack', 'another-pack'], sorted(res))
1032
self.assertEqual([], obsolete_pack_trans.list_dir('.'))
1034
def test__clear_obsolete_packs_preserve(self):
1035
packs = self.get_packs()
1036
obsolete_pack_trans = packs.transport.clone('obsolete_packs')
1037
obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
1038
obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
1039
obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
1040
obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
1041
obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
1042
res = packs._clear_obsolete_packs(preserve=set(['a-pack']))
1043
self.assertEqual(['a-pack', 'another-pack'], sorted(res))
1044
self.assertEqual(['a-pack.iix', 'a-pack.pack', 'a-pack.rix'],
1045
sorted(obsolete_pack_trans.list_dir('.')))
1047
def test__max_pack_count(self):
1048
"""The maximum pack count is a function of the number of revisions."""
1049
# no revisions - one pack, so that we can have a revision free repo
1050
# without it blowing up
1051
packs = self.get_packs()
1052
self.assertEqual(1, packs._max_pack_count(0))
1053
# after that the sum of the digits, - check the first 1-9
1054
self.assertEqual(1, packs._max_pack_count(1))
1055
self.assertEqual(2, packs._max_pack_count(2))
1056
self.assertEqual(3, packs._max_pack_count(3))
1057
self.assertEqual(4, packs._max_pack_count(4))
1058
self.assertEqual(5, packs._max_pack_count(5))
1059
self.assertEqual(6, packs._max_pack_count(6))
1060
self.assertEqual(7, packs._max_pack_count(7))
1061
self.assertEqual(8, packs._max_pack_count(8))
1062
self.assertEqual(9, packs._max_pack_count(9))
1063
# check the boundary cases with two digits for the next decade
1064
self.assertEqual(1, packs._max_pack_count(10))
1065
self.assertEqual(2, packs._max_pack_count(11))
1066
self.assertEqual(10, packs._max_pack_count(19))
1067
self.assertEqual(2, packs._max_pack_count(20))
1068
self.assertEqual(3, packs._max_pack_count(21))
1069
# check some arbitrary big numbers
1070
self.assertEqual(25, packs._max_pack_count(112894))
1072
def test_repr(self):
1073
packs = self.get_packs()
1074
self.assertContainsRe(repr(packs),
1075
'RepositoryPackCollection(.*Repository(.*))')
1077
def test__obsolete_packs(self):
1078
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1079
names = packs.names()
1080
pack = packs.get_pack_by_name(names[0])
1081
# Schedule this one for removal
1082
packs._remove_pack_from_memory(pack)
1083
# Simulate a concurrent update by renaming the .pack file and one of
1085
packs.transport.rename('packs/%s.pack' % (names[0],),
1086
'obsolete_packs/%s.pack' % (names[0],))
1087
packs.transport.rename('indices/%s.iix' % (names[0],),
1088
'obsolete_packs/%s.iix' % (names[0],))
1089
# Now trigger the obsoletion, and ensure that all the remaining files
1091
packs._obsolete_packs([pack])
1092
self.assertEqual([n + '.pack' for n in names[1:]],
1093
sorted(packs._pack_transport.list_dir('.')))
1094
# names[0] should not be present in the index anymore
1095
self.assertEqual(names[1:],
1096
sorted(set([osutils.splitext(n)[0] for n in
1097
packs._index_transport.list_dir('.')])))
1099
def test__obsolete_packs_missing_directory(self):
1100
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1101
r.control_transport.rmdir('obsolete_packs')
1102
names = packs.names()
1103
pack = packs.get_pack_by_name(names[0])
1104
# Schedule this one for removal
1105
packs._remove_pack_from_memory(pack)
1106
# Now trigger the obsoletion, and ensure that all the remaining files
1108
packs._obsolete_packs([pack])
1109
self.assertEqual([n + '.pack' for n in names[1:]],
1110
sorted(packs._pack_transport.list_dir('.')))
1111
# names[0] should not be present in the index anymore
1112
self.assertEqual(names[1:],
1113
sorted(set([osutils.splitext(n)[0] for n in
1114
packs._index_transport.list_dir('.')])))
1116
def test_pack_distribution_zero(self):
1117
packs = self.get_packs()
1118
self.assertEqual([0], packs.pack_distribution(0))
1120
def test_ensure_loaded_unlocked(self):
1121
packs = self.get_packs()
1122
self.assertRaises(errors.ObjectNotLocked,
1123
packs.ensure_loaded)
1125
def test_pack_distribution_one_to_nine(self):
1126
packs = self.get_packs()
1127
self.assertEqual([1],
1128
packs.pack_distribution(1))
1129
self.assertEqual([1, 1],
1130
packs.pack_distribution(2))
1131
self.assertEqual([1, 1, 1],
1132
packs.pack_distribution(3))
1133
self.assertEqual([1, 1, 1, 1],
1134
packs.pack_distribution(4))
1135
self.assertEqual([1, 1, 1, 1, 1],
1136
packs.pack_distribution(5))
1137
self.assertEqual([1, 1, 1, 1, 1, 1],
1138
packs.pack_distribution(6))
1139
self.assertEqual([1, 1, 1, 1, 1, 1, 1],
1140
packs.pack_distribution(7))
1141
self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1],
1142
packs.pack_distribution(8))
1143
self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1, 1],
1144
packs.pack_distribution(9))
1146
def test_pack_distribution_stable_at_boundaries(self):
1147
"""When there are multi-rev packs the counts are stable."""
1148
packs = self.get_packs()
1150
self.assertEqual([10], packs.pack_distribution(10))
1151
self.assertEqual([10, 1], packs.pack_distribution(11))
1152
self.assertEqual([10, 10], packs.pack_distribution(20))
1153
self.assertEqual([10, 10, 1], packs.pack_distribution(21))
1155
self.assertEqual([100], packs.pack_distribution(100))
1156
self.assertEqual([100, 1], packs.pack_distribution(101))
1157
self.assertEqual([100, 10, 1], packs.pack_distribution(111))
1158
self.assertEqual([100, 100], packs.pack_distribution(200))
1159
self.assertEqual([100, 100, 1], packs.pack_distribution(201))
1160
self.assertEqual([100, 100, 10, 1], packs.pack_distribution(211))
1162
def test_plan_pack_operations_2009_revisions_skip_all_packs(self):
1163
packs = self.get_packs()
1164
existing_packs = [(2000, "big"), (9, "medium")]
1165
# rev count - 2009 -> 2x1000 + 9x1
1166
pack_operations = packs.plan_autopack_combinations(
1167
existing_packs, [1000, 1000, 1, 1, 1, 1, 1, 1, 1, 1, 1])
1168
self.assertEqual([], pack_operations)
1170
def test_plan_pack_operations_2010_revisions_skip_all_packs(self):
1171
packs = self.get_packs()
1172
existing_packs = [(2000, "big"), (9, "medium"), (1, "single")]
1173
# rev count - 2010 -> 2x1000 + 1x10
1174
pack_operations = packs.plan_autopack_combinations(
1175
existing_packs, [1000, 1000, 10])
1176
self.assertEqual([], pack_operations)
1178
def test_plan_pack_operations_2010_combines_smallest_two(self):
1179
packs = self.get_packs()
1180
existing_packs = [(1999, "big"), (9, "medium"), (1, "single2"),
1182
# rev count - 2010 -> 2x1000 + 1x10 (3)
1183
pack_operations = packs.plan_autopack_combinations(
1184
existing_packs, [1000, 1000, 10])
1185
self.assertEqual([[2, ["single2", "single1"]]], pack_operations)
1187
def test_plan_pack_operations_creates_a_single_op(self):
1188
packs = self.get_packs()
1189
existing_packs = [(50, 'a'), (40, 'b'), (30, 'c'), (10, 'd'),
1190
(10, 'e'), (6, 'f'), (4, 'g')]
1191
# rev count 150 -> 1x100 and 5x10
1192
# The two size 10 packs do not need to be touched. The 50, 40, 30 would
1193
# be combined into a single 120 size pack, and the 6 & 4 would
1194
# becombined into a size 10 pack. However, if we have to rewrite them,
1195
# we save a pack file with no increased I/O by putting them into the
1197
distribution = packs.pack_distribution(150)
1198
pack_operations = packs.plan_autopack_combinations(existing_packs,
1200
self.assertEqual([[130, ['a', 'b', 'c', 'f', 'g']]], pack_operations)
1202
def test_all_packs_none(self):
1203
format = self.get_format()
1204
tree = self.make_branch_and_tree('.', format=format)
1206
self.addCleanup(tree.unlock)
1207
packs = tree.branch.repository._pack_collection
1208
packs.ensure_loaded()
1209
self.assertEqual([], packs.all_packs())
1211
def test_all_packs_one(self):
1212
format = self.get_format()
1213
tree = self.make_branch_and_tree('.', format=format)
1214
tree.commit('start')
1216
self.addCleanup(tree.unlock)
1217
packs = tree.branch.repository._pack_collection
1218
packs.ensure_loaded()
1220
packs.get_pack_by_name(packs.names()[0])],
1223
def test_all_packs_two(self):
1224
format = self.get_format()
1225
tree = self.make_branch_and_tree('.', format=format)
1226
tree.commit('start')
1227
tree.commit('continue')
1229
self.addCleanup(tree.unlock)
1230
packs = tree.branch.repository._pack_collection
1231
packs.ensure_loaded()
1233
packs.get_pack_by_name(packs.names()[0]),
1234
packs.get_pack_by_name(packs.names()[1]),
1235
], packs.all_packs())
1237
def test_get_pack_by_name(self):
1238
format = self.get_format()
1239
tree = self.make_branch_and_tree('.', format=format)
1240
tree.commit('start')
1242
self.addCleanup(tree.unlock)
1243
packs = tree.branch.repository._pack_collection
1245
packs.ensure_loaded()
1246
name = packs.names()[0]
1247
pack_1 = packs.get_pack_by_name(name)
1248
# the pack should be correctly initialised
1249
sizes = packs._names[name]
1250
rev_index = GraphIndex(packs._index_transport, name + '.rix', sizes[0])
1251
inv_index = GraphIndex(packs._index_transport, name + '.iix', sizes[1])
1252
txt_index = GraphIndex(packs._index_transport, name + '.tix', sizes[2])
1253
sig_index = GraphIndex(packs._index_transport, name + '.six', sizes[3])
1254
self.assertEqual(pack_repo.ExistingPack(packs._pack_transport,
1255
name, rev_index, inv_index, txt_index, sig_index), pack_1)
1256
# and the same instance should be returned on successive calls.
1257
self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1259
def test_reload_pack_names_new_entry(self):
1260
tree, r, packs, revs = self.make_packs_and_alt_repo()
1261
names = packs.names()
1262
# Add a new pack file into the repository
1263
rev4 = tree.commit('four')
1264
new_names = tree.branch.repository._pack_collection.names()
1265
new_name = set(new_names).difference(names)
1266
self.assertEqual(1, len(new_name))
1267
new_name = new_name.pop()
1268
# The old collection hasn't noticed yet
1269
self.assertEqual(names, packs.names())
1270
self.assertTrue(packs.reload_pack_names())
1271
self.assertEqual(new_names, packs.names())
1272
# And the repository can access the new revision
1273
self.assertEqual({rev4:(revs[-1],)}, r.get_parent_map([rev4]))
1274
self.assertFalse(packs.reload_pack_names())
1276
def test_reload_pack_names_added_and_removed(self):
1277
tree, r, packs, revs = self.make_packs_and_alt_repo()
1278
names = packs.names()
1279
# Now repack the whole thing
1280
tree.branch.repository.pack()
1281
new_names = tree.branch.repository._pack_collection.names()
1282
# The other collection hasn't noticed yet
1283
self.assertEqual(names, packs.names())
1284
self.assertTrue(packs.reload_pack_names())
1285
self.assertEqual(new_names, packs.names())
1286
self.assertEqual({revs[-1]:(revs[-2],)}, r.get_parent_map([revs[-1]]))
1287
self.assertFalse(packs.reload_pack_names())
1289
def test_reload_pack_names_preserves_pending(self):
1290
# TODO: Update this to also test for pending-deleted names
1291
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1292
# We will add one pack (via start_write_group + insert_record_stream),
1293
# and remove another pack (via _remove_pack_from_memory)
1294
orig_names = packs.names()
1295
orig_at_load = packs._packs_at_load
1296
to_remove_name = iter(orig_names).next()
1297
r.start_write_group()
1298
self.addCleanup(r.abort_write_group)
1299
r.texts.insert_record_stream([versionedfile.FulltextContentFactory(
1300
('text', 'rev'), (), None, 'content\n')])
1301
new_pack = packs._new_pack
1302
self.assertTrue(new_pack.data_inserted())
1304
packs.allocate(new_pack)
1305
packs._new_pack = None
1306
removed_pack = packs.get_pack_by_name(to_remove_name)
1307
packs._remove_pack_from_memory(removed_pack)
1308
names = packs.names()
1309
all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
1310
new_names = set([x[0][0] for x in new_nodes])
1311
self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1312
self.assertEqual(set(names) - set(orig_names), new_names)
1313
self.assertEqual(set([new_pack.name]), new_names)
1314
self.assertEqual([to_remove_name],
1315
sorted([x[0][0] for x in deleted_nodes]))
1316
packs.reload_pack_names()
1317
reloaded_names = packs.names()
1318
self.assertEqual(orig_at_load, packs._packs_at_load)
1319
self.assertEqual(names, reloaded_names)
1320
all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
1321
new_names = set([x[0][0] for x in new_nodes])
1322
self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1323
self.assertEqual(set(names) - set(orig_names), new_names)
1324
self.assertEqual(set([new_pack.name]), new_names)
1325
self.assertEqual([to_remove_name],
1326
sorted([x[0][0] for x in deleted_nodes]))
1328
def test_autopack_obsoletes_new_pack(self):
1329
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1330
packs._max_pack_count = lambda x: 1
1331
packs.pack_distribution = lambda x: [10]
1332
r.start_write_group()
1333
r.revisions.insert_record_stream([versionedfile.FulltextContentFactory(
1334
('bogus-rev',), (), None, 'bogus-content\n')])
1335
# This should trigger an autopack, which will combine everything into a
1337
new_names = r.commit_write_group()
1338
names = packs.names()
1339
self.assertEqual(1, len(names))
1340
self.assertEqual([names[0] + '.pack'],
1341
packs._pack_transport.list_dir('.'))
1343
def test_autopack_reloads_and_stops(self):
1344
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1345
# After we have determined what needs to be autopacked, trigger a
1346
# full-pack via the other repo which will cause us to re-evaluate and
1347
# decide we don't need to do anything
1348
orig_execute = packs._execute_pack_operations
1349
def _munged_execute_pack_ops(*args, **kwargs):
1350
tree.branch.repository.pack()
1351
return orig_execute(*args, **kwargs)
1352
packs._execute_pack_operations = _munged_execute_pack_ops
1353
packs._max_pack_count = lambda x: 1
1354
packs.pack_distribution = lambda x: [10]
1355
self.assertFalse(packs.autopack())
1356
self.assertEqual(1, len(packs.names()))
1357
self.assertEqual(tree.branch.repository._pack_collection.names(),
1360
def test__save_pack_names(self):
1361
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1362
names = packs.names()
1363
pack = packs.get_pack_by_name(names[0])
1364
packs._remove_pack_from_memory(pack)
1365
packs._save_pack_names(obsolete_packs=[pack])
1366
cur_packs = packs._pack_transport.list_dir('.')
1367
self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1368
# obsolete_packs will also have stuff like .rix and .iix present.
1369
obsolete_packs = packs.transport.list_dir('obsolete_packs')
1370
obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1371
self.assertEqual([pack.name], sorted(obsolete_names))
1373
def test__save_pack_names_already_obsoleted(self):
1374
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1375
names = packs.names()
1376
pack = packs.get_pack_by_name(names[0])
1377
packs._remove_pack_from_memory(pack)
1378
# We are going to simulate a concurrent autopack by manually obsoleting
1379
# the pack directly.
1380
packs._obsolete_packs([pack])
1381
packs._save_pack_names(clear_obsolete_packs=True,
1382
obsolete_packs=[pack])
1383
cur_packs = packs._pack_transport.list_dir('.')
1384
self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1385
# Note that while we set clear_obsolete_packs=True, it should not
1386
# delete a pack file that we have also scheduled for obsoletion.
1387
obsolete_packs = packs.transport.list_dir('obsolete_packs')
1388
obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1389
self.assertEqual([pack.name], sorted(obsolete_names))
1391
def test_pack_no_obsolete_packs_directory(self):
1392
"""Bug #314314, don't fail if obsolete_packs directory does
1394
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1395
r.control_transport.rmdir('obsolete_packs')
1396
packs._clear_obsolete_packs()
1399
class TestPack(TestCaseWithTransport):
1400
"""Tests for the Pack object."""
1402
def assertCurrentlyEqual(self, left, right):
1403
self.assertTrue(left == right)
1404
self.assertTrue(right == left)
1405
self.assertFalse(left != right)
1406
self.assertFalse(right != left)
1408
def assertCurrentlyNotEqual(self, left, right):
1409
self.assertFalse(left == right)
1410
self.assertFalse(right == left)
1411
self.assertTrue(left != right)
1412
self.assertTrue(right != left)
1414
def test___eq____ne__(self):
1415
left = pack_repo.ExistingPack('', '', '', '', '', '')
1416
right = pack_repo.ExistingPack('', '', '', '', '', '')
1417
self.assertCurrentlyEqual(left, right)
1418
# change all attributes and ensure equality changes as we do.
1419
left.revision_index = 'a'
1420
self.assertCurrentlyNotEqual(left, right)
1421
right.revision_index = 'a'
1422
self.assertCurrentlyEqual(left, right)
1423
left.inventory_index = 'a'
1424
self.assertCurrentlyNotEqual(left, right)
1425
right.inventory_index = 'a'
1426
self.assertCurrentlyEqual(left, right)
1427
left.text_index = 'a'
1428
self.assertCurrentlyNotEqual(left, right)
1429
right.text_index = 'a'
1430
self.assertCurrentlyEqual(left, right)
1431
left.signature_index = 'a'
1432
self.assertCurrentlyNotEqual(left, right)
1433
right.signature_index = 'a'
1434
self.assertCurrentlyEqual(left, right)
1436
self.assertCurrentlyNotEqual(left, right)
1438
self.assertCurrentlyEqual(left, right)
1439
left.transport = 'a'
1440
self.assertCurrentlyNotEqual(left, right)
1441
right.transport = 'a'
1442
self.assertCurrentlyEqual(left, right)
1444
def test_file_name(self):
1445
pack = pack_repo.ExistingPack('', 'a_name', '', '', '', '')
1446
self.assertEqual('a_name.pack', pack.file_name())
1449
class TestNewPack(TestCaseWithTransport):
1450
"""Tests for pack_repo.NewPack."""
1452
def test_new_instance_attributes(self):
1453
upload_transport = self.get_transport('upload')
1454
pack_transport = self.get_transport('pack')
1455
index_transport = self.get_transport('index')
1456
upload_transport.mkdir('.')
1457
collection = pack_repo.RepositoryPackCollection(
1459
transport=self.get_transport('.'),
1460
index_transport=index_transport,
1461
upload_transport=upload_transport,
1462
pack_transport=pack_transport,
1463
index_builder_class=BTreeBuilder,
1464
index_class=BTreeGraphIndex,
1465
use_chk_index=False)
1466
pack = pack_repo.NewPack(collection)
1467
self.addCleanup(pack.abort) # Make sure the write stream gets closed
1468
self.assertIsInstance(pack.revision_index, BTreeBuilder)
1469
self.assertIsInstance(pack.inventory_index, BTreeBuilder)
1470
self.assertIsInstance(pack._hash, type(osutils.md5()))
1471
self.assertTrue(pack.upload_transport is upload_transport)
1472
self.assertTrue(pack.index_transport is index_transport)
1473
self.assertTrue(pack.pack_transport is pack_transport)
1474
self.assertEqual(None, pack.index_sizes)
1475
self.assertEqual(20, len(pack.random_name))
1476
self.assertIsInstance(pack.random_name, str)
1477
self.assertIsInstance(pack.start_time, float)
1480
class TestPacker(TestCaseWithTransport):
1481
"""Tests for the packs repository Packer class."""
1483
def test_pack_optimizes_pack_order(self):
1484
builder = self.make_branch_builder('.', format="1.9")
1485
builder.start_series()
1486
builder.build_snapshot('A', None, [
1487
('add', ('', 'root-id', 'directory', None)),
1488
('add', ('f', 'f-id', 'file', 'content\n'))])
1489
builder.build_snapshot('B', ['A'],
1490
[('modify', ('f-id', 'new-content\n'))])
1491
builder.build_snapshot('C', ['B'],
1492
[('modify', ('f-id', 'third-content\n'))])
1493
builder.build_snapshot('D', ['C'],
1494
[('modify', ('f-id', 'fourth-content\n'))])
1495
b = builder.get_branch()
1497
builder.finish_series()
1498
self.addCleanup(b.unlock)
1499
# At this point, we should have 4 pack files available
1500
# Because of how they were built, they correspond to
1501
# ['D', 'C', 'B', 'A']
1502
packs = b.repository._pack_collection.packs
1503
packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
1505
revision_ids=['B', 'C'])
1506
# Now, when we are copying the B & C revisions, their pack files should
1507
# be moved to the front of the stack
1508
# The new ordering moves B & C to the front of the .packs attribute,
1509
# and leaves the others in the original order.
1510
new_packs = [packs[1], packs[2], packs[0], packs[3]]
1511
new_pack = packer.pack()
1512
self.assertEqual(new_packs, packer.packs)
1515
class TestOptimisingPacker(TestCaseWithTransport):
1516
"""Tests for the OptimisingPacker class."""
1518
def get_pack_collection(self):
1519
repo = self.make_repository('.')
1520
return repo._pack_collection
1522
def test_open_pack_will_optimise(self):
1523
packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
1525
new_pack = packer.open_pack()
1526
self.addCleanup(new_pack.abort) # ensure cleanup
1527
self.assertIsInstance(new_pack, pack_repo.NewPack)
1528
self.assertTrue(new_pack.revision_index._optimize_for_size)
1529
self.assertTrue(new_pack.inventory_index._optimize_for_size)
1530
self.assertTrue(new_pack.text_index._optimize_for_size)
1531
self.assertTrue(new_pack.signature_index._optimize_for_size)
1534
class TestGCCHKPacker(TestCaseWithTransport):
1536
def make_abc_branch(self):
1537
builder = self.make_branch_builder('source')
1538
builder.start_series()
1539
builder.build_snapshot('A', None, [
1540
('add', ('', 'root-id', 'directory', None)),
1541
('add', ('file', 'file-id', 'file', 'content\n')),
1543
builder.build_snapshot('B', ['A'], [
1544
('add', ('dir', 'dir-id', 'directory', None))])
1545
builder.build_snapshot('C', ['B'], [
1546
('modify', ('file-id', 'new content\n'))])
1547
builder.finish_series()
1548
return builder.get_branch()
1550
def make_branch_with_disjoint_inventory_and_revision(self):
1551
"""a repo with separate packs for a revisions Revision and Inventory.
1553
There will be one pack file that holds the Revision content, and one
1554
for the Inventory content.
1556
:return: (repository,
1557
pack_name_with_rev_A_Revision,
1558
pack_name_with_rev_A_Inventory,
1559
pack_name_with_rev_C_content)
1561
b_source = self.make_abc_branch()
1562
b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
1563
b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
1564
b_stacked.lock_write()
1565
self.addCleanup(b_stacked.unlock)
1566
b_stacked.fetch(b_source, 'B')
1567
# Now re-open the stacked repo directly (no fallbacks) so that we can
1568
# fill in the A rev.
1569
repo_not_stacked = b_stacked.bzrdir.open_repository()
1570
repo_not_stacked.lock_write()
1571
self.addCleanup(repo_not_stacked.unlock)
1572
# Now we should have a pack file with A's inventory, but not its
1574
self.assertEqual([('A',), ('B',)],
1575
sorted(repo_not_stacked.inventories.keys()))
1576
self.assertEqual([('B',)],
1577
sorted(repo_not_stacked.revisions.keys()))
1578
stacked_pack_names = repo_not_stacked._pack_collection.names()
1579
# We have a couple names here, figure out which has A's inventory
1580
for name in stacked_pack_names:
1581
pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
1582
keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
1584
inv_a_pack_name = name
1587
self.fail('Could not find pack containing A\'s inventory')
1588
repo_not_stacked.fetch(b_source.repository, 'A')
1589
self.assertEqual([('A',), ('B',)],
1590
sorted(repo_not_stacked.revisions.keys()))
1591
new_pack_names = set(repo_not_stacked._pack_collection.names())
1592
rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
1593
self.assertEqual(1, len(rev_a_pack_names))
1594
rev_a_pack_name = list(rev_a_pack_names)[0]
1595
# Now fetch 'C', so we have a couple pack files to join
1596
repo_not_stacked.fetch(b_source.repository, 'C')
1597
rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
1598
rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
1599
self.assertEqual(1, len(rev_c_pack_names))
1600
rev_c_pack_name = list(rev_c_pack_names)[0]
1601
return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
1604
def test_pack_with_distant_inventories(self):
1605
# See https://bugs.launchpad.net/bzr/+bug/437003
1606
# When repacking, it is possible to have an inventory in a different
1607
# pack file than the associated revision. An autopack can then come
1608
# along, and miss that inventory, and complain.
1609
(repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
1610
) = self.make_branch_with_disjoint_inventory_and_revision()
1611
a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
1612
c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
1613
packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
1614
[a_pack, c_pack], '.test-pack')
1615
# This would raise ValueError in bug #437003, but should not raise an
1619
def test_pack_with_missing_inventory(self):
1620
# Similar to test_pack_with_missing_inventory, but this time, we force
1621
# the A inventory to actually be gone from the repository.
1622
(repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
1623
) = self.make_branch_with_disjoint_inventory_and_revision()
1624
inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
1625
repo._pack_collection._remove_pack_from_memory(inv_a_pack)
1626
packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
1627
repo._pack_collection.all_packs(), '.test-pack')
1628
e = self.assertRaises(ValueError, packer.pack)
1629
packer.new_pack.abort()
1630
self.assertContainsRe(str(e),
1631
r"We are missing inventories for revisions: .*'A'")
1634
class TestCrossFormatPacks(TestCaseWithTransport):
1636
def log_pack(self, hint=None):
1637
self.calls.append(('pack', hint))
1638
self.orig_pack(hint=hint)
1639
if self.expect_hint:
1640
self.assertTrue(hint)
1642
def run_stream(self, src_fmt, target_fmt, expect_pack_called):
1643
self.expect_hint = expect_pack_called
1645
source_tree = self.make_branch_and_tree('src', format=src_fmt)
1646
source_tree.lock_write()
1647
self.addCleanup(source_tree.unlock)
1648
tip = source_tree.commit('foo')
1649
target = self.make_repository('target', format=target_fmt)
1651
self.addCleanup(target.unlock)
1652
source = source_tree.branch.repository._get_source(target._format)
1653
self.orig_pack = target.pack
1654
self.overrideAttr(target, "pack", self.log_pack)
1655
search = target.search_missing_revision_ids(
1656
source_tree.branch.repository, revision_ids=[tip])
1657
stream = source.get_stream(search)
1658
from_format = source_tree.branch.repository._format
1659
sink = target._get_sink()
1660
sink.insert_stream(stream, from_format, [])
1661
if expect_pack_called:
1662
self.assertLength(1, self.calls)
1664
self.assertLength(0, self.calls)
1666
def run_fetch(self, src_fmt, target_fmt, expect_pack_called):
1667
self.expect_hint = expect_pack_called
1669
source_tree = self.make_branch_and_tree('src', format=src_fmt)
1670
source_tree.lock_write()
1671
self.addCleanup(source_tree.unlock)
1672
tip = source_tree.commit('foo')
1673
target = self.make_repository('target', format=target_fmt)
1675
self.addCleanup(target.unlock)
1676
source = source_tree.branch.repository
1677
self.orig_pack = target.pack
1678
self.overrideAttr(target, "pack", self.log_pack)
1679
target.fetch(source)
1680
if expect_pack_called:
1681
self.assertLength(1, self.calls)
1683
self.assertLength(0, self.calls)
1685
def test_sink_format_hint_no(self):
1686
# When the target format says packing makes no difference, pack is not
1688
self.run_stream('1.9', 'rich-root-pack', False)
1690
def test_sink_format_hint_yes(self):
1691
# When the target format says packing makes a difference, pack is
1693
self.run_stream('1.9', '2a', True)
1695
def test_sink_format_same_no(self):
1696
# When the formats are the same, pack is not called.
1697
self.run_stream('2a', '2a', False)
1699
def test_IDS_format_hint_no(self):
1700
# When the target format says packing makes no difference, pack is not
1702
self.run_fetch('1.9', 'rich-root-pack', False)
1704
def test_IDS_format_hint_yes(self):
1705
# When the target format says packing makes a difference, pack is
1707
self.run_fetch('1.9', '2a', True)
1709
def test_IDS_format_same_no(self):
1710
# When the formats are the same, pack is not called.
1711
self.run_fetch('2a', '2a', False)
1714
class Test_LazyListJoin(tests.TestCase):
1716
def test__repr__(self):
1717
lazy = repository._LazyListJoin(['a'], ['b'])
1718
self.assertEqual("bzrlib.repository._LazyListJoin((['a'], ['b']))",
1722
class TestFeatures(tests.TestCaseWithTransport):
1724
def test_open_with_present_feature(self):
1726
repository.RepositoryFormatMetaDir.unregister_feature,
1727
"makes-cheese-sandwich")
1728
repository.RepositoryFormatMetaDir.register_feature(
1729
"makes-cheese-sandwich")
1730
repo = self.make_repository('.')
1732
repo._format.features["makes-cheese-sandwich"] = "required"
1733
repo._format.check_support_status(False)
1736
def test_open_with_missing_required_feature(self):
1737
repo = self.make_repository('.')
1739
repo._format.features["makes-cheese-sandwich"] = "required"
1740
self.assertRaises(errors.MissingFeature,
1741
repo._format.check_support_status, False)
added
removed
bzrlib/tests/test_repository.py
