604
452
self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;')
607
class TestRepositoryFormatKnit3(TestCaseWithTransport):
609
def test_attribute__fetch_order(self):
610
"""Knits need topological data insertion."""
611
format = bzrdir.BzrDirMetaFormat1()
612
format.repository_format = knitrepo.RepositoryFormatKnit3()
613
repo = self.make_repository('.', format=format)
614
self.assertEqual('topological', repo._fetch_order)
616
def test_attribute__fetch_uses_deltas(self):
617
"""Knits reuse deltas."""
618
format = bzrdir.BzrDirMetaFormat1()
619
format.repository_format = knitrepo.RepositoryFormatKnit3()
620
repo = self.make_repository('.', format=format)
621
self.assertEqual(True, repo._fetch_uses_deltas)
455
class TestRepositoryFormatKnit2(TestCaseWithTransport):
623
457
def test_convert(self):
624
458
"""Ensure the upgrade adds weaves for roots"""
625
459
format = bzrdir.BzrDirMetaFormat1()
626
format.repository_format = knitrepo.RepositoryFormatKnit1()
460
format.repository_format = repository.RepositoryFormatKnit1()
627
461
tree = self.make_branch_and_tree('.', format)
628
462
tree.commit("Dull commit", rev_id="dull")
629
463
revision_tree = tree.branch.repository.revision_tree('dull')
630
revision_tree.lock_read()
632
self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
633
revision_tree.inventory.root.file_id)
635
revision_tree.unlock()
464
self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
465
revision_tree.inventory.root.file_id)
636
466
format = bzrdir.BzrDirMetaFormat1()
637
format.repository_format = knitrepo.RepositoryFormatKnit3()
467
format.repository_format = repository.RepositoryFormatKnit2()
638
468
upgrade.Convert('.', format)
639
469
tree = workingtree.WorkingTree.open('.')
640
470
revision_tree = tree.branch.repository.revision_tree('dull')
641
revision_tree.lock_read()
643
revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
645
revision_tree.unlock()
471
revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
646
472
tree.commit("Another dull commit", rev_id='dull2')
647
473
revision_tree = tree.branch.repository.revision_tree('dull2')
648
revision_tree.lock_read()
649
self.addCleanup(revision_tree.unlock)
650
474
self.assertEqual('dull', revision_tree.inventory.root.revision)
652
def test_supports_external_lookups(self):
653
format = bzrdir.BzrDirMetaFormat1()
654
format.repository_format = knitrepo.RepositoryFormatKnit3()
655
repo = self.make_repository('.', format=format)
656
self.assertFalse(repo._format.supports_external_lookups)
659
class TestWithBrokenRepo(TestCaseWithTransport):
660
"""These tests seem to be more appropriate as interface tests?"""
662
def make_broken_repository(self):
663
# XXX: This function is borrowed from Aaron's "Reconcile can fix bad
664
# parent references" branch which is due to land in bzr.dev soon. Once
665
# it does, this duplication should be removed.
666
repo = self.make_repository('broken-repo')
670
cleanups.append(repo.unlock)
671
repo.start_write_group()
672
cleanups.append(repo.commit_write_group)
673
# make rev1a: A well-formed revision, containing 'file1'
674
inv = inventory.Inventory(revision_id='rev1a')
675
inv.root.revision = 'rev1a'
676
self.add_file(repo, inv, 'file1', 'rev1a', [])
677
repo.add_inventory('rev1a', inv, [])
678
revision = _mod_revision.Revision('rev1a',
679
committer='jrandom@example.com', timestamp=0,
680
inventory_sha1='', timezone=0, message='foo', parent_ids=[])
681
repo.add_revision('rev1a',revision, inv)
683
# make rev1b, which has no Revision, but has an Inventory, and
685
inv = inventory.Inventory(revision_id='rev1b')
686
inv.root.revision = 'rev1b'
687
self.add_file(repo, inv, 'file1', 'rev1b', [])
688
repo.add_inventory('rev1b', inv, [])
690
# make rev2, with file1 and file2
692
# file1 has 'rev1b' as an ancestor, even though this is not
693
# mentioned by 'rev1a', making it an unreferenced ancestor
694
inv = inventory.Inventory()
695
self.add_file(repo, inv, 'file1', 'rev2', ['rev1a', 'rev1b'])
696
self.add_file(repo, inv, 'file2', 'rev2', [])
697
self.add_revision(repo, 'rev2', inv, ['rev1a'])
699
# make ghost revision rev1c
700
inv = inventory.Inventory()
701
self.add_file(repo, inv, 'file2', 'rev1c', [])
703
# make rev3 with file2
704
# file2 refers to 'rev1c', which is a ghost in this repository, so
705
# file2 cannot have rev1c as its ancestor.
706
inv = inventory.Inventory()
707
self.add_file(repo, inv, 'file2', 'rev3', ['rev1c'])
708
self.add_revision(repo, 'rev3', inv, ['rev1c'])
711
for cleanup in reversed(cleanups):
714
def add_revision(self, repo, revision_id, inv, parent_ids):
715
inv.revision_id = revision_id
716
inv.root.revision = revision_id
717
repo.add_inventory(revision_id, inv, parent_ids)
718
revision = _mod_revision.Revision(revision_id,
719
committer='jrandom@example.com', timestamp=0, inventory_sha1='',
720
timezone=0, message='foo', parent_ids=parent_ids)
721
repo.add_revision(revision_id,revision, inv)
723
def add_file(self, repo, inv, filename, revision, parents):
724
file_id = filename + '-id'
725
entry = inventory.InventoryFile(file_id, filename, 'TREE_ROOT')
726
entry.revision = revision
729
text_key = (file_id, revision)
730
parent_keys = [(file_id, parent) for parent in parents]
731
repo.texts.add_lines(text_key, parent_keys, ['line\n'])
733
def test_insert_from_broken_repo(self):
734
"""Inserting a data stream from a broken repository won't silently
735
corrupt the target repository.
737
broken_repo = self.make_broken_repository()
738
empty_repo = self.make_repository('empty-repo')
739
self.assertRaises(errors.RevisionNotPresent, empty_repo.fetch, broken_repo)
742
class TestKnitPackNoSubtrees(TestCaseWithTransport):
744
def get_format(self):
745
return bzrdir.format_registry.make_bzrdir('pack-0.92')
747
def test_attribute__fetch_order(self):
748
"""Packs do not need ordered data retrieval."""
749
format = self.get_format()
750
repo = self.make_repository('.', format=format)
751
self.assertEqual('unsorted', repo._fetch_order)
753
def test_attribute__fetch_uses_deltas(self):
754
"""Packs reuse deltas."""
755
format = self.get_format()
756
repo = self.make_repository('.', format=format)
757
self.assertEqual(True, repo._fetch_uses_deltas)
759
def test_disk_layout(self):
760
format = self.get_format()
761
repo = self.make_repository('.', format=format)
762
# in case of side effects of locking.
765
t = repo.bzrdir.get_repository_transport(None)
767
# XXX: no locks left when unlocked at the moment
768
# self.assertEqualDiff('', t.get('lock').read())
769
self.check_databases(t)
771
def check_format(self, t):
772
self.assertEqualDiff(
773
"Bazaar pack repository format 1 (needs bzr 0.92)\n",
774
t.get('format').read())
776
def assertHasNoKndx(self, t, knit_name):
777
"""Assert that knit_name has no index on t."""
778
self.assertFalse(t.has(knit_name + '.kndx'))
780
def assertHasNoKnit(self, t, knit_name):
781
"""Assert that knit_name exists on t."""
783
self.assertFalse(t.has(knit_name + '.knit'))
785
def check_databases(self, t):
786
"""check knit content for a repository."""
787
# check conversion worked
788
self.assertHasNoKndx(t, 'inventory')
789
self.assertHasNoKnit(t, 'inventory')
790
self.assertHasNoKndx(t, 'revisions')
791
self.assertHasNoKnit(t, 'revisions')
792
self.assertHasNoKndx(t, 'signatures')
793
self.assertHasNoKnit(t, 'signatures')
794
self.assertFalse(t.has('knits'))
795
# revision-indexes file-container directory
797
list(GraphIndex(t, 'pack-names', None).iter_all_entries()))
798
self.assertTrue(S_ISDIR(t.stat('packs').st_mode))
799
self.assertTrue(S_ISDIR(t.stat('upload').st_mode))
800
self.assertTrue(S_ISDIR(t.stat('indices').st_mode))
801
self.assertTrue(S_ISDIR(t.stat('obsolete_packs').st_mode))
803
def test_shared_disk_layout(self):
804
format = self.get_format()
805
repo = self.make_repository('.', shared=True, format=format)
807
t = repo.bzrdir.get_repository_transport(None)
809
# XXX: no locks left when unlocked at the moment
810
# self.assertEqualDiff('', t.get('lock').read())
811
# We should have a 'shared-storage' marker file.
812
self.assertEqualDiff('', t.get('shared-storage').read())
813
self.check_databases(t)
815
def test_shared_no_tree_disk_layout(self):
816
format = self.get_format()
817
repo = self.make_repository('.', shared=True, format=format)
818
repo.set_make_working_trees(False)
820
t = repo.bzrdir.get_repository_transport(None)
822
# XXX: no locks left when unlocked at the moment
823
# self.assertEqualDiff('', t.get('lock').read())
824
# We should have a 'shared-storage' marker file.
825
self.assertEqualDiff('', t.get('shared-storage').read())
826
# We should have a marker for the no-working-trees flag.
827
self.assertEqualDiff('', t.get('no-working-trees').read())
828
# The marker should go when we toggle the setting.
829
repo.set_make_working_trees(True)
830
self.assertFalse(t.has('no-working-trees'))
831
self.check_databases(t)
833
def test_adding_revision_creates_pack_indices(self):
834
format = self.get_format()
835
tree = self.make_branch_and_tree('.', format=format)
836
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
838
list(GraphIndex(trans, 'pack-names', None).iter_all_entries()))
839
tree.commit('foobarbaz')
840
index = GraphIndex(trans, 'pack-names', None)
841
index_nodes = list(index.iter_all_entries())
842
self.assertEqual(1, len(index_nodes))
843
node = index_nodes[0]
845
# the pack sizes should be listed in the index
847
sizes = [int(digits) for digits in pack_value.split(' ')]
848
for size, suffix in zip(sizes, ['.rix', '.iix', '.tix', '.six']):
849
stat = trans.stat('indices/%s%s' % (name, suffix))
850
self.assertEqual(size, stat.st_size)
852
def test_pulling_nothing_leads_to_no_new_names(self):
853
format = self.get_format()
854
tree1 = self.make_branch_and_tree('1', format=format)
855
tree2 = self.make_branch_and_tree('2', format=format)
856
tree1.branch.repository.fetch(tree2.branch.repository)
857
trans = tree1.branch.repository.bzrdir.get_repository_transport(None)
859
list(GraphIndex(trans, 'pack-names', None).iter_all_entries()))
861
def test_commit_across_pack_shape_boundary_autopacks(self):
862
format = self.get_format()
863
tree = self.make_branch_and_tree('.', format=format)
864
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
865
# This test could be a little cheaper by replacing the packs
866
# attribute on the repository to allow a different pack distribution
867
# and max packs policy - so we are checking the policy is honoured
868
# in the test. But for now 11 commits is not a big deal in a single
871
tree.commit('commit %s' % x)
872
# there should be 9 packs:
873
index = GraphIndex(trans, 'pack-names', None)
874
self.assertEqual(9, len(list(index.iter_all_entries())))
875
# insert some files in obsolete_packs which should be removed by pack.
876
trans.put_bytes('obsolete_packs/foo', '123')
877
trans.put_bytes('obsolete_packs/bar', '321')
878
# committing one more should coalesce to 1 of 10.
879
tree.commit('commit triggering pack')
880
index = GraphIndex(trans, 'pack-names', None)
881
self.assertEqual(1, len(list(index.iter_all_entries())))
882
# packing should not damage data
883
tree = tree.bzrdir.open_workingtree()
884
check_result = tree.branch.repository.check(
885
[tree.branch.last_revision()])
886
# We should have 50 (10x5) files in the obsolete_packs directory.
887
obsolete_files = list(trans.list_dir('obsolete_packs'))
888
self.assertFalse('foo' in obsolete_files)
889
self.assertFalse('bar' in obsolete_files)
890
self.assertEqual(50, len(obsolete_files))
891
# XXX: Todo check packs obsoleted correctly - old packs and indices
892
# in the obsolete_packs directory.
893
large_pack_name = list(index.iter_all_entries())[0][1][0]
894
# finally, committing again should not touch the large pack.
895
tree.commit('commit not triggering pack')
896
index = GraphIndex(trans, 'pack-names', None)
897
self.assertEqual(2, len(list(index.iter_all_entries())))
898
pack_names = [node[1][0] for node in index.iter_all_entries()]
899
self.assertTrue(large_pack_name in pack_names)
901
def test_fail_obsolete_deletion(self):
902
# failing to delete obsolete packs is not fatal
903
format = self.get_format()
904
server = fakenfs.FakeNFSServer()
906
self.addCleanup(server.tearDown)
907
transport = get_transport(server.get_url())
908
bzrdir = self.get_format().initialize_on_transport(transport)
909
repo = bzrdir.create_repository()
910
repo_transport = bzrdir.get_repository_transport(None)
911
self.assertTrue(repo_transport.has('obsolete_packs'))
912
# these files are in use by another client and typically can't be deleted
913
repo_transport.put_bytes('obsolete_packs/.nfsblahblah', 'contents')
914
repo._pack_collection._clear_obsolete_packs()
915
self.assertTrue(repo_transport.has('obsolete_packs/.nfsblahblah'))
917
def test_pack_after_two_commits_packs_everything(self):
918
format = self.get_format()
919
tree = self.make_branch_and_tree('.', format=format)
920
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
922
tree.commit('more work')
923
tree.branch.repository.pack()
924
# there should be 1 pack:
925
index = GraphIndex(trans, 'pack-names', None)
926
self.assertEqual(1, len(list(index.iter_all_entries())))
927
self.assertEqual(2, len(tree.branch.repository.all_revision_ids()))
929
def test_pack_layout(self):
930
format = self.get_format()
931
tree = self.make_branch_and_tree('.', format=format)
932
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
933
tree.commit('start', rev_id='1')
934
tree.commit('more work', rev_id='2')
935
tree.branch.repository.pack()
937
self.addCleanup(tree.unlock)
938
pack = tree.branch.repository._pack_collection.get_pack_by_name(
939
tree.branch.repository._pack_collection.names()[0])
940
# revision access tends to be tip->ancestor, so ordering that way on
941
# disk is a good idea.
942
for _1, key, val, refs in pack.revision_index.iter_all_entries():
944
pos_1 = int(val[1:].split()[0])
946
pos_2 = int(val[1:].split()[0])
947
self.assertTrue(pos_2 < pos_1)
949
def test_pack_repositories_support_multiple_write_locks(self):
950
format = self.get_format()
951
self.make_repository('.', shared=True, format=format)
952
r1 = repository.Repository.open('.')
953
r2 = repository.Repository.open('.')
955
self.addCleanup(r1.unlock)
959
def _add_text(self, repo, fileid):
960
"""Add a text to the repository within a write group."""
961
repo.texts.add_lines((fileid, 'samplerev+'+fileid), [], [])
963
def test_concurrent_writers_merge_new_packs(self):
964
format = self.get_format()
965
self.make_repository('.', shared=True, format=format)
966
r1 = repository.Repository.open('.')
967
r2 = repository.Repository.open('.')
970
# access enough data to load the names list
971
list(r1.all_revision_ids())
974
# access enough data to load the names list
975
list(r2.all_revision_ids())
976
r1.start_write_group()
978
r2.start_write_group()
980
self._add_text(r1, 'fileidr1')
981
self._add_text(r2, 'fileidr2')
983
r2.abort_write_group()
986
r1.abort_write_group()
988
# both r1 and r2 have open write groups with data in them
989
# created while the other's write group was open.
990
# Commit both which requires a merge to the pack-names.
992
r1.commit_write_group()
994
r1.abort_write_group()
995
r2.abort_write_group()
997
r2.commit_write_group()
998
# tell r1 to reload from disk
999
r1._pack_collection.reset()
1000
# Now both repositories should know about both names
1001
r1._pack_collection.ensure_loaded()
1002
r2._pack_collection.ensure_loaded()
1003
self.assertEqual(r1._pack_collection.names(), r2._pack_collection.names())
1004
self.assertEqual(2, len(r1._pack_collection.names()))
1010
def test_concurrent_writer_second_preserves_dropping_a_pack(self):
1011
format = self.get_format()
1012
self.make_repository('.', shared=True, format=format)
1013
r1 = repository.Repository.open('.')
1014
r2 = repository.Repository.open('.')
1015
# add a pack to drop
1018
r1.start_write_group()
1020
self._add_text(r1, 'fileidr1')
1022
r1.abort_write_group()
1025
r1.commit_write_group()
1026
r1._pack_collection.ensure_loaded()
1027
name_to_drop = r1._pack_collection.all_packs()[0].name
1032
# access enough data to load the names list
1033
list(r1.all_revision_ids())
1036
# access enough data to load the names list
1037
list(r2.all_revision_ids())
1038
r1._pack_collection.ensure_loaded()
1040
r2.start_write_group()
1042
# in r1, drop the pack
1043
r1._pack_collection._remove_pack_from_memory(
1044
r1._pack_collection.get_pack_by_name(name_to_drop))
1046
self._add_text(r2, 'fileidr2')
1048
r2.abort_write_group()
1051
r1._pack_collection.reset()
1053
# r1 has a changed names list, and r2 an open write groups with
1055
# save r1, and then commit the r2 write group, which requires a
1056
# merge to the pack-names, which should not reinstate
1059
r1._pack_collection._save_pack_names()
1060
r1._pack_collection.reset()
1062
r2.abort_write_group()
1065
r2.commit_write_group()
1067
r2.abort_write_group()
1069
# Now both repositories should now about just one name.
1070
r1._pack_collection.ensure_loaded()
1071
r2._pack_collection.ensure_loaded()
1072
self.assertEqual(r1._pack_collection.names(), r2._pack_collection.names())
1073
self.assertEqual(1, len(r1._pack_collection.names()))
1074
self.assertFalse(name_to_drop in r1._pack_collection.names())
1080
def test_lock_write_does_not_physically_lock(self):
1081
repo = self.make_repository('.', format=self.get_format())
1083
self.addCleanup(repo.unlock)
1084
self.assertFalse(repo.get_physical_lock_status())
1086
def prepare_for_break_lock(self):
1087
# Setup the global ui factory state so that a break-lock method call
1088
# will find usable input in the input stream.
1089
old_factory = bzrlib.ui.ui_factory
1090
def restoreFactory():
1091
bzrlib.ui.ui_factory = old_factory
1092
self.addCleanup(restoreFactory)
1093
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1094
bzrlib.ui.ui_factory.stdin = StringIO("y\n")
1096
def test_break_lock_breaks_physical_lock(self):
1097
repo = self.make_repository('.', format=self.get_format())
1098
repo._pack_collection.lock_names()
1099
repo2 = repository.Repository.open('.')
1100
self.assertTrue(repo.get_physical_lock_status())
1101
self.prepare_for_break_lock()
1103
self.assertFalse(repo.get_physical_lock_status())
1105
def test_broken_physical_locks_error_on__unlock_names_lock(self):
1106
repo = self.make_repository('.', format=self.get_format())
1107
repo._pack_collection.lock_names()
1108
self.assertTrue(repo.get_physical_lock_status())
1109
repo2 = repository.Repository.open('.')
1110
self.prepare_for_break_lock()
1112
self.assertRaises(errors.LockBroken, repo._pack_collection._unlock_names)
1114
def test_fetch_without_find_ghosts_ignores_ghosts(self):
1115
# we want two repositories at this point:
1116
# one with a revision that is a ghost in the other
1118
# 'ghost' is present in has_ghost, 'ghost' is absent in 'missing_ghost'.
1119
# 'references' is present in both repositories, and 'tip' is present
1120
# just in has_ghost.
1121
# has_ghost missing_ghost
1122
#------------------------------
1124
# 'references' 'references'
1126
# In this test we fetch 'tip' which should not fetch 'ghost'
1127
has_ghost = self.make_repository('has_ghost', format=self.get_format())
1128
missing_ghost = self.make_repository('missing_ghost',
1129
format=self.get_format())
1131
def add_commit(repo, revision_id, parent_ids):
1133
repo.start_write_group()
1134
inv = inventory.Inventory(revision_id=revision_id)
1135
inv.root.revision = revision_id
1136
root_id = inv.root.file_id
1137
sha1 = repo.add_inventory(revision_id, inv, [])
1138
repo.texts.add_lines((root_id, revision_id), [], [])
1139
rev = bzrlib.revision.Revision(timestamp=0,
1141
committer="Foo Bar <foo@example.com>",
1143
inventory_sha1=sha1,
1144
revision_id=revision_id)
1145
rev.parent_ids = parent_ids
1146
repo.add_revision(revision_id, rev)
1147
repo.commit_write_group()
1149
add_commit(has_ghost, 'ghost', [])
1150
add_commit(has_ghost, 'references', ['ghost'])
1151
add_commit(missing_ghost, 'references', ['ghost'])
1152
add_commit(has_ghost, 'tip', ['references'])
1153
missing_ghost.fetch(has_ghost, 'tip')
1154
# missing ghost now has tip and not ghost.
1155
rev = missing_ghost.get_revision('tip')
1156
inv = missing_ghost.get_inventory('tip')
1157
self.assertRaises(errors.NoSuchRevision,
1158
missing_ghost.get_revision, 'ghost')
1159
self.assertRaises(errors.NoSuchRevision,
1160
missing_ghost.get_inventory, 'ghost')
1162
def test_supports_external_lookups(self):
1163
repo = self.make_repository('.', format=self.get_format())
1164
self.assertFalse(repo._format.supports_external_lookups)
1167
class TestKnitPackSubtrees(TestKnitPackNoSubtrees):
1169
def get_format(self):
1170
return bzrdir.format_registry.make_bzrdir(
1171
'pack-0.92-subtree')
1173
def check_format(self, t):
1174
self.assertEqualDiff(
1175
"Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n",
1176
t.get('format').read())
1179
class TestDevelopment0(TestKnitPackNoSubtrees):
1181
def get_format(self):
1182
return bzrdir.format_registry.make_bzrdir(
1185
def check_format(self, t):
1186
self.assertEqualDiff(
1187
"Bazaar development format 0 (needs bzr.dev from before 1.3)\n",
1188
t.get('format').read())
1191
class TestDevelopment0Subtree(TestKnitPackNoSubtrees):
1193
def get_format(self):
1194
return bzrdir.format_registry.make_bzrdir(
1195
'development0-subtree')
1197
def check_format(self, t):
1198
self.assertEqualDiff(
1199
"Bazaar development format 0 with subtree support "
1200
"(needs bzr.dev from before 1.3)\n",
1201
t.get('format').read())
1204
class TestExternalDevelopment1(object):
1206
# mixin class for testing stack-supporting development formats
1208
def test_stack_checks_compatibility(self):
1209
# early versions of the packing code relied on pack internals to
1210
# stack, but the current version should be able to stack on any
1213
# TODO: Possibly this should be run per-repository-format and raise
1214
# TestNotApplicable on formats that don't support stacking. -- mbp
1216
repo = self.make_repository('repo', format=self.get_format())
1217
if repo.supports_rich_root():
1218
# can only stack on repositories that have compatible internal
1220
matching_format_name = 'pack-0.92-subtree'
1221
mismatching_format_name = 'pack-0.92'
1223
matching_format_name = 'pack-0.92'
1224
mismatching_format_name = 'pack-0.92-subtree'
1225
base = self.make_repository('base', format=matching_format_name)
1226
repo.add_fallback_repository(base)
1227
# you can't stack on something with incompatible data
1228
bad_repo = self.make_repository('mismatch',
1229
format=mismatching_format_name)
1230
e = self.assertRaises(errors.IncompatibleRepositories,
1231
repo.add_fallback_repository, bad_repo)
1232
self.assertContainsRe(str(e),
1233
r'(?m)KnitPackRepository.*/mismatch/.*\nis not compatible with\n'
1234
r'KnitPackRepository.*/repo/.*\n'
1235
r'different rich-root support')
1237
def test_adding_pack_does_not_record_pack_names_from_other_repositories(self):
1238
base = self.make_branch_and_tree('base', format=self.get_format())
1240
referencing = self.make_branch_and_tree('repo', format=self.get_format())
1241
referencing.branch.repository.add_fallback_repository(base.branch.repository)
1242
referencing.commit('bar')
1243
new_instance = referencing.bzrdir.open_repository()
1244
new_instance.lock_read()
1245
self.addCleanup(new_instance.unlock)
1246
new_instance._pack_collection.ensure_loaded()
1247
self.assertEqual(1, len(new_instance._pack_collection.all_packs()))
1249
def test_autopack_only_considers_main_repo_packs(self):
1250
base = self.make_branch_and_tree('base', format=self.get_format())
1252
tree = self.make_branch_and_tree('repo', format=self.get_format())
1253
tree.branch.repository.add_fallback_repository(base.branch.repository)
1254
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
1255
# This test could be a little cheaper by replacing the packs
1256
# attribute on the repository to allow a different pack distribution
1257
# and max packs policy - so we are checking the policy is honoured
1258
# in the test. But for now 11 commits is not a big deal in a single
1261
tree.commit('commit %s' % x)
1262
# there should be 9 packs:
1263
index = GraphIndex(trans, 'pack-names', None)
1264
self.assertEqual(9, len(list(index.iter_all_entries())))
1265
# committing one more should coalesce to 1 of 10.
1266
tree.commit('commit triggering pack')
1267
index = GraphIndex(trans, 'pack-names', None)
1268
self.assertEqual(1, len(list(index.iter_all_entries())))
1269
# packing should not damage data
1270
tree = tree.bzrdir.open_workingtree()
1271
check_result = tree.branch.repository.check(
1272
[tree.branch.last_revision()])
1273
# We should have 50 (10x5) files in the obsolete_packs directory.
1274
obsolete_files = list(trans.list_dir('obsolete_packs'))
1275
self.assertFalse('foo' in obsolete_files)
1276
self.assertFalse('bar' in obsolete_files)
1277
self.assertEqual(50, len(obsolete_files))
1278
# XXX: Todo check packs obsoleted correctly - old packs and indices
1279
# in the obsolete_packs directory.
1280
large_pack_name = list(index.iter_all_entries())[0][1][0]
1281
# finally, committing again should not touch the large pack.
1282
tree.commit('commit not triggering pack')
1283
index = GraphIndex(trans, 'pack-names', None)
1284
self.assertEqual(2, len(list(index.iter_all_entries())))
1285
pack_names = [node[1][0] for node in index.iter_all_entries()]
1286
self.assertTrue(large_pack_name in pack_names)
1289
class TestDevelopment1(TestKnitPackNoSubtrees, TestExternalDevelopment1):
1291
def get_format(self):
1292
return bzrdir.format_registry.make_bzrdir(
1295
def check_format(self, t):
1296
self.assertEqualDiff(
1297
"Bazaar development format 1 (needs bzr.dev from before 1.6)\n",
1298
t.get('format').read())
1300
def test_supports_external_lookups(self):
1301
repo = self.make_repository('.', format=self.get_format())
1302
self.assertTrue(repo._format.supports_external_lookups)
1305
class TestDevelopment1Subtree(TestKnitPackNoSubtrees, TestExternalDevelopment1):
1307
def get_format(self):
1308
return bzrdir.format_registry.make_bzrdir(
1309
'development-subtree')
1311
def check_format(self, t):
1312
self.assertEqualDiff(
1313
"Bazaar development format 1 with subtree support "
1314
"(needs bzr.dev from before 1.6)\n",
1315
t.get('format').read())
1317
def test_supports_external_lookups(self):
1318
repo = self.make_repository('.', format=self.get_format())
1319
self.assertTrue(repo._format.supports_external_lookups)
1322
class TestRepositoryPackCollection(TestCaseWithTransport):
1324
def get_format(self):
1325
return bzrdir.format_registry.make_bzrdir('pack-0.92')
1327
def test__max_pack_count(self):
1328
"""The maximum pack count is a function of the number of revisions."""
1329
format = self.get_format()
1330
repo = self.make_repository('.', format=format)
1331
packs = repo._pack_collection
1332
# no revisions - one pack, so that we can have a revision free repo
1333
# without it blowing up
1334
self.assertEqual(1, packs._max_pack_count(0))
1335
# after that the sum of the digits, - check the first 1-9
1336
self.assertEqual(1, packs._max_pack_count(1))
1337
self.assertEqual(2, packs._max_pack_count(2))
1338
self.assertEqual(3, packs._max_pack_count(3))
1339
self.assertEqual(4, packs._max_pack_count(4))
1340
self.assertEqual(5, packs._max_pack_count(5))
1341
self.assertEqual(6, packs._max_pack_count(6))
1342
self.assertEqual(7, packs._max_pack_count(7))
1343
self.assertEqual(8, packs._max_pack_count(8))
1344
self.assertEqual(9, packs._max_pack_count(9))
1345
# check the boundary cases with two digits for the next decade
1346
self.assertEqual(1, packs._max_pack_count(10))
1347
self.assertEqual(2, packs._max_pack_count(11))
1348
self.assertEqual(10, packs._max_pack_count(19))
1349
self.assertEqual(2, packs._max_pack_count(20))
1350
self.assertEqual(3, packs._max_pack_count(21))
1351
# check some arbitrary big numbers
1352
self.assertEqual(25, packs._max_pack_count(112894))
1354
def test_pack_distribution_zero(self):
1355
format = self.get_format()
1356
repo = self.make_repository('.', format=format)
1357
packs = repo._pack_collection
1358
self.assertEqual([0], packs.pack_distribution(0))
1360
def test_ensure_loaded_unlocked(self):
1361
format = self.get_format()
1362
repo = self.make_repository('.', format=format)
1363
self.assertRaises(errors.ObjectNotLocked,
1364
repo._pack_collection.ensure_loaded)
1366
def test_pack_distribution_one_to_nine(self):
1367
format = self.get_format()
1368
repo = self.make_repository('.', format=format)
1369
packs = repo._pack_collection
1370
self.assertEqual([1],
1371
packs.pack_distribution(1))
1372
self.assertEqual([1, 1],
1373
packs.pack_distribution(2))
1374
self.assertEqual([1, 1, 1],
1375
packs.pack_distribution(3))
1376
self.assertEqual([1, 1, 1, 1],
1377
packs.pack_distribution(4))
1378
self.assertEqual([1, 1, 1, 1, 1],
1379
packs.pack_distribution(5))
1380
self.assertEqual([1, 1, 1, 1, 1, 1],
1381
packs.pack_distribution(6))
1382
self.assertEqual([1, 1, 1, 1, 1, 1, 1],
1383
packs.pack_distribution(7))
1384
self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1],
1385
packs.pack_distribution(8))
1386
self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1, 1],
1387
packs.pack_distribution(9))
1389
def test_pack_distribution_stable_at_boundaries(self):
1390
"""When there are multi-rev packs the counts are stable."""
1391
format = self.get_format()
1392
repo = self.make_repository('.', format=format)
1393
packs = repo._pack_collection
1395
self.assertEqual([10], packs.pack_distribution(10))
1396
self.assertEqual([10, 1], packs.pack_distribution(11))
1397
self.assertEqual([10, 10], packs.pack_distribution(20))
1398
self.assertEqual([10, 10, 1], packs.pack_distribution(21))
1400
self.assertEqual([100], packs.pack_distribution(100))
1401
self.assertEqual([100, 1], packs.pack_distribution(101))
1402
self.assertEqual([100, 10, 1], packs.pack_distribution(111))
1403
self.assertEqual([100, 100], packs.pack_distribution(200))
1404
self.assertEqual([100, 100, 1], packs.pack_distribution(201))
1405
self.assertEqual([100, 100, 10, 1], packs.pack_distribution(211))
1407
def test_plan_pack_operations_2009_revisions_skip_all_packs(self):
1408
format = self.get_format()
1409
repo = self.make_repository('.', format=format)
1410
packs = repo._pack_collection
1411
existing_packs = [(2000, "big"), (9, "medium")]
1412
# rev count - 2009 -> 2x1000 + 9x1
1413
pack_operations = packs.plan_autopack_combinations(
1414
existing_packs, [1000, 1000, 1, 1, 1, 1, 1, 1, 1, 1, 1])
1415
self.assertEqual([], pack_operations)
1417
def test_plan_pack_operations_2010_revisions_skip_all_packs(self):
1418
format = self.get_format()
1419
repo = self.make_repository('.', format=format)
1420
packs = repo._pack_collection
1421
existing_packs = [(2000, "big"), (9, "medium"), (1, "single")]
1422
# rev count - 2010 -> 2x1000 + 1x10
1423
pack_operations = packs.plan_autopack_combinations(
1424
existing_packs, [1000, 1000, 10])
1425
self.assertEqual([], pack_operations)
1427
def test_plan_pack_operations_2010_combines_smallest_two(self):
1428
format = self.get_format()
1429
repo = self.make_repository('.', format=format)
1430
packs = repo._pack_collection
1431
existing_packs = [(1999, "big"), (9, "medium"), (1, "single2"),
1433
# rev count - 2010 -> 2x1000 + 1x10 (3)
1434
pack_operations = packs.plan_autopack_combinations(
1435
existing_packs, [1000, 1000, 10])
1436
self.assertEqual([[2, ["single2", "single1"]], [0, []]], pack_operations)
1438
def test_all_packs_none(self):
1439
format = self.get_format()
1440
tree = self.make_branch_and_tree('.', format=format)
1442
self.addCleanup(tree.unlock)
1443
packs = tree.branch.repository._pack_collection
1444
packs.ensure_loaded()
1445
self.assertEqual([], packs.all_packs())
1447
def test_all_packs_one(self):
1448
format = self.get_format()
1449
tree = self.make_branch_and_tree('.', format=format)
1450
tree.commit('start')
1452
self.addCleanup(tree.unlock)
1453
packs = tree.branch.repository._pack_collection
1454
packs.ensure_loaded()
1456
packs.get_pack_by_name(packs.names()[0])],
1459
def test_all_packs_two(self):
1460
format = self.get_format()
1461
tree = self.make_branch_and_tree('.', format=format)
1462
tree.commit('start')
1463
tree.commit('continue')
1465
self.addCleanup(tree.unlock)
1466
packs = tree.branch.repository._pack_collection
1467
packs.ensure_loaded()
1469
packs.get_pack_by_name(packs.names()[0]),
1470
packs.get_pack_by_name(packs.names()[1]),
1471
], packs.all_packs())
1473
def test_get_pack_by_name(self):
1474
format = self.get_format()
1475
tree = self.make_branch_and_tree('.', format=format)
1476
tree.commit('start')
1478
self.addCleanup(tree.unlock)
1479
packs = tree.branch.repository._pack_collection
1480
packs.ensure_loaded()
1481
name = packs.names()[0]
1482
pack_1 = packs.get_pack_by_name(name)
1483
# the pack should be correctly initialised
1484
sizes = packs._names[name]
1485
rev_index = GraphIndex(packs._index_transport, name + '.rix', sizes[0])
1486
inv_index = GraphIndex(packs._index_transport, name + '.iix', sizes[1])
1487
txt_index = GraphIndex(packs._index_transport, name + '.tix', sizes[2])
1488
sig_index = GraphIndex(packs._index_transport, name + '.six', sizes[3])
1489
self.assertEqual(pack_repo.ExistingPack(packs._pack_transport,
1490
name, rev_index, inv_index, txt_index, sig_index), pack_1)
1491
# and the same instance should be returned on successive calls.
1492
self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1495
class TestPack(TestCaseWithTransport):
1496
"""Tests for the Pack object."""
1498
def assertCurrentlyEqual(self, left, right):
1499
self.assertTrue(left == right)
1500
self.assertTrue(right == left)
1501
self.assertFalse(left != right)
1502
self.assertFalse(right != left)
1504
def assertCurrentlyNotEqual(self, left, right):
1505
self.assertFalse(left == right)
1506
self.assertFalse(right == left)
1507
self.assertTrue(left != right)
1508
self.assertTrue(right != left)
1510
def test___eq____ne__(self):
1511
left = pack_repo.ExistingPack('', '', '', '', '', '')
1512
right = pack_repo.ExistingPack('', '', '', '', '', '')
1513
self.assertCurrentlyEqual(left, right)
1514
# change all attributes and ensure equality changes as we do.
1515
left.revision_index = 'a'
1516
self.assertCurrentlyNotEqual(left, right)
1517
right.revision_index = 'a'
1518
self.assertCurrentlyEqual(left, right)
1519
left.inventory_index = 'a'
1520
self.assertCurrentlyNotEqual(left, right)
1521
right.inventory_index = 'a'
1522
self.assertCurrentlyEqual(left, right)
1523
left.text_index = 'a'
1524
self.assertCurrentlyNotEqual(left, right)
1525
right.text_index = 'a'
1526
self.assertCurrentlyEqual(left, right)
1527
left.signature_index = 'a'
1528
self.assertCurrentlyNotEqual(left, right)
1529
right.signature_index = 'a'
1530
self.assertCurrentlyEqual(left, right)
1532
self.assertCurrentlyNotEqual(left, right)
1534
self.assertCurrentlyEqual(left, right)
1535
left.transport = 'a'
1536
self.assertCurrentlyNotEqual(left, right)
1537
right.transport = 'a'
1538
self.assertCurrentlyEqual(left, right)
1540
def test_file_name(self):
1541
pack = pack_repo.ExistingPack('', 'a_name', '', '', '', '')
1542
self.assertEqual('a_name.pack', pack.file_name())
1545
class TestNewPack(TestCaseWithTransport):
1546
"""Tests for pack_repo.NewPack."""
1548
def test_new_instance_attributes(self):
1549
upload_transport = self.get_transport('upload')
1550
pack_transport = self.get_transport('pack')
1551
index_transport = self.get_transport('index')
1552
upload_transport.mkdir('.')
1553
pack = pack_repo.NewPack(upload_transport, index_transport,
1555
self.assertIsInstance(pack.revision_index, InMemoryGraphIndex)
1556
self.assertIsInstance(pack.inventory_index, InMemoryGraphIndex)
1557
self.assertIsInstance(pack._hash, type(md5.new()))
1558
self.assertTrue(pack.upload_transport is upload_transport)
1559
self.assertTrue(pack.index_transport is index_transport)
1560
self.assertTrue(pack.pack_transport is pack_transport)
1561
self.assertEqual(None, pack.index_sizes)
1562
self.assertEqual(20, len(pack.random_name))
1563
self.assertIsInstance(pack.random_name, str)
1564
self.assertIsInstance(pack.start_time, float)
1567
class TestPacker(TestCaseWithTransport):
1568
"""Tests for the packs repository Packer class."""
1570
# To date, this class has been factored out and nothing new added to it;
1571
# thus there are not yet any tests.
1574
class TestInterDifferingSerializer(TestCaseWithTransport):
1576
def test_progress_bar(self):
1577
tree = self.make_branch_and_tree('tree')
1578
tree.commit('rev1', rev_id='rev-1')
1579
tree.commit('rev2', rev_id='rev-2')
1580
tree.commit('rev3', rev_id='rev-3')
1581
repo = self.make_repository('repo')
1582
inter_repo = repository.InterDifferingSerializer(
1583
tree.branch.repository, repo)
1584
pb = progress.InstrumentedProgress(to_file=StringIO())
1585
pb.never_throttle = True
1586
inter_repo.fetch('rev-1', pb)
1587
self.assertEqual('Transferring revisions', pb.last_msg)
1588
self.assertEqual(1, pb.last_cnt)
1589
self.assertEqual(1, pb.last_total)
1590
inter_repo.fetch('rev-3', pb)
1591
self.assertEqual(2, pb.last_cnt)
1592
self.assertEqual(2, pb.last_total)