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