157
143
def test_register_unregister_format(self):
158
# Test deprecated format registration functions
159
144
format = SampleRepositoryFormat()
160
145
# make a control dir
161
146
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
163
148
format.initialize(dir)
164
149
# register a format for it.
165
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
166
repository.RepositoryFormat.register_format, format)
150
repository.RepositoryFormat.register_format(format)
167
151
# which repository.Open will refuse (not supported)
168
self.assertRaises(UnsupportedFormatError, repository.Repository.open,
152
self.assertRaises(UnsupportedFormatError, repository.Repository.open, self.get_url())
170
153
# but open(unsupported) will work
171
154
self.assertEqual(format.open(dir), "opened repository.")
172
155
# unregister the format
173
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
174
repository.RepositoryFormat.unregister_format, format)
177
class TestRepositoryFormatRegistry(TestCase):
180
super(TestRepositoryFormatRegistry, self).setUp()
181
self.registry = repository.RepositoryFormatRegistry()
183
def test_register_unregister_format(self):
184
format = SampleRepositoryFormat()
185
self.registry.register(format)
186
self.assertEquals(format, self.registry.get("Sample .bzr repository format."))
187
self.registry.remove(format)
188
self.assertRaises(KeyError, self.registry.get, "Sample .bzr repository format.")
190
def test_get_all(self):
191
format = SampleRepositoryFormat()
192
self.assertEquals([], self.registry._get_all())
193
self.registry.register(format)
194
self.assertEquals([format], self.registry._get_all())
196
def test_register_extra(self):
197
format = SampleExtraRepositoryFormat()
198
self.assertEquals([], self.registry._get_all())
199
self.registry.register_extra(format)
200
self.assertEquals([format], self.registry._get_all())
202
def test_register_extra_lazy(self):
203
self.assertEquals([], self.registry._get_all())
204
self.registry.register_extra_lazy("bzrlib.tests.test_repository",
205
"SampleExtraRepositoryFormat")
206
formats = self.registry._get_all()
207
self.assertEquals(1, len(formats))
208
self.assertIsInstance(formats[0], SampleExtraRepositoryFormat)
156
repository.RepositoryFormat.unregister_format(format)
159
class TestFormat6(TestCaseWithTransport):
161
def test_no_ancestry_weave(self):
162
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
163
repo = weaverepo.RepositoryFormat6().initialize(control)
164
# We no longer need to create the ancestry.weave file
165
# since it is *never* used.
166
self.assertRaises(NoSuchFile,
167
control.transport.get,
170
def test_exposed_versioned_files_are_marked_dirty(self):
171
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
172
repo = weaverepo.RepositoryFormat6().initialize(control)
174
inv = repo.get_inventory_weave()
176
self.assertRaises(errors.OutSideTransaction,
177
inv.add_lines, 'foo', [], [])
179
def test_supports_external_lookups(self):
180
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
181
repo = weaverepo.RepositoryFormat6().initialize(control)
182
self.assertFalse(repo._format.supports_external_lookups)
185
class TestFormat7(TestCaseWithTransport):
187
def test_disk_layout(self):
188
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
189
repo = weaverepo.RepositoryFormat7().initialize(control)
190
# in case of side effects of locking.
194
# format 'Bazaar-NG Repository format 7'
196
# inventory.weave == empty_weave
197
# empty revision-store directory
198
# empty weaves directory
199
t = control.get_repository_transport(None)
200
self.assertEqualDiff('Bazaar-NG Repository format 7',
201
t.get('format').read())
202
self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
203
self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
204
self.assertEqualDiff('# bzr weave file v5\n'
207
t.get('inventory.weave').read())
209
def test_shared_disk_layout(self):
210
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
211
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
213
# format 'Bazaar-NG Repository format 7'
214
# inventory.weave == empty_weave
215
# empty revision-store directory
216
# empty weaves directory
217
# a 'shared-storage' marker file.
218
# lock is not present when unlocked
219
t = control.get_repository_transport(None)
220
self.assertEqualDiff('Bazaar-NG Repository format 7',
221
t.get('format').read())
222
self.assertEqualDiff('', t.get('shared-storage').read())
223
self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
224
self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
225
self.assertEqualDiff('# bzr weave file v5\n'
228
t.get('inventory.weave').read())
229
self.assertFalse(t.has('branch-lock'))
231
def test_creates_lockdir(self):
232
"""Make sure it appears to be controlled by a LockDir existence"""
233
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
234
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
235
t = control.get_repository_transport(None)
236
# TODO: Should check there is a 'lock' toplevel directory,
237
# regardless of contents
238
self.assertFalse(t.has('lock/held/info'))
241
self.assertTrue(t.has('lock/held/info'))
243
# unlock so we don't get a warning about failing to do so
246
def test_uses_lockdir(self):
247
"""repo format 7 actually locks on lockdir"""
248
base_url = self.get_url()
249
control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
250
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
251
t = control.get_repository_transport(None)
255
# make sure the same lock is created by opening it
256
repo = repository.Repository.open(base_url)
258
self.assertTrue(t.has('lock/held/info'))
260
self.assertFalse(t.has('lock/held/info'))
262
def test_shared_no_tree_disk_layout(self):
263
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
264
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
265
repo.set_make_working_trees(False)
267
# format 'Bazaar-NG Repository format 7'
269
# inventory.weave == empty_weave
270
# empty revision-store directory
271
# empty weaves directory
272
# a 'shared-storage' marker file.
273
t = control.get_repository_transport(None)
274
self.assertEqualDiff('Bazaar-NG Repository format 7',
275
t.get('format').read())
276
## self.assertEqualDiff('', t.get('lock').read())
277
self.assertEqualDiff('', t.get('shared-storage').read())
278
self.assertEqualDiff('', t.get('no-working-trees').read())
279
repo.set_make_working_trees(True)
280
self.assertFalse(t.has('no-working-trees'))
281
self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
282
self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
283
self.assertEqualDiff('# bzr weave file v5\n'
286
t.get('inventory.weave').read())
288
def test_exposed_versioned_files_are_marked_dirty(self):
289
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
290
repo = weaverepo.RepositoryFormat7().initialize(control)
292
inv = repo.get_inventory_weave()
294
self.assertRaises(errors.OutSideTransaction,
295
inv.add_lines, 'foo', [], [])
297
def test_supports_external_lookups(self):
298
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
299
repo = weaverepo.RepositoryFormat7().initialize(control)
300
self.assertFalse(repo._format.supports_external_lookups)
211
303
class TestFormatKnit1(TestCaseWithTransport):
213
def test_attribute__fetch_order(self):
214
"""Knits need topological data insertion."""
215
repo = self.make_repository('.',
216
format=bzrdir.format_registry.get('knit')())
217
self.assertEqual('topological', repo._format._fetch_order)
219
def test_attribute__fetch_uses_deltas(self):
220
"""Knits reuse deltas."""
221
repo = self.make_repository('.',
222
format=bzrdir.format_registry.get('knit')())
223
self.assertEqual(True, repo._format._fetch_uses_deltas)
225
305
def test_disk_layout(self):
226
306
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
227
307
repo = knitrepo.RepositoryFormatKnit1().initialize(control)
336
420
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)
339
486
class DummyRepository(object):
340
487
"""A dummy repository for testing."""
343
489
_serializer = None
345
491
def supports_rich_root(self):
346
if self._format is not None:
347
return self._format.rich_root_data
351
raise NotImplementedError
353
def get_parent_map(self, revision_ids):
354
raise NotImplementedError
357
495
class InterDummy(repository.InterRepository):
358
496
"""An inter-repository optimised code path for DummyRepository.
436
562
self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
439
class TestRepositoryFormat1(knitrepo.RepositoryFormatKnit1):
441
def get_format_string(self):
442
return "Test Format 1"
445
class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
447
def get_format_string(self):
448
return "Test Format 2"
565
class TestInterWeaveRepo(TestCaseWithTransport):
567
def test_is_compatible_and_registered(self):
568
# InterWeaveRepo is compatible when either side
569
# is a format 5/6/7 branch
570
from bzrlib.repofmt import knitrepo, weaverepo
571
formats = [weaverepo.RepositoryFormat5(),
572
weaverepo.RepositoryFormat6(),
573
weaverepo.RepositoryFormat7()]
574
incompatible_formats = [weaverepo.RepositoryFormat4(),
575
knitrepo.RepositoryFormatKnit1(),
577
repo_a = self.make_repository('a')
578
repo_b = self.make_repository('b')
579
is_compatible = repository.InterWeaveRepo.is_compatible
580
for source in incompatible_formats:
581
# force incompatible left then right
582
repo_a._format = source
583
repo_b._format = formats[0]
584
self.assertFalse(is_compatible(repo_a, repo_b))
585
self.assertFalse(is_compatible(repo_b, repo_a))
586
for source in formats:
587
repo_a._format = source
588
for target in formats:
589
repo_b._format = target
590
self.assertTrue(is_compatible(repo_a, repo_b))
591
self.assertEqual(repository.InterWeaveRepo,
592
repository.InterRepository.get(repo_a,
596
class TestInterRemoteToOther(TestCaseWithTransport):
598
def make_remote_repository(self, path, backing_format=None):
599
"""Make a RemoteRepository object backed by a real repository that will
600
be created at the given path."""
601
self.make_repository(path, format=backing_format)
602
smart_server = server.SmartTCPServer_for_testing()
604
remote_transport = get_transport(smart_server.get_url()).clone(path)
605
self.addCleanup(smart_server.tearDown)
606
remote_bzrdir = bzrdir.BzrDir.open_from_transport(remote_transport)
607
remote_repo = remote_bzrdir.open_repository()
610
def test_is_compatible_same_format(self):
611
"""InterRemoteToOther is compatible with a remote repository and a
612
second repository that have the same format."""
613
local_repo = self.make_repository('local')
614
remote_repo = self.make_remote_repository('remote')
615
is_compatible = repository.InterRemoteToOther.is_compatible
617
is_compatible(remote_repo, local_repo),
618
"InterRemoteToOther(%r, %r) is false" % (remote_repo, local_repo))
620
def test_is_incompatible_different_format(self):
621
local_repo = self.make_repository('local', 'dirstate')
622
remote_repo = self.make_remote_repository('a', 'dirstate-with-subtree')
623
is_compatible = repository.InterRemoteToOther.is_compatible
625
is_compatible(remote_repo, local_repo),
626
"InterRemoteToOther(%r, %r) is true" % (local_repo, remote_repo))
628
def test_is_incompatible_different_format_both_remote(self):
629
remote_repo_a = self.make_remote_repository(
630
'a', 'dirstate-with-subtree')
631
remote_repo_b = self.make_remote_repository('b', 'dirstate')
632
is_compatible = repository.InterRemoteToOther.is_compatible
634
is_compatible(remote_repo_a, remote_repo_b),
635
"InterRemoteToOther(%r, %r) is true"
636
% (remote_repo_a, remote_repo_b))
451
639
class TestRepositoryConverter(TestCaseWithTransport):
453
641
def test_convert_empty(self):
454
source_format = TestRepositoryFormat1()
455
target_format = TestRepositoryFormat2()
456
repository.format_registry.register(source_format)
457
self.addCleanup(repository.format_registry.remove,
459
repository.format_registry.register(target_format)
460
self.addCleanup(repository.format_registry.remove,
462
t = self.get_transport()
642
t = get_transport(self.get_url('.'))
463
643
t.mkdir('repository')
464
644
repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
465
repo = TestRepositoryFormat1().initialize(repo_dir)
645
repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
646
target_format = knitrepo.RepositoryFormatKnit1()
466
647
converter = repository.CopyConverter(target_format)
467
648
pb = bzrlib.ui.ui_factory.nested_progress_bar()
525
699
self.assertFalse(repo._format.supports_external_lookups)
528
class Test2a(tests.TestCaseWithMemoryTransport):
530
def test_chk_bytes_uses_custom_btree_parser(self):
531
mt = self.make_branch_and_memory_tree('test', format='2a')
533
self.addCleanup(mt.unlock)
534
mt.add([''], ['root-id'])
536
index = mt.branch.repository.chk_bytes._index._graph_index._indices[0]
537
self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
538
# It should also work if we re-open the repo
539
repo = mt.branch.repository.bzrdir.open_repository()
541
self.addCleanup(repo.unlock)
542
index = repo.chk_bytes._index._graph_index._indices[0]
543
self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
545
def test_fetch_combines_groups(self):
546
builder = self.make_branch_builder('source', format='2a')
547
builder.start_series()
548
builder.build_snapshot('1', None, [
549
('add', ('', 'root-id', 'directory', '')),
550
('add', ('file', 'file-id', 'file', 'content\n'))])
551
builder.build_snapshot('2', ['1'], [
552
('modify', ('file-id', 'content-2\n'))])
553
builder.finish_series()
554
source = builder.get_branch()
555
target = self.make_repository('target', format='2a')
556
target.fetch(source.repository)
558
self.addCleanup(target.unlock)
559
details = target.texts._index.get_build_details(
560
[('file-id', '1',), ('file-id', '2',)])
561
file_1_details = details[('file-id', '1')]
562
file_2_details = details[('file-id', '2')]
563
# The index, and what to read off disk, should be the same for both
564
# versions of the file.
565
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
567
def test_fetch_combines_groups(self):
568
builder = self.make_branch_builder('source', format='2a')
569
builder.start_series()
570
builder.build_snapshot('1', None, [
571
('add', ('', 'root-id', 'directory', '')),
572
('add', ('file', 'file-id', 'file', 'content\n'))])
573
builder.build_snapshot('2', ['1'], [
574
('modify', ('file-id', 'content-2\n'))])
575
builder.finish_series()
576
source = builder.get_branch()
577
target = self.make_repository('target', format='2a')
578
target.fetch(source.repository)
580
self.addCleanup(target.unlock)
581
details = target.texts._index.get_build_details(
582
[('file-id', '1',), ('file-id', '2',)])
583
file_1_details = details[('file-id', '1')]
584
file_2_details = details[('file-id', '2')]
585
# The index, and what to read off disk, should be the same for both
586
# versions of the file.
587
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
589
def test_fetch_combines_groups(self):
590
builder = self.make_branch_builder('source', format='2a')
591
builder.start_series()
592
builder.build_snapshot('1', None, [
593
('add', ('', 'root-id', 'directory', '')),
594
('add', ('file', 'file-id', 'file', 'content\n'))])
595
builder.build_snapshot('2', ['1'], [
596
('modify', ('file-id', 'content-2\n'))])
597
builder.finish_series()
598
source = builder.get_branch()
599
target = self.make_repository('target', format='2a')
600
target.fetch(source.repository)
602
self.addCleanup(target.unlock)
603
details = target.texts._index.get_build_details(
604
[('file-id', '1',), ('file-id', '2',)])
605
file_1_details = details[('file-id', '1')]
606
file_2_details = details[('file-id', '2')]
607
# The index, and what to read off disk, should be the same for both
608
# versions of the file.
609
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
611
def test_format_pack_compresses_True(self):
612
repo = self.make_repository('repo', format='2a')
613
self.assertTrue(repo._format.pack_compresses)
615
def test_inventories_use_chk_map_with_parent_base_dict(self):
616
tree = self.make_branch_and_memory_tree('repo', format="2a")
618
tree.add([''], ['TREE_ROOT'])
619
revid = tree.commit("foo")
622
self.addCleanup(tree.unlock)
623
inv = tree.branch.repository.get_inventory(revid)
624
self.assertNotEqual(None, inv.parent_id_basename_to_file_id)
625
inv.parent_id_basename_to_file_id._ensure_root()
626
inv.id_to_entry._ensure_root()
627
self.assertEqual(65536, inv.id_to_entry._root_node.maximum_size)
628
self.assertEqual(65536,
629
inv.parent_id_basename_to_file_id._root_node.maximum_size)
631
def test_autopack_unchanged_chk_nodes(self):
632
# at 20 unchanged commits, chk pages are packed that are split into
633
# two groups such that the new pack being made doesn't have all its
634
# pages in the source packs (though they are in the repository).
635
# Use a memory backed repository, we don't need to hit disk for this
636
tree = self.make_branch_and_memory_tree('tree', format='2a')
638
self.addCleanup(tree.unlock)
639
tree.add([''], ['TREE_ROOT'])
640
for pos in range(20):
641
tree.commit(str(pos))
643
def test_pack_with_hint(self):
644
tree = self.make_branch_and_memory_tree('tree', format='2a')
646
self.addCleanup(tree.unlock)
647
tree.add([''], ['TREE_ROOT'])
648
# 1 commit to leave untouched
650
to_keep = tree.branch.repository._pack_collection.names()
654
all = tree.branch.repository._pack_collection.names()
655
combine = list(set(all) - set(to_keep))
656
self.assertLength(3, all)
657
self.assertLength(2, combine)
658
tree.branch.repository.pack(hint=combine)
659
final = tree.branch.repository._pack_collection.names()
660
self.assertLength(2, final)
661
self.assertFalse(combine[0] in final)
662
self.assertFalse(combine[1] in final)
663
self.assertSubset(to_keep, final)
665
def test_stream_source_to_gc(self):
666
source = self.make_repository('source', format='2a')
667
target = self.make_repository('target', format='2a')
668
stream = source._get_source(target._format)
669
self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
671
def test_stream_source_to_non_gc(self):
672
source = self.make_repository('source', format='2a')
673
target = self.make_repository('target', format='rich-root-pack')
674
stream = source._get_source(target._format)
675
# We don't want the child GroupCHKStreamSource
676
self.assertIs(type(stream), vf_repository.StreamSource)
678
def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
679
source_builder = self.make_branch_builder('source',
681
# We have to build a fairly large tree, so that we are sure the chk
682
# pages will have split into multiple pages.
683
entries = [('add', ('', 'a-root-id', 'directory', None))]
684
for i in 'abcdefghijklmnopqrstuvwxyz123456789':
685
for j in 'abcdefghijklmnopqrstuvwxyz123456789':
688
content = 'content for %s\n' % (fname,)
689
entries.append(('add', (fname, fid, 'file', content)))
690
source_builder.start_series()
691
source_builder.build_snapshot('rev-1', None, entries)
692
# Now change a few of them, so we get a few new pages for the second
694
source_builder.build_snapshot('rev-2', ['rev-1'], [
695
('modify', ('aa-id', 'new content for aa-id\n')),
696
('modify', ('cc-id', 'new content for cc-id\n')),
697
('modify', ('zz-id', 'new content for zz-id\n')),
699
source_builder.finish_series()
700
source_branch = source_builder.get_branch()
701
source_branch.lock_read()
702
self.addCleanup(source_branch.unlock)
703
target = self.make_repository('target', format='2a')
704
source = source_branch.repository._get_source(target._format)
705
self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
707
# On a regular pass, getting the inventories and chk pages for rev-2
708
# would only get the newly created chk pages
709
search = graph.SearchResult(set(['rev-2']), set(['rev-1']), 1,
711
simple_chk_records = []
712
for vf_name, substream in source.get_stream(search):
713
if vf_name == 'chk_bytes':
714
for record in substream:
715
simple_chk_records.append(record.key)
719
# 3 pages, the root (InternalNode), + 2 pages which actually changed
720
self.assertEqual([('sha1:91481f539e802c76542ea5e4c83ad416bf219f73',),
721
('sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
722
('sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
723
('sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)],
725
# Now, when we do a similar call using 'get_stream_for_missing_keys'
726
# we should get a much larger set of pages.
727
missing = [('inventories', 'rev-2')]
728
full_chk_records = []
729
for vf_name, substream in source.get_stream_for_missing_keys(missing):
730
if vf_name == 'inventories':
731
for record in substream:
732
self.assertEqual(('rev-2',), record.key)
733
elif vf_name == 'chk_bytes':
734
for record in substream:
735
full_chk_records.append(record.key)
737
self.fail('Should not be getting a stream of %s' % (vf_name,))
738
# We have 257 records now. This is because we have 1 root page, and 256
739
# leaf pages in a complete listing.
740
self.assertEqual(257, len(full_chk_records))
741
self.assertSubset(simple_chk_records, full_chk_records)
743
def test_inconsistency_fatal(self):
744
repo = self.make_repository('repo', format='2a')
745
self.assertTrue(repo.revisions._index._inconsistency_fatal)
746
self.assertFalse(repo.texts._index._inconsistency_fatal)
747
self.assertFalse(repo.inventories._index._inconsistency_fatal)
748
self.assertFalse(repo.signatures._index._inconsistency_fatal)
749
self.assertFalse(repo.chk_bytes._index._inconsistency_fatal)
752
class TestKnitPackStreamSource(tests.TestCaseWithMemoryTransport):
754
def test_source_to_exact_pack_092(self):
755
source = self.make_repository('source', format='pack-0.92')
756
target = self.make_repository('target', format='pack-0.92')
757
stream_source = source._get_source(target._format)
758
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
760
def test_source_to_exact_pack_rich_root_pack(self):
761
source = self.make_repository('source', format='rich-root-pack')
762
target = self.make_repository('target', format='rich-root-pack')
763
stream_source = source._get_source(target._format)
764
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
766
def test_source_to_exact_pack_19(self):
767
source = self.make_repository('source', format='1.9')
768
target = self.make_repository('target', format='1.9')
769
stream_source = source._get_source(target._format)
770
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
772
def test_source_to_exact_pack_19_rich_root(self):
773
source = self.make_repository('source', format='1.9-rich-root')
774
target = self.make_repository('target', format='1.9-rich-root')
775
stream_source = source._get_source(target._format)
776
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
778
def test_source_to_remote_exact_pack_19(self):
779
trans = self.make_smart_server('target')
781
source = self.make_repository('source', format='1.9')
782
target = self.make_repository('target', format='1.9')
783
target = repository.Repository.open(trans.base)
784
stream_source = source._get_source(target._format)
785
self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
787
def test_stream_source_to_non_exact(self):
788
source = self.make_repository('source', format='pack-0.92')
789
target = self.make_repository('target', format='1.9')
790
stream = source._get_source(target._format)
791
self.assertIs(type(stream), vf_repository.StreamSource)
793
def test_stream_source_to_non_exact_rich_root(self):
794
source = self.make_repository('source', format='1.9')
795
target = self.make_repository('target', format='1.9-rich-root')
796
stream = source._get_source(target._format)
797
self.assertIs(type(stream), vf_repository.StreamSource)
799
def test_source_to_remote_non_exact_pack_19(self):
800
trans = self.make_smart_server('target')
802
source = self.make_repository('source', format='1.9')
803
target = self.make_repository('target', format='1.6')
804
target = repository.Repository.open(trans.base)
805
stream_source = source._get_source(target._format)
806
self.assertIs(type(stream_source), vf_repository.StreamSource)
808
def test_stream_source_to_knit(self):
809
source = self.make_repository('source', format='pack-0.92')
810
target = self.make_repository('target', format='dirstate')
811
stream = source._get_source(target._format)
812
self.assertIs(type(stream), vf_repository.StreamSource)
815
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
816
"""Tests for _find_parent_ids_of_revisions."""
819
super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
820
self.builder = self.make_branch_builder('source')
821
self.builder.start_series()
822
self.builder.build_snapshot('initial', None,
823
[('add', ('', 'tree-root', 'directory', None))])
824
self.repo = self.builder.get_branch().repository
825
self.addCleanup(self.builder.finish_series)
827
def assertParentIds(self, expected_result, rev_set):
828
self.assertEqual(sorted(expected_result),
829
sorted(self.repo._find_parent_ids_of_revisions(rev_set)))
831
def test_simple(self):
832
self.builder.build_snapshot('revid1', None, [])
833
self.builder.build_snapshot('revid2', ['revid1'], [])
835
self.assertParentIds(['revid1'], rev_set)
837
def test_not_first_parent(self):
838
self.builder.build_snapshot('revid1', None, [])
839
self.builder.build_snapshot('revid2', ['revid1'], [])
840
self.builder.build_snapshot('revid3', ['revid2'], [])
841
rev_set = ['revid3', 'revid2']
842
self.assertParentIds(['revid1'], rev_set)
844
def test_not_null(self):
845
rev_set = ['initial']
846
self.assertParentIds([], rev_set)
848
def test_not_null_set(self):
849
self.builder.build_snapshot('revid1', None, [])
850
rev_set = [_mod_revision.NULL_REVISION]
851
self.assertParentIds([], rev_set)
853
def test_ghost(self):
854
self.builder.build_snapshot('revid1', None, [])
855
rev_set = ['ghost', 'revid1']
856
self.assertParentIds(['initial'], rev_set)
858
def test_ghost_parent(self):
859
self.builder.build_snapshot('revid1', None, [])
860
self.builder.build_snapshot('revid2', ['revid1', 'ghost'], [])
861
rev_set = ['revid2', 'revid1']
862
self.assertParentIds(['ghost', 'initial'], rev_set)
864
def test_righthand_parent(self):
865
self.builder.build_snapshot('revid1', None, [])
866
self.builder.build_snapshot('revid2a', ['revid1'], [])
867
self.builder.build_snapshot('revid2b', ['revid1'], [])
868
self.builder.build_snapshot('revid3', ['revid2a', 'revid2b'], [])
869
rev_set = ['revid3', 'revid2a']
870
self.assertParentIds(['revid1', 'revid2b'], rev_set)
873
702
class TestWithBrokenRepo(TestCaseWithTransport):
874
703
"""These tests seem to be more appropriate as interface tests?"""
953
780
broken_repo = self.make_broken_repository()
954
781
empty_repo = self.make_repository('empty-repo')
956
empty_repo.fetch(broken_repo)
957
except (errors.RevisionNotPresent, errors.BzrCheckError):
958
# Test successful: compression parent not being copied leads to
961
empty_repo.lock_read()
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()
962
786
self.addCleanup(empty_repo.unlock)
963
text = empty_repo.texts.get_record_stream(
964
[('file2-id', 'rev3')], 'topological', True).next()
965
self.assertEqual('line\n', text.get_bytes_as('fulltext'))
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())
968
1237
class TestRepositoryPackCollection(TestCaseWithTransport):
1198
1392
tree.lock_read()
1199
1393
self.addCleanup(tree.unlock)
1200
1394
packs = tree.branch.repository._pack_collection
1202
1395
packs.ensure_loaded()
1203
1396
name = packs.names()[0]
1204
1397
pack_1 = packs.get_pack_by_name(name)
1205
1398
# the pack should be correctly initialised
1206
sizes = packs._names[name]
1207
rev_index = GraphIndex(packs._index_transport, name + '.rix', sizes[0])
1208
inv_index = GraphIndex(packs._index_transport, name + '.iix', sizes[1])
1209
txt_index = GraphIndex(packs._index_transport, name + '.tix', sizes[2])
1210
sig_index = GraphIndex(packs._index_transport, name + '.six', sizes[3])
1399
rev_index = GraphIndex(packs._index_transport, name + '.rix',
1400
packs._names[name][0])
1401
inv_index = GraphIndex(packs._index_transport, name + '.iix',
1402
packs._names[name][1])
1403
txt_index = GraphIndex(packs._index_transport, name + '.tix',
1404
packs._names[name][2])
1405
sig_index = GraphIndex(packs._index_transport, name + '.six',
1406
packs._names[name][3])
1211
1407
self.assertEqual(pack_repo.ExistingPack(packs._pack_transport,
1212
1408
name, rev_index, inv_index, txt_index, sig_index), pack_1)
1213
1409
# and the same instance should be returned on successive calls.
1214
1410
self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1216
def test_reload_pack_names_new_entry(self):
1217
tree, r, packs, revs = self.make_packs_and_alt_repo()
1218
names = packs.names()
1219
# Add a new pack file into the repository
1220
rev4 = tree.commit('four')
1221
new_names = tree.branch.repository._pack_collection.names()
1222
new_name = set(new_names).difference(names)
1223
self.assertEqual(1, len(new_name))
1224
new_name = new_name.pop()
1225
# The old collection hasn't noticed yet
1226
self.assertEqual(names, packs.names())
1227
self.assertTrue(packs.reload_pack_names())
1228
self.assertEqual(new_names, packs.names())
1229
# And the repository can access the new revision
1230
self.assertEqual({rev4:(revs[-1],)}, r.get_parent_map([rev4]))
1231
self.assertFalse(packs.reload_pack_names())
1233
def test_reload_pack_names_added_and_removed(self):
1234
tree, r, packs, revs = self.make_packs_and_alt_repo()
1235
names = packs.names()
1236
# Now repack the whole thing
1237
tree.branch.repository.pack()
1238
new_names = tree.branch.repository._pack_collection.names()
1239
# The other collection hasn't noticed yet
1240
self.assertEqual(names, packs.names())
1241
self.assertTrue(packs.reload_pack_names())
1242
self.assertEqual(new_names, packs.names())
1243
self.assertEqual({revs[-1]:(revs[-2],)}, r.get_parent_map([revs[-1]]))
1244
self.assertFalse(packs.reload_pack_names())
1246
def test_reload_pack_names_preserves_pending(self):
1247
# TODO: Update this to also test for pending-deleted names
1248
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1249
# We will add one pack (via start_write_group + insert_record_stream),
1250
# and remove another pack (via _remove_pack_from_memory)
1251
orig_names = packs.names()
1252
orig_at_load = packs._packs_at_load
1253
to_remove_name = iter(orig_names).next()
1254
r.start_write_group()
1255
self.addCleanup(r.abort_write_group)
1256
r.texts.insert_record_stream([versionedfile.FulltextContentFactory(
1257
('text', 'rev'), (), None, 'content\n')])
1258
new_pack = packs._new_pack
1259
self.assertTrue(new_pack.data_inserted())
1261
packs.allocate(new_pack)
1262
packs._new_pack = None
1263
removed_pack = packs.get_pack_by_name(to_remove_name)
1264
packs._remove_pack_from_memory(removed_pack)
1265
names = packs.names()
1266
all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
1267
new_names = set([x[0][0] for x in new_nodes])
1268
self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1269
self.assertEqual(set(names) - set(orig_names), new_names)
1270
self.assertEqual(set([new_pack.name]), new_names)
1271
self.assertEqual([to_remove_name],
1272
sorted([x[0][0] for x in deleted_nodes]))
1273
packs.reload_pack_names()
1274
reloaded_names = packs.names()
1275
self.assertEqual(orig_at_load, packs._packs_at_load)
1276
self.assertEqual(names, reloaded_names)
1277
all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
1278
new_names = set([x[0][0] for x in new_nodes])
1279
self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1280
self.assertEqual(set(names) - set(orig_names), new_names)
1281
self.assertEqual(set([new_pack.name]), new_names)
1282
self.assertEqual([to_remove_name],
1283
sorted([x[0][0] for x in deleted_nodes]))
1285
def test_autopack_obsoletes_new_pack(self):
1286
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1287
packs._max_pack_count = lambda x: 1
1288
packs.pack_distribution = lambda x: [10]
1289
r.start_write_group()
1290
r.revisions.insert_record_stream([versionedfile.FulltextContentFactory(
1291
('bogus-rev',), (), None, 'bogus-content\n')])
1292
# This should trigger an autopack, which will combine everything into a
1294
new_names = r.commit_write_group()
1295
names = packs.names()
1296
self.assertEqual(1, len(names))
1297
self.assertEqual([names[0] + '.pack'],
1298
packs._pack_transport.list_dir('.'))
1300
def test_autopack_reloads_and_stops(self):
1301
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1302
# After we have determined what needs to be autopacked, trigger a
1303
# full-pack via the other repo which will cause us to re-evaluate and
1304
# decide we don't need to do anything
1305
orig_execute = packs._execute_pack_operations
1306
def _munged_execute_pack_ops(*args, **kwargs):
1307
tree.branch.repository.pack()
1308
return orig_execute(*args, **kwargs)
1309
packs._execute_pack_operations = _munged_execute_pack_ops
1310
packs._max_pack_count = lambda x: 1
1311
packs.pack_distribution = lambda x: [10]
1312
self.assertFalse(packs.autopack())
1313
self.assertEqual(1, len(packs.names()))
1314
self.assertEqual(tree.branch.repository._pack_collection.names(),
1317
def test__save_pack_names(self):
1318
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1319
names = packs.names()
1320
pack = packs.get_pack_by_name(names[0])
1321
packs._remove_pack_from_memory(pack)
1322
packs._save_pack_names(obsolete_packs=[pack])
1323
cur_packs = packs._pack_transport.list_dir('.')
1324
self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1325
# obsolete_packs will also have stuff like .rix and .iix present.
1326
obsolete_packs = packs.transport.list_dir('obsolete_packs')
1327
obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1328
self.assertEqual([pack.name], sorted(obsolete_names))
1330
def test__save_pack_names_already_obsoleted(self):
1331
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1332
names = packs.names()
1333
pack = packs.get_pack_by_name(names[0])
1334
packs._remove_pack_from_memory(pack)
1335
# We are going to simulate a concurrent autopack by manually obsoleting
1336
# the pack directly.
1337
packs._obsolete_packs([pack])
1338
packs._save_pack_names(clear_obsolete_packs=True,
1339
obsolete_packs=[pack])
1340
cur_packs = packs._pack_transport.list_dir('.')
1341
self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1342
# Note that while we set clear_obsolete_packs=True, it should not
1343
# delete a pack file that we have also scheduled for obsoletion.
1344
obsolete_packs = packs.transport.list_dir('obsolete_packs')
1345
obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1346
self.assertEqual([pack.name], sorted(obsolete_names))
1350
1413
class TestPack(TestCaseWithTransport):
1351
1414
"""Tests for the Pack object."""
1431
1485
class TestPacker(TestCaseWithTransport):
1432
1486
"""Tests for the packs repository Packer class."""
1434
def test_pack_optimizes_pack_order(self):
1435
builder = self.make_branch_builder('.', format="1.9")
1436
builder.start_series()
1437
builder.build_snapshot('A', None, [
1438
('add', ('', 'root-id', 'directory', None)),
1439
('add', ('f', 'f-id', 'file', 'content\n'))])
1440
builder.build_snapshot('B', ['A'],
1441
[('modify', ('f-id', 'new-content\n'))])
1442
builder.build_snapshot('C', ['B'],
1443
[('modify', ('f-id', 'third-content\n'))])
1444
builder.build_snapshot('D', ['C'],
1445
[('modify', ('f-id', 'fourth-content\n'))])
1446
b = builder.get_branch()
1448
builder.finish_series()
1449
self.addCleanup(b.unlock)
1450
# At this point, we should have 4 pack files available
1451
# Because of how they were built, they correspond to
1452
# ['D', 'C', 'B', 'A']
1453
packs = b.repository._pack_collection.packs
1454
packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
1456
revision_ids=['B', 'C'])
1457
# Now, when we are copying the B & C revisions, their pack files should
1458
# be moved to the front of the stack
1459
# The new ordering moves B & C to the front of the .packs attribute,
1460
# and leaves the others in the original order.
1461
new_packs = [packs[1], packs[2], packs[0], packs[3]]
1462
new_pack = packer.pack()
1463
self.assertEqual(new_packs, packer.packs)
1466
class TestOptimisingPacker(TestCaseWithTransport):
1467
"""Tests for the OptimisingPacker class."""
1469
def get_pack_collection(self):
1470
repo = self.make_repository('.')
1471
return repo._pack_collection
1473
def test_open_pack_will_optimise(self):
1474
packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
1476
new_pack = packer.open_pack()
1477
self.addCleanup(new_pack.abort) # ensure cleanup
1478
self.assertIsInstance(new_pack, pack_repo.NewPack)
1479
self.assertTrue(new_pack.revision_index._optimize_for_size)
1480
self.assertTrue(new_pack.inventory_index._optimize_for_size)
1481
self.assertTrue(new_pack.text_index._optimize_for_size)
1482
self.assertTrue(new_pack.signature_index._optimize_for_size)
1485
class TestGCCHKPacker(TestCaseWithTransport):
1487
def make_abc_branch(self):
1488
builder = self.make_branch_builder('source')
1489
builder.start_series()
1490
builder.build_snapshot('A', None, [
1491
('add', ('', 'root-id', 'directory', None)),
1492
('add', ('file', 'file-id', 'file', 'content\n')),
1494
builder.build_snapshot('B', ['A'], [
1495
('add', ('dir', 'dir-id', 'directory', None))])
1496
builder.build_snapshot('C', ['B'], [
1497
('modify', ('file-id', 'new content\n'))])
1498
builder.finish_series()
1499
return builder.get_branch()
1501
def make_branch_with_disjoint_inventory_and_revision(self):
1502
"""a repo with separate packs for a revisions Revision and Inventory.
1504
There will be one pack file that holds the Revision content, and one
1505
for the Inventory content.
1507
:return: (repository,
1508
pack_name_with_rev_A_Revision,
1509
pack_name_with_rev_A_Inventory,
1510
pack_name_with_rev_C_content)
1512
b_source = self.make_abc_branch()
1513
b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
1514
b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
1515
b_stacked.lock_write()
1516
self.addCleanup(b_stacked.unlock)
1517
b_stacked.fetch(b_source, 'B')
1518
# Now re-open the stacked repo directly (no fallbacks) so that we can
1519
# fill in the A rev.
1520
repo_not_stacked = b_stacked.bzrdir.open_repository()
1521
repo_not_stacked.lock_write()
1522
self.addCleanup(repo_not_stacked.unlock)
1523
# Now we should have a pack file with A's inventory, but not its
1525
self.assertEqual([('A',), ('B',)],
1526
sorted(repo_not_stacked.inventories.keys()))
1527
self.assertEqual([('B',)],
1528
sorted(repo_not_stacked.revisions.keys()))
1529
stacked_pack_names = repo_not_stacked._pack_collection.names()
1530
# We have a couple names here, figure out which has A's inventory
1531
for name in stacked_pack_names:
1532
pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
1533
keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
1535
inv_a_pack_name = name
1538
self.fail('Could not find pack containing A\'s inventory')
1539
repo_not_stacked.fetch(b_source.repository, 'A')
1540
self.assertEqual([('A',), ('B',)],
1541
sorted(repo_not_stacked.revisions.keys()))
1542
new_pack_names = set(repo_not_stacked._pack_collection.names())
1543
rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
1544
self.assertEqual(1, len(rev_a_pack_names))
1545
rev_a_pack_name = list(rev_a_pack_names)[0]
1546
# Now fetch 'C', so we have a couple pack files to join
1547
repo_not_stacked.fetch(b_source.repository, 'C')
1548
rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
1549
rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
1550
self.assertEqual(1, len(rev_c_pack_names))
1551
rev_c_pack_name = list(rev_c_pack_names)[0]
1552
return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
1555
def test_pack_with_distant_inventories(self):
1556
# See https://bugs.launchpad.net/bzr/+bug/437003
1557
# When repacking, it is possible to have an inventory in a different
1558
# pack file than the associated revision. An autopack can then come
1559
# along, and miss that inventory, and complain.
1560
(repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
1561
) = self.make_branch_with_disjoint_inventory_and_revision()
1562
a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
1563
c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
1564
packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
1565
[a_pack, c_pack], '.test-pack')
1566
# This would raise ValueError in bug #437003, but should not raise an
1570
def test_pack_with_missing_inventory(self):
1571
# Similar to test_pack_with_missing_inventory, but this time, we force
1572
# the A inventory to actually be gone from the repository.
1573
(repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
1574
) = self.make_branch_with_disjoint_inventory_and_revision()
1575
inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
1576
repo._pack_collection._remove_pack_from_memory(inv_a_pack)
1577
packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
1578
repo._pack_collection.all_packs(), '.test-pack')
1579
e = self.assertRaises(ValueError, packer.pack)
1580
packer.new_pack.abort()
1581
self.assertContainsRe(str(e),
1582
r"We are missing inventories for revisions: .*'A'")
1585
class TestCrossFormatPacks(TestCaseWithTransport):
1587
def log_pack(self, hint=None):
1588
self.calls.append(('pack', hint))
1589
self.orig_pack(hint=hint)
1590
if self.expect_hint:
1591
self.assertTrue(hint)
1593
def run_stream(self, src_fmt, target_fmt, expect_pack_called):
1594
self.expect_hint = expect_pack_called
1596
source_tree = self.make_branch_and_tree('src', format=src_fmt)
1597
source_tree.lock_write()
1598
self.addCleanup(source_tree.unlock)
1599
tip = source_tree.commit('foo')
1600
target = self.make_repository('target', format=target_fmt)
1602
self.addCleanup(target.unlock)
1603
source = source_tree.branch.repository._get_source(target._format)
1604
self.orig_pack = target.pack
1605
self.overrideAttr(target, "pack", self.log_pack)
1606
search = target.search_missing_revision_ids(
1607
source_tree.branch.repository, revision_ids=[tip])
1608
stream = source.get_stream(search)
1609
from_format = source_tree.branch.repository._format
1610
sink = target._get_sink()
1611
sink.insert_stream(stream, from_format, [])
1612
if expect_pack_called:
1613
self.assertLength(1, self.calls)
1615
self.assertLength(0, self.calls)
1617
def run_fetch(self, src_fmt, target_fmt, expect_pack_called):
1618
self.expect_hint = expect_pack_called
1620
source_tree = self.make_branch_and_tree('src', format=src_fmt)
1621
source_tree.lock_write()
1622
self.addCleanup(source_tree.unlock)
1623
tip = source_tree.commit('foo')
1624
target = self.make_repository('target', format=target_fmt)
1626
self.addCleanup(target.unlock)
1627
source = source_tree.branch.repository
1628
self.orig_pack = target.pack
1629
self.overrideAttr(target, "pack", self.log_pack)
1630
target.fetch(source)
1631
if expect_pack_called:
1632
self.assertLength(1, self.calls)
1634
self.assertLength(0, self.calls)
1636
def test_sink_format_hint_no(self):
1637
# When the target format says packing makes no difference, pack is not
1639
self.run_stream('1.9', 'rich-root-pack', False)
1641
def test_sink_format_hint_yes(self):
1642
# When the target format says packing makes a difference, pack is
1644
self.run_stream('1.9', '2a', True)
1646
def test_sink_format_same_no(self):
1647
# When the formats are the same, pack is not called.
1648
self.run_stream('2a', '2a', False)
1650
def test_IDS_format_hint_no(self):
1651
# When the target format says packing makes no difference, pack is not
1653
self.run_fetch('1.9', 'rich-root-pack', False)
1655
def test_IDS_format_hint_yes(self):
1656
# When the target format says packing makes a difference, pack is
1658
self.run_fetch('1.9', '2a', True)
1660
def test_IDS_format_same_no(self):
1661
# When the formats are the same, pack is not called.
1662
self.run_fetch('2a', '2a', False)
1665
class Test_LazyListJoin(tests.TestCase):
1667
def test__repr__(self):
1668
lazy = repository._LazyListJoin(['a'], ['b'])
1669
self.assertEqual("bzrlib.repository._LazyListJoin((['a'], ['b']))",
1488
# To date, this class has been factored out and nothing new added to it;
1489
# thus there are not yet any tests.
1492
class TestInterDifferingSerializer(TestCaseWithTransport):
1494
def test_progress_bar(self):
1495
tree = self.make_branch_and_tree('tree')
1496
tree.commit('rev1', rev_id='rev-1')
1497
tree.commit('rev2', rev_id='rev-2')
1498
tree.commit('rev3', rev_id='rev-3')
1499
repo = self.make_repository('repo')
1500
inter_repo = repository.InterDifferingSerializer(
1501
tree.branch.repository, repo)
1502
pb = progress.InstrumentedProgress(to_file=StringIO())
1503
pb.never_throttle = True
1504
inter_repo.fetch('rev-1', pb)
1505
self.assertEqual('Transferring revisions', pb.last_msg)
1506
self.assertEqual(1, pb.last_cnt)
1507
self.assertEqual(1, pb.last_total)
1508
inter_repo.fetch('rev-3', pb)
1509
self.assertEqual(2, pb.last_cnt)
1510
self.assertEqual(2, pb.last_total)
added
removed
bzrlib/tests/test_repository.py
