420
469
self.assertFalse(repo._format.supports_external_lookups)
423
class KnitRepositoryStreamTests(test_knit.KnitTests):
424
"""Tests for knitrepo._get_stream_as_bytes."""
426
def test_get_stream_as_bytes(self):
428
k1 = self.make_test_knit()
429
k1.add_lines('text-a', [], test_knit.split_lines(test_knit.TEXT_1))
431
# Serialise it, check the output.
432
bytes = knitrepo._get_stream_as_bytes(k1, ['text-a'])
433
data = bencode.bdecode(bytes)
434
format, record = data
435
self.assertEqual('knit-plain', format)
436
self.assertEqual(['text-a', ['fulltext'], []], record[:3])
437
self.assertRecordContentEqual(k1, 'text-a', record[3])
439
def test_get_stream_as_bytes_all(self):
440
"""Get a serialised data stream for all the records in a knit.
442
Much like test_get_stream_all, except for get_stream_as_bytes.
444
k1 = self.make_test_knit()
445
# Insert the same data as BasicKnitTests.test_knit_join, as they seem
446
# to cover a range of cases (no parents, one parent, multiple parents).
448
('text-a', [], test_knit.TEXT_1),
449
('text-b', ['text-a'], test_knit.TEXT_1),
450
('text-c', [], test_knit.TEXT_1),
451
('text-d', ['text-c'], test_knit.TEXT_1),
452
('text-m', ['text-b', 'text-d'], test_knit.TEXT_1),
454
# This test is actually a bit strict as the order in which they're
455
# returned is not defined. This matches the current (deterministic)
457
expected_data_list = [
458
# version, options, parents
459
('text-a', ['fulltext'], []),
460
('text-b', ['line-delta'], ['text-a']),
461
('text-m', ['line-delta'], ['text-b', 'text-d']),
462
('text-c', ['fulltext'], []),
463
('text-d', ['line-delta'], ['text-c']),
465
for version_id, parents, lines in test_data:
466
k1.add_lines(version_id, parents, test_knit.split_lines(lines))
468
bytes = knitrepo._get_stream_as_bytes(
469
k1, ['text-a', 'text-b', 'text-m', 'text-c', 'text-d', ])
471
data = bencode.bdecode(bytes)
473
self.assertEqual('knit-plain', format)
475
for expected, actual in zip(expected_data_list, data):
476
expected_version = expected[0]
477
expected_options = expected[1]
478
expected_parents = expected[2]
479
version, options, parents, bytes = actual
480
self.assertEqual(expected_version, version)
481
self.assertEqual(expected_options, options)
482
self.assertEqual(expected_parents, parents)
483
self.assertRecordContentEqual(k1, version, bytes)
486
472
class DummyRepository(object):
487
473
"""A dummy repository for testing."""
780
737
broken_repo = self.make_broken_repository()
781
738
empty_repo = self.make_repository('empty-repo')
782
search = graph.SearchResult(set(['rev1a', 'rev2', 'rev3']),
783
set(), 3, ['rev1a', 'rev2', 'rev3'])
784
stream = broken_repo.get_data_stream_for_search(search)
785
empty_repo.lock_write()
786
self.addCleanup(empty_repo.unlock)
787
empty_repo.start_write_group()
790
errors.KnitCorrupt, empty_repo.insert_data_stream, stream)
792
empty_repo.abort_write_group()
795
class TestKnitPackNoSubtrees(TestCaseWithTransport):
797
def get_format(self):
798
return bzrdir.format_registry.make_bzrdir('pack-0.92')
800
def test_disk_layout(self):
801
format = self.get_format()
802
repo = self.make_repository('.', format=format)
803
# in case of side effects of locking.
806
t = repo.bzrdir.get_repository_transport(None)
808
# XXX: no locks left when unlocked at the moment
809
# self.assertEqualDiff('', t.get('lock').read())
810
self.check_databases(t)
812
def check_format(self, t):
813
self.assertEqualDiff(
814
"Bazaar pack repository format 1 (needs bzr 0.92)\n",
815
t.get('format').read())
817
def assertHasKndx(self, t, knit_name):
818
"""Assert that knit_name exists on t."""
819
self.assertEqualDiff('# bzr knit index 8\n',
820
t.get(knit_name + '.kndx').read())
822
def assertHasNoKndx(self, t, knit_name):
823
"""Assert that knit_name has no index on t."""
824
self.assertFalse(t.has(knit_name + '.kndx'))
826
def assertHasNoKnit(self, t, knit_name):
827
"""Assert that knit_name exists on t."""
829
self.assertFalse(t.has(knit_name + '.knit'))
831
def check_databases(self, t):
832
"""check knit content for a repository."""
833
# check conversion worked
834
self.assertHasNoKndx(t, 'inventory')
835
self.assertHasNoKnit(t, 'inventory')
836
self.assertHasNoKndx(t, 'revisions')
837
self.assertHasNoKnit(t, 'revisions')
838
self.assertHasNoKndx(t, 'signatures')
839
self.assertHasNoKnit(t, 'signatures')
840
self.assertFalse(t.has('knits'))
841
# revision-indexes file-container directory
843
list(GraphIndex(t, 'pack-names', None).iter_all_entries()))
844
self.assertTrue(S_ISDIR(t.stat('packs').st_mode))
845
self.assertTrue(S_ISDIR(t.stat('upload').st_mode))
846
self.assertTrue(S_ISDIR(t.stat('indices').st_mode))
847
self.assertTrue(S_ISDIR(t.stat('obsolete_packs').st_mode))
849
def test_shared_disk_layout(self):
850
format = self.get_format()
851
repo = self.make_repository('.', shared=True, format=format)
853
t = repo.bzrdir.get_repository_transport(None)
855
# XXX: no locks left when unlocked at the moment
856
# self.assertEqualDiff('', t.get('lock').read())
857
# We should have a 'shared-storage' marker file.
858
self.assertEqualDiff('', t.get('shared-storage').read())
859
self.check_databases(t)
861
def test_shared_no_tree_disk_layout(self):
862
format = self.get_format()
863
repo = self.make_repository('.', shared=True, format=format)
864
repo.set_make_working_trees(False)
866
t = repo.bzrdir.get_repository_transport(None)
868
# XXX: no locks left when unlocked at the moment
869
# self.assertEqualDiff('', t.get('lock').read())
870
# We should have a 'shared-storage' marker file.
871
self.assertEqualDiff('', t.get('shared-storage').read())
872
# We should have a marker for the no-working-trees flag.
873
self.assertEqualDiff('', t.get('no-working-trees').read())
874
# The marker should go when we toggle the setting.
875
repo.set_make_working_trees(True)
876
self.assertFalse(t.has('no-working-trees'))
877
self.check_databases(t)
879
def test_adding_revision_creates_pack_indices(self):
880
format = self.get_format()
881
tree = self.make_branch_and_tree('.', format=format)
882
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
884
list(GraphIndex(trans, 'pack-names', None).iter_all_entries()))
885
tree.commit('foobarbaz')
886
index = GraphIndex(trans, 'pack-names', None)
887
index_nodes = list(index.iter_all_entries())
888
self.assertEqual(1, len(index_nodes))
889
node = index_nodes[0]
891
# the pack sizes should be listed in the index
893
sizes = [int(digits) for digits in pack_value.split(' ')]
894
for size, suffix in zip(sizes, ['.rix', '.iix', '.tix', '.six']):
895
stat = trans.stat('indices/%s%s' % (name, suffix))
896
self.assertEqual(size, stat.st_size)
898
def test_pulling_nothing_leads_to_no_new_names(self):
899
format = self.get_format()
900
tree1 = self.make_branch_and_tree('1', format=format)
901
tree2 = self.make_branch_and_tree('2', format=format)
902
tree1.branch.repository.fetch(tree2.branch.repository)
903
trans = tree1.branch.repository.bzrdir.get_repository_transport(None)
905
list(GraphIndex(trans, 'pack-names', None).iter_all_entries()))
907
def test_commit_across_pack_shape_boundary_autopacks(self):
908
format = self.get_format()
909
tree = self.make_branch_and_tree('.', format=format)
910
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
911
# This test could be a little cheaper by replacing the packs
912
# attribute on the repository to allow a different pack distribution
913
# and max packs policy - so we are checking the policy is honoured
914
# in the test. But for now 11 commits is not a big deal in a single
917
tree.commit('commit %s' % x)
918
# there should be 9 packs:
919
index = GraphIndex(trans, 'pack-names', None)
920
self.assertEqual(9, len(list(index.iter_all_entries())))
921
# insert some files in obsolete_packs which should be removed by pack.
922
trans.put_bytes('obsolete_packs/foo', '123')
923
trans.put_bytes('obsolete_packs/bar', '321')
924
# committing one more should coalesce to 1 of 10.
925
tree.commit('commit triggering pack')
926
index = GraphIndex(trans, 'pack-names', None)
927
self.assertEqual(1, len(list(index.iter_all_entries())))
928
# packing should not damage data
929
tree = tree.bzrdir.open_workingtree()
930
check_result = tree.branch.repository.check(
931
[tree.branch.last_revision()])
932
# We should have 50 (10x5) files in the obsolete_packs directory.
933
obsolete_files = list(trans.list_dir('obsolete_packs'))
934
self.assertFalse('foo' in obsolete_files)
935
self.assertFalse('bar' in obsolete_files)
936
self.assertEqual(50, len(obsolete_files))
937
# XXX: Todo check packs obsoleted correctly - old packs and indices
938
# in the obsolete_packs directory.
939
large_pack_name = list(index.iter_all_entries())[0][1][0]
940
# finally, committing again should not touch the large pack.
941
tree.commit('commit not triggering pack')
942
index = GraphIndex(trans, 'pack-names', None)
943
self.assertEqual(2, len(list(index.iter_all_entries())))
944
pack_names = [node[1][0] for node in index.iter_all_entries()]
945
self.assertTrue(large_pack_name in pack_names)
947
def test_pack_after_two_commits_packs_everything(self):
948
format = self.get_format()
949
tree = self.make_branch_and_tree('.', format=format)
950
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
952
tree.commit('more work')
953
tree.branch.repository.pack()
954
# there should be 1 pack:
955
index = GraphIndex(trans, 'pack-names', None)
956
self.assertEqual(1, len(list(index.iter_all_entries())))
957
self.assertEqual(2, len(tree.branch.repository.all_revision_ids()))
959
def test_pack_layout(self):
960
format = self.get_format()
961
tree = self.make_branch_and_tree('.', format=format)
962
trans = tree.branch.repository.bzrdir.get_repository_transport(None)
963
tree.commit('start', rev_id='1')
964
tree.commit('more work', rev_id='2')
965
tree.branch.repository.pack()
967
self.addCleanup(tree.unlock)
968
pack = tree.branch.repository._pack_collection.get_pack_by_name(
969
tree.branch.repository._pack_collection.names()[0])
970
# revision access tends to be tip->ancestor, so ordering that way on
971
# disk is a good idea.
972
for _1, key, val, refs in pack.revision_index.iter_all_entries():
974
pos_1 = int(val[1:].split()[0])
976
pos_2 = int(val[1:].split()[0])
977
self.assertTrue(pos_2 < pos_1)
979
def test_pack_repositories_support_multiple_write_locks(self):
980
format = self.get_format()
981
self.make_repository('.', shared=True, format=format)
982
r1 = repository.Repository.open('.')
983
r2 = repository.Repository.open('.')
985
self.addCleanup(r1.unlock)
989
def _add_text(self, repo, fileid):
990
"""Add a text to the repository within a write group."""
991
vf =repo.weave_store.get_weave(fileid, repo.get_transaction())
992
vf.add_lines('samplerev+' + fileid, [], [])
994
def test_concurrent_writers_merge_new_packs(self):
995
format = self.get_format()
996
self.make_repository('.', shared=True, format=format)
997
r1 = repository.Repository.open('.')
998
r2 = repository.Repository.open('.')
1001
# access enough data to load the names list
1002
list(r1.all_revision_ids())
1005
# access enough data to load the names list
1006
list(r2.all_revision_ids())
1007
r1.start_write_group()
1009
r2.start_write_group()
1011
self._add_text(r1, 'fileidr1')
1012
self._add_text(r2, 'fileidr2')
1014
r2.abort_write_group()
1017
r1.abort_write_group()
1019
# both r1 and r2 have open write groups with data in them
1020
# created while the other's write group was open.
1021
# Commit both which requires a merge to the pack-names.
1023
r1.commit_write_group()
1025
r1.abort_write_group()
1026
r2.abort_write_group()
1028
r2.commit_write_group()
1029
# tell r1 to reload from disk
1030
r1._pack_collection.reset()
1031
# Now both repositories should know about both names
1032
r1._pack_collection.ensure_loaded()
1033
r2._pack_collection.ensure_loaded()
1034
self.assertEqual(r1._pack_collection.names(), r2._pack_collection.names())
1035
self.assertEqual(2, len(r1._pack_collection.names()))
1041
def test_concurrent_writer_second_preserves_dropping_a_pack(self):
1042
format = self.get_format()
1043
self.make_repository('.', shared=True, format=format)
1044
r1 = repository.Repository.open('.')
1045
r2 = repository.Repository.open('.')
1046
# add a pack to drop
1049
r1.start_write_group()
1051
self._add_text(r1, 'fileidr1')
1053
r1.abort_write_group()
1056
r1.commit_write_group()
1057
r1._pack_collection.ensure_loaded()
1058
name_to_drop = r1._pack_collection.all_packs()[0].name
1063
# access enough data to load the names list
1064
list(r1.all_revision_ids())
1067
# access enough data to load the names list
1068
list(r2.all_revision_ids())
1069
r1._pack_collection.ensure_loaded()
1071
r2.start_write_group()
1073
# in r1, drop the pack
1074
r1._pack_collection._remove_pack_from_memory(
1075
r1._pack_collection.get_pack_by_name(name_to_drop))
1077
self._add_text(r2, 'fileidr2')
1079
r2.abort_write_group()
1082
r1._pack_collection.reset()
1084
# r1 has a changed names list, and r2 an open write groups with
1086
# save r1, and then commit the r2 write group, which requires a
1087
# merge to the pack-names, which should not reinstate
1090
r1._pack_collection._save_pack_names()
1091
r1._pack_collection.reset()
1093
r2.abort_write_group()
1096
r2.commit_write_group()
1098
r2.abort_write_group()
1100
# Now both repositories should now about just one name.
1101
r1._pack_collection.ensure_loaded()
1102
r2._pack_collection.ensure_loaded()
1103
self.assertEqual(r1._pack_collection.names(), r2._pack_collection.names())
1104
self.assertEqual(1, len(r1._pack_collection.names()))
1105
self.assertFalse(name_to_drop in r1._pack_collection.names())
1111
def test_lock_write_does_not_physically_lock(self):
1112
repo = self.make_repository('.', format=self.get_format())
1114
self.addCleanup(repo.unlock)
1115
self.assertFalse(repo.get_physical_lock_status())
1117
def prepare_for_break_lock(self):
1118
# Setup the global ui factory state so that a break-lock method call
1119
# will find usable input in the input stream.
1120
old_factory = bzrlib.ui.ui_factory
1121
def restoreFactory():
1122
bzrlib.ui.ui_factory = old_factory
1123
self.addCleanup(restoreFactory)
1124
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1125
bzrlib.ui.ui_factory.stdin = StringIO("y\n")
1127
def test_break_lock_breaks_physical_lock(self):
1128
repo = self.make_repository('.', format=self.get_format())
1129
repo._pack_collection.lock_names()
1130
repo2 = repository.Repository.open('.')
1131
self.assertTrue(repo.get_physical_lock_status())
1132
self.prepare_for_break_lock()
1134
self.assertFalse(repo.get_physical_lock_status())
1136
def test_broken_physical_locks_error_on__unlock_names_lock(self):
1137
repo = self.make_repository('.', format=self.get_format())
1138
repo._pack_collection.lock_names()
1139
self.assertTrue(repo.get_physical_lock_status())
1140
repo2 = repository.Repository.open('.')
1141
self.prepare_for_break_lock()
1143
self.assertRaises(errors.LockBroken, repo._pack_collection._unlock_names)
1145
def test_fetch_without_find_ghosts_ignores_ghosts(self):
1146
# we want two repositories at this point:
1147
# one with a revision that is a ghost in the other
1149
# 'ghost' is present in has_ghost, 'ghost' is absent in 'missing_ghost'.
1150
# 'references' is present in both repositories, and 'tip' is present
1151
# just in has_ghost.
1152
# has_ghost missing_ghost
1153
#------------------------------
1155
# 'references' 'references'
1157
# In this test we fetch 'tip' which should not fetch 'ghost'
1158
has_ghost = self.make_repository('has_ghost', format=self.get_format())
1159
missing_ghost = self.make_repository('missing_ghost',
1160
format=self.get_format())
1162
def add_commit(repo, revision_id, parent_ids):
1164
repo.start_write_group()
1165
inv = inventory.Inventory(revision_id=revision_id)
1166
inv.root.revision = revision_id
1167
root_id = inv.root.file_id
1168
sha1 = repo.add_inventory(revision_id, inv, [])
1169
vf = repo.weave_store.get_weave_or_empty(root_id,
1170
repo.get_transaction())
1171
vf.add_lines(revision_id, [], [])
1172
rev = bzrlib.revision.Revision(timestamp=0,
1174
committer="Foo Bar <foo@example.com>",
1176
inventory_sha1=sha1,
1177
revision_id=revision_id)
1178
rev.parent_ids = parent_ids
1179
repo.add_revision(revision_id, rev)
1180
repo.commit_write_group()
1182
add_commit(has_ghost, 'ghost', [])
1183
add_commit(has_ghost, 'references', ['ghost'])
1184
add_commit(missing_ghost, 'references', ['ghost'])
1185
add_commit(has_ghost, 'tip', ['references'])
1186
missing_ghost.fetch(has_ghost, 'tip')
1187
# missing ghost now has tip and not ghost.
1188
rev = missing_ghost.get_revision('tip')
1189
inv = missing_ghost.get_inventory('tip')
1190
self.assertRaises(errors.NoSuchRevision,
1191
missing_ghost.get_revision, 'ghost')
1192
self.assertRaises(errors.RevisionNotPresent,
1193
missing_ghost.get_inventory, 'ghost')
1195
def test_supports_external_lookups(self):
1196
repo = self.make_repository('.', format=self.get_format())
1197
self.assertFalse(repo._format.supports_external_lookups)
1200
class TestKnitPackSubtrees(TestKnitPackNoSubtrees):
1202
def get_format(self):
1203
return bzrdir.format_registry.make_bzrdir(
1204
'pack-0.92-subtree')
1206
def check_format(self, t):
1207
self.assertEqualDiff(
1208
"Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n",
1209
t.get('format').read())
1212
class TestDevelopment0(TestKnitPackNoSubtrees):
1214
def get_format(self):
1215
return bzrdir.format_registry.make_bzrdir(
1218
def check_format(self, t):
1219
self.assertEqualDiff(
1220
"Bazaar development format 0 (needs bzr.dev from before 1.3)\n",
1221
t.get('format').read())
1224
class TestDevelopment0Subtree(TestKnitPackNoSubtrees):
1226
def get_format(self):
1227
return bzrdir.format_registry.make_bzrdir(
1228
'development-subtree')
1230
def check_format(self, t):
1231
self.assertEqualDiff(
1232
"Bazaar development format 0 with subtree support "
1233
"(needs bzr.dev from before 1.3)\n",
1234
t.get('format').read())
739
self.assertRaises(errors.RevisionNotPresent, empty_repo.fetch, broken_repo)
1237
742
class TestRepositoryPackCollection(TestCaseWithTransport):
added
removed
bzrlib/tests/test_repository.py
