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