1
# Copyright (C) 2006-2010 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""Tests for the Repository facility that are not interface tests.
19
For interface tests see tests/per_repository/*.py.
21
For concrete class tests see this file, and for storage formats tests
25
from stat import S_ISDIR
26
from StringIO import StringIO
30
from bzrlib.errors import (NotBranchError,
33
UnsupportedFormatError,
39
from bzrlib.branchbuilder import BranchBuilder
40
from bzrlib.btree_index import BTreeBuilder, BTreeGraphIndex
41
from bzrlib.index import GraphIndex, InMemoryGraphIndex
42
from bzrlib.repository import RepositoryFormat
43
from bzrlib.smart import server
44
from bzrlib.tests import (
46
TestCaseWithTransport,
50
from bzrlib.transport import (
54
from bzrlib.transport.memory import MemoryServer
63
revision as _mod_revision,
69
from bzrlib.repofmt import (
77
class TestDefaultFormat(TestCase):
79
def test_get_set_default_format(self):
80
old_default = bzrdir.format_registry.get('default')
81
private_default = old_default().repository_format.__class__
82
old_format = repository.RepositoryFormat.get_default_format()
83
self.assertTrue(isinstance(old_format, private_default))
84
def make_sample_bzrdir():
85
my_bzrdir = bzrdir.BzrDirMetaFormat1()
86
my_bzrdir.repository_format = SampleRepositoryFormat()
88
bzrdir.format_registry.remove('default')
89
bzrdir.format_registry.register('sample', make_sample_bzrdir, '')
90
bzrdir.format_registry.set_default('sample')
91
# creating a repository should now create an instrumented dir.
93
# the default branch format is used by the meta dir format
94
# which is not the default bzrdir format at this point
95
dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
96
result = dir.create_repository()
97
self.assertEqual(result, 'A bzr repository dir')
99
bzrdir.format_registry.remove('default')
100
bzrdir.format_registry.remove('sample')
101
bzrdir.format_registry.register('default', old_default, '')
102
self.assertIsInstance(repository.RepositoryFormat.get_default_format(),
103
old_format.__class__)
106
class SampleRepositoryFormat(repository.RepositoryFormat):
109
this format is initializable, unsupported to aid in testing the
110
open and open(unsupported=True) routines.
113
def get_format_string(self):
114
"""See RepositoryFormat.get_format_string()."""
115
return "Sample .bzr repository format."
117
def initialize(self, a_bzrdir, shared=False):
118
"""Initialize a repository in a BzrDir"""
119
t = a_bzrdir.get_repository_transport(self)
120
t.put_bytes('format', self.get_format_string())
121
return 'A bzr repository dir'
123
def is_supported(self):
126
def open(self, a_bzrdir, _found=False):
127
return "opened repository."
130
class TestRepositoryFormat(TestCaseWithTransport):
131
"""Tests for the Repository format detection used by the bzr meta dir facility.BzrBranchFormat facility."""
133
def test_find_format(self):
134
# is the right format object found for a repository?
135
# create a branch with a few known format objects.
136
# this is not quite the same as
137
self.build_tree(["foo/", "bar/"])
138
def check_format(format, url):
139
dir = format._matchingbzrdir.initialize(url)
140
format.initialize(dir)
141
t = get_transport(url)
142
found_format = repository.RepositoryFormat.find_format(dir)
143
self.failUnless(isinstance(found_format, format.__class__))
144
check_format(weaverepo.RepositoryFormat7(), "bar")
146
def test_find_format_no_repository(self):
147
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
148
self.assertRaises(errors.NoRepositoryPresent,
149
repository.RepositoryFormat.find_format,
152
def test_find_format_unknown_format(self):
153
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
154
SampleRepositoryFormat().initialize(dir)
155
self.assertRaises(UnknownFormatError,
156
repository.RepositoryFormat.find_format,
159
def test_register_unregister_format(self):
160
format = SampleRepositoryFormat()
162
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
164
format.initialize(dir)
165
# register a format for it.
166
repository.RepositoryFormat.register_format(format)
167
# which repository.Open will refuse (not supported)
168
self.assertRaises(UnsupportedFormatError, repository.Repository.open, self.get_url())
169
# but open(unsupported) will work
170
self.assertEqual(format.open(dir), "opened repository.")
171
# unregister the format
172
repository.RepositoryFormat.unregister_format(format)
175
class TestFormat6(TestCaseWithTransport):
177
def test_attribute__fetch_order(self):
178
"""Weaves need topological data insertion."""
179
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
180
repo = weaverepo.RepositoryFormat6().initialize(control)
181
self.assertEqual('topological', repo._format._fetch_order)
183
def test_attribute__fetch_uses_deltas(self):
184
"""Weaves do not reuse deltas."""
185
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
186
repo = weaverepo.RepositoryFormat6().initialize(control)
187
self.assertEqual(False, repo._format._fetch_uses_deltas)
189
def test_attribute__fetch_reconcile(self):
190
"""Weave repositories need a reconcile after fetch."""
191
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
192
repo = weaverepo.RepositoryFormat6().initialize(control)
193
self.assertEqual(True, repo._format._fetch_reconcile)
195
def test_no_ancestry_weave(self):
196
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
197
repo = weaverepo.RepositoryFormat6().initialize(control)
198
# We no longer need to create the ancestry.weave file
199
# since it is *never* used.
200
self.assertRaises(NoSuchFile,
201
control.transport.get,
204
def test_supports_external_lookups(self):
205
control = bzrdir.BzrDirFormat6().initialize(self.get_url())
206
repo = weaverepo.RepositoryFormat6().initialize(control)
207
self.assertFalse(repo._format.supports_external_lookups)
210
class TestFormat7(TestCaseWithTransport):
212
def test_attribute__fetch_order(self):
213
"""Weaves need topological data insertion."""
214
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
215
repo = weaverepo.RepositoryFormat7().initialize(control)
216
self.assertEqual('topological', repo._format._fetch_order)
218
def test_attribute__fetch_uses_deltas(self):
219
"""Weaves do not reuse deltas."""
220
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
221
repo = weaverepo.RepositoryFormat7().initialize(control)
222
self.assertEqual(False, repo._format._fetch_uses_deltas)
224
def test_attribute__fetch_reconcile(self):
225
"""Weave repositories need a reconcile after fetch."""
226
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
227
repo = weaverepo.RepositoryFormat7().initialize(control)
228
self.assertEqual(True, repo._format._fetch_reconcile)
230
def test_disk_layout(self):
231
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
232
repo = weaverepo.RepositoryFormat7().initialize(control)
233
# in case of side effects of locking.
237
# format 'Bazaar-NG Repository format 7'
239
# inventory.weave == empty_weave
240
# empty revision-store directory
241
# empty weaves directory
242
t = control.get_repository_transport(None)
243
self.assertEqualDiff('Bazaar-NG Repository format 7',
244
t.get('format').read())
245
self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
246
self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
247
self.assertEqualDiff('# bzr weave file v5\n'
250
t.get('inventory.weave').read())
251
# Creating a file with id Foo:Bar results in a non-escaped file name on
253
control.create_branch()
254
tree = control.create_workingtree()
255
tree.add(['foo'], ['Foo:Bar'], ['file'])
256
tree.put_file_bytes_non_atomic('Foo:Bar', 'content\n')
258
tree.commit('first post', rev_id='first')
259
except errors.IllegalPath:
260
if sys.platform != 'win32':
262
self.knownFailure('Foo:Bar cannot be used as a file-id on windows'
265
self.assertEqualDiff(
266
'# bzr weave file v5\n'
268
'1 7fe70820e08a1aac0ef224d9c66ab66831cc4ab1\n'
276
t.get('weaves/74/Foo%3ABar.weave').read())
278
def test_shared_disk_layout(self):
279
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
280
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
282
# format 'Bazaar-NG Repository format 7'
283
# inventory.weave == empty_weave
284
# empty revision-store directory
285
# empty weaves directory
286
# a 'shared-storage' marker file.
287
# lock is not present when unlocked
288
t = control.get_repository_transport(None)
289
self.assertEqualDiff('Bazaar-NG Repository format 7',
290
t.get('format').read())
291
self.assertEqualDiff('', t.get('shared-storage').read())
292
self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
293
self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
294
self.assertEqualDiff('# bzr weave file v5\n'
297
t.get('inventory.weave').read())
298
self.assertFalse(t.has('branch-lock'))
300
def test_creates_lockdir(self):
301
"""Make sure it appears to be controlled by a LockDir existence"""
302
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
303
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
304
t = control.get_repository_transport(None)
305
# TODO: Should check there is a 'lock' toplevel directory,
306
# regardless of contents
307
self.assertFalse(t.has('lock/held/info'))
310
self.assertTrue(t.has('lock/held/info'))
312
# unlock so we don't get a warning about failing to do so
315
def test_uses_lockdir(self):
316
"""repo format 7 actually locks on lockdir"""
317
base_url = self.get_url()
318
control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
319
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
320
t = control.get_repository_transport(None)
324
# make sure the same lock is created by opening it
325
repo = repository.Repository.open(base_url)
327
self.assertTrue(t.has('lock/held/info'))
329
self.assertFalse(t.has('lock/held/info'))
331
def test_shared_no_tree_disk_layout(self):
332
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
333
repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
334
repo.set_make_working_trees(False)
336
# format 'Bazaar-NG Repository format 7'
338
# inventory.weave == empty_weave
339
# empty revision-store directory
340
# empty weaves directory
341
# a 'shared-storage' marker file.
342
t = control.get_repository_transport(None)
343
self.assertEqualDiff('Bazaar-NG Repository format 7',
344
t.get('format').read())
345
## self.assertEqualDiff('', t.get('lock').read())
346
self.assertEqualDiff('', t.get('shared-storage').read())
347
self.assertEqualDiff('', t.get('no-working-trees').read())
348
repo.set_make_working_trees(True)
349
self.assertFalse(t.has('no-working-trees'))
350
self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
351
self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
352
self.assertEqualDiff('# bzr weave file v5\n'
355
t.get('inventory.weave').read())
357
def test_supports_external_lookups(self):
358
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
359
repo = weaverepo.RepositoryFormat7().initialize(control)
360
self.assertFalse(repo._format.supports_external_lookups)
363
class TestFormatKnit1(TestCaseWithTransport):
365
def test_attribute__fetch_order(self):
366
"""Knits need topological data insertion."""
367
repo = self.make_repository('.',
368
format=bzrdir.format_registry.get('knit')())
369
self.assertEqual('topological', repo._format._fetch_order)
371
def test_attribute__fetch_uses_deltas(self):
372
"""Knits reuse deltas."""
373
repo = self.make_repository('.',
374
format=bzrdir.format_registry.get('knit')())
375
self.assertEqual(True, repo._format._fetch_uses_deltas)
377
def test_disk_layout(self):
378
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
379
repo = knitrepo.RepositoryFormatKnit1().initialize(control)
380
# in case of side effects of locking.
384
# format 'Bazaar-NG Knit Repository Format 1'
385
# lock: is a directory
386
# inventory.weave == empty_weave
387
# empty revision-store directory
388
# empty weaves directory
389
t = control.get_repository_transport(None)
390
self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
391
t.get('format').read())
392
# XXX: no locks left when unlocked at the moment
393
# self.assertEqualDiff('', t.get('lock').read())
394
self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
396
# Check per-file knits.
397
branch = control.create_branch()
398
tree = control.create_workingtree()
399
tree.add(['foo'], ['Nasty-IdC:'], ['file'])
400
tree.put_file_bytes_non_atomic('Nasty-IdC:', '')
401
tree.commit('1st post', rev_id='foo')
402
self.assertHasKnit(t, 'knits/e8/%254easty-%2549d%2543%253a',
403
'\nfoo fulltext 0 81 :')
405
def assertHasKnit(self, t, knit_name, extra_content=''):
406
"""Assert that knit_name exists on t."""
407
self.assertEqualDiff('# bzr knit index 8\n' + extra_content,
408
t.get(knit_name + '.kndx').read())
410
def check_knits(self, t):
411
"""check knit content for a repository."""
412
self.assertHasKnit(t, 'inventory')
413
self.assertHasKnit(t, 'revisions')
414
self.assertHasKnit(t, 'signatures')
416
def test_shared_disk_layout(self):
417
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
418
repo = knitrepo.RepositoryFormatKnit1().initialize(control, shared=True)
420
# format 'Bazaar-NG Knit Repository Format 1'
421
# lock: is a directory
422
# inventory.weave == empty_weave
423
# empty revision-store directory
424
# empty weaves directory
425
# a 'shared-storage' marker file.
426
t = control.get_repository_transport(None)
427
self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
428
t.get('format').read())
429
# XXX: no locks left when unlocked at the moment
430
# self.assertEqualDiff('', t.get('lock').read())
431
self.assertEqualDiff('', t.get('shared-storage').read())
432
self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
435
def test_shared_no_tree_disk_layout(self):
436
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
437
repo = knitrepo.RepositoryFormatKnit1().initialize(control, shared=True)
438
repo.set_make_working_trees(False)
440
# format 'Bazaar-NG Knit Repository Format 1'
442
# inventory.weave == empty_weave
443
# empty revision-store directory
444
# empty weaves directory
445
# a 'shared-storage' marker file.
446
t = control.get_repository_transport(None)
447
self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
448
t.get('format').read())
449
# XXX: no locks left when unlocked at the moment
450
# self.assertEqualDiff('', t.get('lock').read())
451
self.assertEqualDiff('', t.get('shared-storage').read())
452
self.assertEqualDiff('', t.get('no-working-trees').read())
453
repo.set_make_working_trees(True)
454
self.assertFalse(t.has('no-working-trees'))
455
self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
458
def test_deserialise_sets_root_revision(self):
459
"""We must have a inventory.root.revision
461
Old versions of the XML5 serializer did not set the revision_id for
462
the whole inventory. So we grab the one from the expected text. Which
463
is valid when the api is not being abused.
465
repo = self.make_repository('.',
466
format=bzrdir.format_registry.get('knit')())
467
inv_xml = '<inventory format="5">\n</inventory>\n'
468
inv = repo.deserialise_inventory('test-rev-id', inv_xml)
469
self.assertEqual('test-rev-id', inv.root.revision)
471
def test_deserialise_uses_global_revision_id(self):
472
"""If it is set, then we re-use the global revision id"""
473
repo = self.make_repository('.',
474
format=bzrdir.format_registry.get('knit')())
475
inv_xml = ('<inventory format="5" revision_id="other-rev-id">\n'
477
# Arguably, the deserialise_inventory should detect a mismatch, and
478
# raise an error, rather than silently using one revision_id over the
480
self.assertRaises(AssertionError, repo.deserialise_inventory,
481
'test-rev-id', inv_xml)
482
inv = repo.deserialise_inventory('other-rev-id', inv_xml)
483
self.assertEqual('other-rev-id', inv.root.revision)
485
def test_supports_external_lookups(self):
486
repo = self.make_repository('.',
487
format=bzrdir.format_registry.get('knit')())
488
self.assertFalse(repo._format.supports_external_lookups)
491
class DummyRepository(object):
492
"""A dummy repository for testing."""
497
def supports_rich_root(self):
498
if self._format is not None:
499
return self._format.rich_root_data
503
raise NotImplementedError
505
def get_parent_map(self, revision_ids):
506
raise NotImplementedError
509
class InterDummy(repository.InterRepository):
510
"""An inter-repository optimised code path for DummyRepository.
512
This is for use during testing where we use DummyRepository as repositories
513
so that none of the default regsitered inter-repository classes will
518
def is_compatible(repo_source, repo_target):
519
"""InterDummy is compatible with DummyRepository."""
520
return (isinstance(repo_source, DummyRepository) and
521
isinstance(repo_target, DummyRepository))
524
class TestInterRepository(TestCaseWithTransport):
526
def test_get_default_inter_repository(self):
527
# test that the InterRepository.get(repo_a, repo_b) probes
528
# for a inter_repo class where is_compatible(repo_a, repo_b) returns
529
# true and returns a default inter_repo otherwise.
530
# This also tests that the default registered optimised interrepository
531
# classes do not barf inappropriately when a surprising repository type
533
dummy_a = DummyRepository()
534
dummy_b = DummyRepository()
535
self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
537
def assertGetsDefaultInterRepository(self, repo_a, repo_b):
538
"""Asserts that InterRepository.get(repo_a, repo_b) -> the default.
540
The effective default is now InterSameDataRepository because there is
541
no actual sane default in the presence of incompatible data models.
543
inter_repo = repository.InterRepository.get(repo_a, repo_b)
544
self.assertEqual(repository.InterSameDataRepository,
545
inter_repo.__class__)
546
self.assertEqual(repo_a, inter_repo.source)
547
self.assertEqual(repo_b, inter_repo.target)
549
def test_register_inter_repository_class(self):
550
# test that a optimised code path provider - a
551
# InterRepository subclass can be registered and unregistered
552
# and that it is correctly selected when given a repository
553
# pair that it returns true on for the is_compatible static method
555
dummy_a = DummyRepository()
556
dummy_a._format = RepositoryFormat()
557
dummy_b = DummyRepository()
558
dummy_b._format = RepositoryFormat()
559
repo = self.make_repository('.')
560
# hack dummies to look like repo somewhat.
561
dummy_a._serializer = repo._serializer
562
dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
563
dummy_a._format.rich_root_data = repo._format.rich_root_data
564
dummy_b._serializer = repo._serializer
565
dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
566
dummy_b._format.rich_root_data = repo._format.rich_root_data
567
repository.InterRepository.register_optimiser(InterDummy)
569
# we should get the default for something InterDummy returns False
571
self.assertFalse(InterDummy.is_compatible(dummy_a, repo))
572
self.assertGetsDefaultInterRepository(dummy_a, repo)
573
# and we should get an InterDummy for a pair it 'likes'
574
self.assertTrue(InterDummy.is_compatible(dummy_a, dummy_b))
575
inter_repo = repository.InterRepository.get(dummy_a, dummy_b)
576
self.assertEqual(InterDummy, inter_repo.__class__)
577
self.assertEqual(dummy_a, inter_repo.source)
578
self.assertEqual(dummy_b, inter_repo.target)
580
repository.InterRepository.unregister_optimiser(InterDummy)
581
# now we should get the default InterRepository object again.
582
self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
585
class TestInterWeaveRepo(TestCaseWithTransport):
587
def test_is_compatible_and_registered(self):
588
# InterWeaveRepo is compatible when either side
589
# is a format 5/6/7 branch
590
from bzrlib.repofmt import knitrepo, weaverepo
591
formats = [weaverepo.RepositoryFormat5(),
592
weaverepo.RepositoryFormat6(),
593
weaverepo.RepositoryFormat7()]
594
incompatible_formats = [weaverepo.RepositoryFormat4(),
595
knitrepo.RepositoryFormatKnit1(),
597
repo_a = self.make_repository('a')
598
repo_b = self.make_repository('b')
599
is_compatible = repository.InterWeaveRepo.is_compatible
600
for source in incompatible_formats:
601
# force incompatible left then right
602
repo_a._format = source
603
repo_b._format = formats[0]
604
self.assertFalse(is_compatible(repo_a, repo_b))
605
self.assertFalse(is_compatible(repo_b, repo_a))
606
for source in formats:
607
repo_a._format = source
608
for target in formats:
609
repo_b._format = target
610
self.assertTrue(is_compatible(repo_a, repo_b))
611
self.assertEqual(repository.InterWeaveRepo,
612
repository.InterRepository.get(repo_a,
616
class TestRepositoryConverter(TestCaseWithTransport):
618
def test_convert_empty(self):
619
t = get_transport(self.get_url('.'))
620
t.mkdir('repository')
621
repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
622
repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
623
target_format = knitrepo.RepositoryFormatKnit1()
624
converter = repository.CopyConverter(target_format)
625
pb = bzrlib.ui.ui_factory.nested_progress_bar()
627
converter.convert(repo, pb)
630
repo = repo_dir.open_repository()
631
self.assertTrue(isinstance(target_format, repo._format.__class__))
634
class TestMisc(TestCase):
636
def test_unescape_xml(self):
637
"""We get some kind of error when malformed entities are passed"""
638
self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;')
641
class TestRepositoryFormatKnit3(TestCaseWithTransport):
643
def test_attribute__fetch_order(self):
644
"""Knits need topological data insertion."""
645
format = bzrdir.BzrDirMetaFormat1()
646
format.repository_format = knitrepo.RepositoryFormatKnit3()
647
repo = self.make_repository('.', format=format)
648
self.assertEqual('topological', repo._format._fetch_order)
650
def test_attribute__fetch_uses_deltas(self):
651
"""Knits reuse deltas."""
652
format = bzrdir.BzrDirMetaFormat1()
653
format.repository_format = knitrepo.RepositoryFormatKnit3()
654
repo = self.make_repository('.', format=format)
655
self.assertEqual(True, repo._format._fetch_uses_deltas)
657
def test_convert(self):
658
"""Ensure the upgrade adds weaves for roots"""
659
format = bzrdir.BzrDirMetaFormat1()
660
format.repository_format = knitrepo.RepositoryFormatKnit1()
661
tree = self.make_branch_and_tree('.', format)
662
tree.commit("Dull commit", rev_id="dull")
663
revision_tree = tree.branch.repository.revision_tree('dull')
664
revision_tree.lock_read()
666
self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
667
revision_tree.inventory.root.file_id)
669
revision_tree.unlock()
670
format = bzrdir.BzrDirMetaFormat1()
671
format.repository_format = knitrepo.RepositoryFormatKnit3()
672
upgrade.Convert('.', format)
673
tree = workingtree.WorkingTree.open('.')
674
revision_tree = tree.branch.repository.revision_tree('dull')
675
revision_tree.lock_read()
677
revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
679
revision_tree.unlock()
680
tree.commit("Another dull commit", rev_id='dull2')
681
revision_tree = tree.branch.repository.revision_tree('dull2')
682
revision_tree.lock_read()
683
self.addCleanup(revision_tree.unlock)
684
self.assertEqual('dull', revision_tree.inventory.root.revision)
686
def test_supports_external_lookups(self):
687
format = bzrdir.BzrDirMetaFormat1()
688
format.repository_format = knitrepo.RepositoryFormatKnit3()
689
repo = self.make_repository('.', format=format)
690
self.assertFalse(repo._format.supports_external_lookups)
693
class Test2a(tests.TestCaseWithMemoryTransport):
695
def test_fetch_combines_groups(self):
696
builder = self.make_branch_builder('source', format='2a')
697
builder.start_series()
698
builder.build_snapshot('1', None, [
699
('add', ('', 'root-id', 'directory', '')),
700
('add', ('file', 'file-id', 'file', 'content\n'))])
701
builder.build_snapshot('2', ['1'], [
702
('modify', ('file-id', 'content-2\n'))])
703
builder.finish_series()
704
source = builder.get_branch()
705
target = self.make_repository('target', format='2a')
706
target.fetch(source.repository)
708
self.addCleanup(target.unlock)
709
details = target.texts._index.get_build_details(
710
[('file-id', '1',), ('file-id', '2',)])
711
file_1_details = details[('file-id', '1')]
712
file_2_details = details[('file-id', '2')]
713
# The index, and what to read off disk, should be the same for both
714
# versions of the file.
715
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
717
def test_fetch_combines_groups(self):
718
builder = self.make_branch_builder('source', format='2a')
719
builder.start_series()
720
builder.build_snapshot('1', None, [
721
('add', ('', 'root-id', 'directory', '')),
722
('add', ('file', 'file-id', 'file', 'content\n'))])
723
builder.build_snapshot('2', ['1'], [
724
('modify', ('file-id', 'content-2\n'))])
725
builder.finish_series()
726
source = builder.get_branch()
727
target = self.make_repository('target', format='2a')
728
target.fetch(source.repository)
730
self.addCleanup(target.unlock)
731
details = target.texts._index.get_build_details(
732
[('file-id', '1',), ('file-id', '2',)])
733
file_1_details = details[('file-id', '1')]
734
file_2_details = details[('file-id', '2')]
735
# The index, and what to read off disk, should be the same for both
736
# versions of the file.
737
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
739
def test_fetch_combines_groups(self):
740
builder = self.make_branch_builder('source', format='2a')
741
builder.start_series()
742
builder.build_snapshot('1', None, [
743
('add', ('', 'root-id', 'directory', '')),
744
('add', ('file', 'file-id', 'file', 'content\n'))])
745
builder.build_snapshot('2', ['1'], [
746
('modify', ('file-id', 'content-2\n'))])
747
builder.finish_series()
748
source = builder.get_branch()
749
target = self.make_repository('target', format='2a')
750
target.fetch(source.repository)
752
self.addCleanup(target.unlock)
753
details = target.texts._index.get_build_details(
754
[('file-id', '1',), ('file-id', '2',)])
755
file_1_details = details[('file-id', '1')]
756
file_2_details = details[('file-id', '2')]
757
# The index, and what to read off disk, should be the same for both
758
# versions of the file.
759
self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
761
def test_format_pack_compresses_True(self):
762
repo = self.make_repository('repo', format='2a')
763
self.assertTrue(repo._format.pack_compresses)
765
def test_inventories_use_chk_map_with_parent_base_dict(self):
766
tree = self.make_branch_and_memory_tree('repo', format="2a")
768
tree.add([''], ['TREE_ROOT'])
769
revid = tree.commit("foo")
772
self.addCleanup(tree.unlock)
773
inv = tree.branch.repository.get_inventory(revid)
774
self.assertNotEqual(None, inv.parent_id_basename_to_file_id)
775
inv.parent_id_basename_to_file_id._ensure_root()
776
inv.id_to_entry._ensure_root()
777
self.assertEqual(65536, inv.id_to_entry._root_node.maximum_size)
778
self.assertEqual(65536,
779
inv.parent_id_basename_to_file_id._root_node.maximum_size)
781
def test_autopack_unchanged_chk_nodes(self):
782
# at 20 unchanged commits, chk pages are packed that are split into
783
# two groups such that the new pack being made doesn't have all its
784
# pages in the source packs (though they are in the repository).
785
# Use a memory backed repository, we don't need to hit disk for this
786
tree = self.make_branch_and_memory_tree('tree', format='2a')
788
self.addCleanup(tree.unlock)
789
tree.add([''], ['TREE_ROOT'])
790
for pos in range(20):
791
tree.commit(str(pos))
793
def test_pack_with_hint(self):
794
tree = self.make_branch_and_memory_tree('tree', format='2a')
796
self.addCleanup(tree.unlock)
797
tree.add([''], ['TREE_ROOT'])
798
# 1 commit to leave untouched
800
to_keep = tree.branch.repository._pack_collection.names()
804
all = tree.branch.repository._pack_collection.names()
805
combine = list(set(all) - set(to_keep))
806
self.assertLength(3, all)
807
self.assertLength(2, combine)
808
tree.branch.repository.pack(hint=combine)
809
final = tree.branch.repository._pack_collection.names()
810
self.assertLength(2, final)
811
self.assertFalse(combine[0] in final)
812
self.assertFalse(combine[1] in final)
813
self.assertSubset(to_keep, final)
815
def test_stream_source_to_gc(self):
816
source = self.make_repository('source', format='2a')
817
target = self.make_repository('target', format='2a')
818
stream = source._get_source(target._format)
819
self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
821
def test_stream_source_to_non_gc(self):
822
source = self.make_repository('source', format='2a')
823
target = self.make_repository('target', format='rich-root-pack')
824
stream = source._get_source(target._format)
825
# We don't want the child GroupCHKStreamSource
826
self.assertIs(type(stream), repository.StreamSource)
828
def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
829
source_builder = self.make_branch_builder('source',
831
# We have to build a fairly large tree, so that we are sure the chk
832
# pages will have split into multiple pages.
833
entries = [('add', ('', 'a-root-id', 'directory', None))]
834
for i in 'abcdefghijklmnopqrstuvwxyz123456789':
835
for j in 'abcdefghijklmnopqrstuvwxyz123456789':
838
content = 'content for %s\n' % (fname,)
839
entries.append(('add', (fname, fid, 'file', content)))
840
source_builder.start_series()
841
source_builder.build_snapshot('rev-1', None, entries)
842
# Now change a few of them, so we get a few new pages for the second
844
source_builder.build_snapshot('rev-2', ['rev-1'], [
845
('modify', ('aa-id', 'new content for aa-id\n')),
846
('modify', ('cc-id', 'new content for cc-id\n')),
847
('modify', ('zz-id', 'new content for zz-id\n')),
849
source_builder.finish_series()
850
source_branch = source_builder.get_branch()
851
source_branch.lock_read()
852
self.addCleanup(source_branch.unlock)
853
target = self.make_repository('target', format='2a')
854
source = source_branch.repository._get_source(target._format)
855
self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
857
# On a regular pass, getting the inventories and chk pages for rev-2
858
# would only get the newly created chk pages
859
search = graph.SearchResult(set(['rev-2']), set(['rev-1']), 1,
861
simple_chk_records = []
862
for vf_name, substream in source.get_stream(search):
863
if vf_name == 'chk_bytes':
864
for record in substream:
865
simple_chk_records.append(record.key)
869
# 3 pages, the root (InternalNode), + 2 pages which actually changed
870
self.assertEqual([('sha1:91481f539e802c76542ea5e4c83ad416bf219f73',),
871
('sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
872
('sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
873
('sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)],
875
# Now, when we do a similar call using 'get_stream_for_missing_keys'
876
# we should get a much larger set of pages.
877
missing = [('inventories', 'rev-2')]
878
full_chk_records = []
879
for vf_name, substream in source.get_stream_for_missing_keys(missing):
880
if vf_name == 'inventories':
881
for record in substream:
882
self.assertEqual(('rev-2',), record.key)
883
elif vf_name == 'chk_bytes':
884
for record in substream:
885
full_chk_records.append(record.key)
887
self.fail('Should not be getting a stream of %s' % (vf_name,))
888
# We have 257 records now. This is because we have 1 root page, and 256
889
# leaf pages in a complete listing.
890
self.assertEqual(257, len(full_chk_records))
891
self.assertSubset(simple_chk_records, full_chk_records)
893
def test_inconsistency_fatal(self):
894
repo = self.make_repository('repo', format='2a')
895
self.assertTrue(repo.revisions._index._inconsistency_fatal)
896
self.assertFalse(repo.texts._index._inconsistency_fatal)
897
self.assertFalse(repo.inventories._index._inconsistency_fatal)
898
self.assertFalse(repo.signatures._index._inconsistency_fatal)
899
self.assertFalse(repo.chk_bytes._index._inconsistency_fatal)
902
class TestKnitPackStreamSource(tests.TestCaseWithMemoryTransport):
904
def test_source_to_exact_pack_092(self):
905
source = self.make_repository('source', format='pack-0.92')
906
target = self.make_repository('target', format='pack-0.92')
907
stream_source = source._get_source(target._format)
908
self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
910
def test_source_to_exact_pack_rich_root_pack(self):
911
source = self.make_repository('source', format='rich-root-pack')
912
target = self.make_repository('target', format='rich-root-pack')
913
stream_source = source._get_source(target._format)
914
self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
916
def test_source_to_exact_pack_19(self):
917
source = self.make_repository('source', format='1.9')
918
target = self.make_repository('target', format='1.9')
919
stream_source = source._get_source(target._format)
920
self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
922
def test_source_to_exact_pack_19_rich_root(self):
923
source = self.make_repository('source', format='1.9-rich-root')
924
target = self.make_repository('target', format='1.9-rich-root')
925
stream_source = source._get_source(target._format)
926
self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
928
def test_source_to_remote_exact_pack_19(self):
929
trans = self.make_smart_server('target')
931
source = self.make_repository('source', format='1.9')
932
target = self.make_repository('target', format='1.9')
933
target = repository.Repository.open(trans.base)
934
stream_source = source._get_source(target._format)
935
self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
937
def test_stream_source_to_non_exact(self):
938
source = self.make_repository('source', format='pack-0.92')
939
target = self.make_repository('target', format='1.9')
940
stream = source._get_source(target._format)
941
self.assertIs(type(stream), repository.StreamSource)
943
def test_stream_source_to_non_exact_rich_root(self):
944
source = self.make_repository('source', format='1.9')
945
target = self.make_repository('target', format='1.9-rich-root')
946
stream = source._get_source(target._format)
947
self.assertIs(type(stream), repository.StreamSource)
949
def test_source_to_remote_non_exact_pack_19(self):
950
trans = self.make_smart_server('target')
952
source = self.make_repository('source', format='1.9')
953
target = self.make_repository('target', format='1.6')
954
target = repository.Repository.open(trans.base)
955
stream_source = source._get_source(target._format)
956
self.assertIs(type(stream_source), repository.StreamSource)
958
def test_stream_source_to_knit(self):
959
source = self.make_repository('source', format='pack-0.92')
960
target = self.make_repository('target', format='dirstate')
961
stream = source._get_source(target._format)
962
self.assertIs(type(stream), repository.StreamSource)
965
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
966
"""Tests for _find_parent_ids_of_revisions."""
969
super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
970
self.builder = self.make_branch_builder('source',
971
format='development6-rich-root')
972
self.builder.start_series()
973
self.builder.build_snapshot('initial', None,
974
[('add', ('', 'tree-root', 'directory', None))])
975
self.repo = self.builder.get_branch().repository
976
self.addCleanup(self.builder.finish_series)
978
def assertParentIds(self, expected_result, rev_set):
979
self.assertEqual(sorted(expected_result),
980
sorted(self.repo._find_parent_ids_of_revisions(rev_set)))
982
def test_simple(self):
983
self.builder.build_snapshot('revid1', None, [])
984
self.builder.build_snapshot('revid2', ['revid1'], [])
986
self.assertParentIds(['revid1'], rev_set)
988
def test_not_first_parent(self):
989
self.builder.build_snapshot('revid1', None, [])
990
self.builder.build_snapshot('revid2', ['revid1'], [])
991
self.builder.build_snapshot('revid3', ['revid2'], [])
992
rev_set = ['revid3', 'revid2']
993
self.assertParentIds(['revid1'], rev_set)
995
def test_not_null(self):
996
rev_set = ['initial']
997
self.assertParentIds([], rev_set)
999
def test_not_null_set(self):
1000
self.builder.build_snapshot('revid1', None, [])
1001
rev_set = [_mod_revision.NULL_REVISION]
1002
self.assertParentIds([], rev_set)
1004
def test_ghost(self):
1005
self.builder.build_snapshot('revid1', None, [])
1006
rev_set = ['ghost', 'revid1']
1007
self.assertParentIds(['initial'], rev_set)
1009
def test_ghost_parent(self):
1010
self.builder.build_snapshot('revid1', None, [])
1011
self.builder.build_snapshot('revid2', ['revid1', 'ghost'], [])
1012
rev_set = ['revid2', 'revid1']
1013
self.assertParentIds(['ghost', 'initial'], rev_set)
1015
def test_righthand_parent(self):
1016
self.builder.build_snapshot('revid1', None, [])
1017
self.builder.build_snapshot('revid2a', ['revid1'], [])
1018
self.builder.build_snapshot('revid2b', ['revid1'], [])
1019
self.builder.build_snapshot('revid3', ['revid2a', 'revid2b'], [])
1020
rev_set = ['revid3', 'revid2a']
1021
self.assertParentIds(['revid1', 'revid2b'], rev_set)
1024
class TestWithBrokenRepo(TestCaseWithTransport):
1025
"""These tests seem to be more appropriate as interface tests?"""
1027
def make_broken_repository(self):
1028
# XXX: This function is borrowed from Aaron's "Reconcile can fix bad
1029
# parent references" branch which is due to land in bzr.dev soon. Once
1030
# it does, this duplication should be removed.
1031
repo = self.make_repository('broken-repo')
1035
cleanups.append(repo.unlock)
1036
repo.start_write_group()
1037
cleanups.append(repo.commit_write_group)
1038
# make rev1a: A well-formed revision, containing 'file1'
1039
inv = inventory.Inventory(revision_id='rev1a')
1040
inv.root.revision = 'rev1a'
1041
self.add_file(repo, inv, 'file1', 'rev1a', [])
1042
repo.texts.add_lines((inv.root.file_id, 'rev1a'), [], [])
1043
repo.add_inventory('rev1a', inv, [])
1044
revision = _mod_revision.Revision('rev1a',
1045
committer='jrandom@example.com', timestamp=0,
1046
inventory_sha1='', timezone=0, message='foo', parent_ids=[])
1047
repo.add_revision('rev1a',revision, inv)
1049
# make rev1b, which has no Revision, but has an Inventory, and
1051
inv = inventory.Inventory(revision_id='rev1b')
1052
inv.root.revision = 'rev1b'
1053
self.add_file(repo, inv, 'file1', 'rev1b', [])
1054
repo.add_inventory('rev1b', inv, [])
1056
# make rev2, with file1 and file2
1058
# file1 has 'rev1b' as an ancestor, even though this is not
1059
# mentioned by 'rev1a', making it an unreferenced ancestor
1060
inv = inventory.Inventory()
1061
self.add_file(repo, inv, 'file1', 'rev2', ['rev1a', 'rev1b'])
1062
self.add_file(repo, inv, 'file2', 'rev2', [])
1063
self.add_revision(repo, 'rev2', inv, ['rev1a'])
1065
# make ghost revision rev1c
1066
inv = inventory.Inventory()
1067
self.add_file(repo, inv, 'file2', 'rev1c', [])
1069
# make rev3 with file2
1070
# file2 refers to 'rev1c', which is a ghost in this repository, so
1071
# file2 cannot have rev1c as its ancestor.
1072
inv = inventory.Inventory()
1073
self.add_file(repo, inv, 'file2', 'rev3', ['rev1c'])
1074
self.add_revision(repo, 'rev3', inv, ['rev1c'])
1077
for cleanup in reversed(cleanups):
1080
def add_revision(self, repo, revision_id, inv, parent_ids):
1081
inv.revision_id = revision_id
1082
inv.root.revision = revision_id
1083
repo.texts.add_lines((inv.root.file_id, revision_id), [], [])
1084
repo.add_inventory(revision_id, inv, parent_ids)
1085
revision = _mod_revision.Revision(revision_id,
1086
committer='jrandom@example.com', timestamp=0, inventory_sha1='',
1087
timezone=0, message='foo', parent_ids=parent_ids)
1088
repo.add_revision(revision_id,revision, inv)
1090
def add_file(self, repo, inv, filename, revision, parents):
1091
file_id = filename + '-id'
1092
entry = inventory.InventoryFile(file_id, filename, 'TREE_ROOT')
1093
entry.revision = revision
1096
text_key = (file_id, revision)
1097
parent_keys = [(file_id, parent) for parent in parents]
1098
repo.texts.add_lines(text_key, parent_keys, ['line\n'])
1100
def test_insert_from_broken_repo(self):
1101
"""Inserting a data stream from a broken repository won't silently
1102
corrupt the target repository.
1104
broken_repo = self.make_broken_repository()
1105
empty_repo = self.make_repository('empty-repo')
1107
empty_repo.fetch(broken_repo)
1108
except (errors.RevisionNotPresent, errors.BzrCheckError):
1109
# Test successful: compression parent not being copied leads to
1112
empty_repo.lock_read()
1113
self.addCleanup(empty_repo.unlock)
1114
text = empty_repo.texts.get_record_stream(
1115
[('file2-id', 'rev3')], 'topological', True).next()
1116
self.assertEqual('line\n', text.get_bytes_as('fulltext'))
1119
class TestRepositoryPackCollection(TestCaseWithTransport):
1121
def get_format(self):
1122
return bzrdir.format_registry.make_bzrdir('pack-0.92')
1124
def get_packs(self):
1125
format = self.get_format()
1126
repo = self.make_repository('.', format=format)
1127
return repo._pack_collection
1129
def make_packs_and_alt_repo(self, write_lock=False):
1130
"""Create a pack repo with 3 packs, and access it via a second repo."""
1131
tree = self.make_branch_and_tree('.', format=self.get_format())
1133
self.addCleanup(tree.unlock)
1134
rev1 = tree.commit('one')
1135
rev2 = tree.commit('two')
1136
rev3 = tree.commit('three')
1137
r = repository.Repository.open('.')
1142
self.addCleanup(r.unlock)
1143
packs = r._pack_collection
1144
packs.ensure_loaded()
1145
return tree, r, packs, [rev1, rev2, rev3]
1147
def test__max_pack_count(self):
1148
"""The maximum pack count is a function of the number of revisions."""
1149
# no revisions - one pack, so that we can have a revision free repo
1150
# without it blowing up
1151
packs = self.get_packs()
1152
self.assertEqual(1, packs._max_pack_count(0))
1153
# after that the sum of the digits, - check the first 1-9
1154
self.assertEqual(1, packs._max_pack_count(1))
1155
self.assertEqual(2, packs._max_pack_count(2))
1156
self.assertEqual(3, packs._max_pack_count(3))
1157
self.assertEqual(4, packs._max_pack_count(4))
1158
self.assertEqual(5, packs._max_pack_count(5))
1159
self.assertEqual(6, packs._max_pack_count(6))
1160
self.assertEqual(7, packs._max_pack_count(7))
1161
self.assertEqual(8, packs._max_pack_count(8))
1162
self.assertEqual(9, packs._max_pack_count(9))
1163
# check the boundary cases with two digits for the next decade
1164
self.assertEqual(1, packs._max_pack_count(10))
1165
self.assertEqual(2, packs._max_pack_count(11))
1166
self.assertEqual(10, packs._max_pack_count(19))
1167
self.assertEqual(2, packs._max_pack_count(20))
1168
self.assertEqual(3, packs._max_pack_count(21))
1169
# check some arbitrary big numbers
1170
self.assertEqual(25, packs._max_pack_count(112894))
1172
def test_repr(self):
1173
packs = self.get_packs()
1174
self.assertContainsRe(repr(packs),
1175
'RepositoryPackCollection(.*Repository(.*))')
1177
def test_pack_distribution_zero(self):
1178
packs = self.get_packs()
1179
self.assertEqual([0], packs.pack_distribution(0))
1181
def test_ensure_loaded_unlocked(self):
1182
packs = self.get_packs()
1183
self.assertRaises(errors.ObjectNotLocked,
1184
packs.ensure_loaded)
1186
def test_pack_distribution_one_to_nine(self):
1187
packs = self.get_packs()
1188
self.assertEqual([1],
1189
packs.pack_distribution(1))
1190
self.assertEqual([1, 1],
1191
packs.pack_distribution(2))
1192
self.assertEqual([1, 1, 1],
1193
packs.pack_distribution(3))
1194
self.assertEqual([1, 1, 1, 1],
1195
packs.pack_distribution(4))
1196
self.assertEqual([1, 1, 1, 1, 1],
1197
packs.pack_distribution(5))
1198
self.assertEqual([1, 1, 1, 1, 1, 1],
1199
packs.pack_distribution(6))
1200
self.assertEqual([1, 1, 1, 1, 1, 1, 1],
1201
packs.pack_distribution(7))
1202
self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1],
1203
packs.pack_distribution(8))
1204
self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1, 1],
1205
packs.pack_distribution(9))
1207
def test_pack_distribution_stable_at_boundaries(self):
1208
"""When there are multi-rev packs the counts are stable."""
1209
packs = self.get_packs()
1211
self.assertEqual([10], packs.pack_distribution(10))
1212
self.assertEqual([10, 1], packs.pack_distribution(11))
1213
self.assertEqual([10, 10], packs.pack_distribution(20))
1214
self.assertEqual([10, 10, 1], packs.pack_distribution(21))
1216
self.assertEqual([100], packs.pack_distribution(100))
1217
self.assertEqual([100, 1], packs.pack_distribution(101))
1218
self.assertEqual([100, 10, 1], packs.pack_distribution(111))
1219
self.assertEqual([100, 100], packs.pack_distribution(200))
1220
self.assertEqual([100, 100, 1], packs.pack_distribution(201))
1221
self.assertEqual([100, 100, 10, 1], packs.pack_distribution(211))
1223
def test_plan_pack_operations_2009_revisions_skip_all_packs(self):
1224
packs = self.get_packs()
1225
existing_packs = [(2000, "big"), (9, "medium")]
1226
# rev count - 2009 -> 2x1000 + 9x1
1227
pack_operations = packs.plan_autopack_combinations(
1228
existing_packs, [1000, 1000, 1, 1, 1, 1, 1, 1, 1, 1, 1])
1229
self.assertEqual([], pack_operations)
1231
def test_plan_pack_operations_2010_revisions_skip_all_packs(self):
1232
packs = self.get_packs()
1233
existing_packs = [(2000, "big"), (9, "medium"), (1, "single")]
1234
# rev count - 2010 -> 2x1000 + 1x10
1235
pack_operations = packs.plan_autopack_combinations(
1236
existing_packs, [1000, 1000, 10])
1237
self.assertEqual([], pack_operations)
1239
def test_plan_pack_operations_2010_combines_smallest_two(self):
1240
packs = self.get_packs()
1241
existing_packs = [(1999, "big"), (9, "medium"), (1, "single2"),
1243
# rev count - 2010 -> 2x1000 + 1x10 (3)
1244
pack_operations = packs.plan_autopack_combinations(
1245
existing_packs, [1000, 1000, 10])
1246
self.assertEqual([[2, ["single2", "single1"]]], pack_operations)
1248
def test_plan_pack_operations_creates_a_single_op(self):
1249
packs = self.get_packs()
1250
existing_packs = [(50, 'a'), (40, 'b'), (30, 'c'), (10, 'd'),
1251
(10, 'e'), (6, 'f'), (4, 'g')]
1252
# rev count 150 -> 1x100 and 5x10
1253
# The two size 10 packs do not need to be touched. The 50, 40, 30 would
1254
# be combined into a single 120 size pack, and the 6 & 4 would
1255
# becombined into a size 10 pack. However, if we have to rewrite them,
1256
# we save a pack file with no increased I/O by putting them into the
1258
distribution = packs.pack_distribution(150)
1259
pack_operations = packs.plan_autopack_combinations(existing_packs,
1261
self.assertEqual([[130, ['a', 'b', 'c', 'f', 'g']]], pack_operations)
1263
def test_all_packs_none(self):
1264
format = self.get_format()
1265
tree = self.make_branch_and_tree('.', format=format)
1267
self.addCleanup(tree.unlock)
1268
packs = tree.branch.repository._pack_collection
1269
packs.ensure_loaded()
1270
self.assertEqual([], packs.all_packs())
1272
def test_all_packs_one(self):
1273
format = self.get_format()
1274
tree = self.make_branch_and_tree('.', format=format)
1275
tree.commit('start')
1277
self.addCleanup(tree.unlock)
1278
packs = tree.branch.repository._pack_collection
1279
packs.ensure_loaded()
1281
packs.get_pack_by_name(packs.names()[0])],
1284
def test_all_packs_two(self):
1285
format = self.get_format()
1286
tree = self.make_branch_and_tree('.', format=format)
1287
tree.commit('start')
1288
tree.commit('continue')
1290
self.addCleanup(tree.unlock)
1291
packs = tree.branch.repository._pack_collection
1292
packs.ensure_loaded()
1294
packs.get_pack_by_name(packs.names()[0]),
1295
packs.get_pack_by_name(packs.names()[1]),
1296
], packs.all_packs())
1298
def test_get_pack_by_name(self):
1299
format = self.get_format()
1300
tree = self.make_branch_and_tree('.', format=format)
1301
tree.commit('start')
1303
self.addCleanup(tree.unlock)
1304
packs = tree.branch.repository._pack_collection
1306
packs.ensure_loaded()
1307
name = packs.names()[0]
1308
pack_1 = packs.get_pack_by_name(name)
1309
# the pack should be correctly initialised
1310
sizes = packs._names[name]
1311
rev_index = GraphIndex(packs._index_transport, name + '.rix', sizes[0])
1312
inv_index = GraphIndex(packs._index_transport, name + '.iix', sizes[1])
1313
txt_index = GraphIndex(packs._index_transport, name + '.tix', sizes[2])
1314
sig_index = GraphIndex(packs._index_transport, name + '.six', sizes[3])
1315
self.assertEqual(pack_repo.ExistingPack(packs._pack_transport,
1316
name, rev_index, inv_index, txt_index, sig_index), pack_1)
1317
# and the same instance should be returned on successive calls.
1318
self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1320
def test_reload_pack_names_new_entry(self):
1321
tree, r, packs, revs = self.make_packs_and_alt_repo()
1322
names = packs.names()
1323
# Add a new pack file into the repository
1324
rev4 = tree.commit('four')
1325
new_names = tree.branch.repository._pack_collection.names()
1326
new_name = set(new_names).difference(names)
1327
self.assertEqual(1, len(new_name))
1328
new_name = new_name.pop()
1329
# The old collection hasn't noticed yet
1330
self.assertEqual(names, packs.names())
1331
self.assertTrue(packs.reload_pack_names())
1332
self.assertEqual(new_names, packs.names())
1333
# And the repository can access the new revision
1334
self.assertEqual({rev4:(revs[-1],)}, r.get_parent_map([rev4]))
1335
self.assertFalse(packs.reload_pack_names())
1337
def test_reload_pack_names_added_and_removed(self):
1338
tree, r, packs, revs = self.make_packs_and_alt_repo()
1339
names = packs.names()
1340
# Now repack the whole thing
1341
tree.branch.repository.pack()
1342
new_names = tree.branch.repository._pack_collection.names()
1343
# The other collection hasn't noticed yet
1344
self.assertEqual(names, packs.names())
1345
self.assertTrue(packs.reload_pack_names())
1346
self.assertEqual(new_names, packs.names())
1347
self.assertEqual({revs[-1]:(revs[-2],)}, r.get_parent_map([revs[-1]]))
1348
self.assertFalse(packs.reload_pack_names())
1350
def test_reload_pack_names_preserves_pending(self):
1351
# TODO: Update this to also test for pending-deleted names
1352
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1353
# We will add one pack (via start_write_group + insert_record_stream),
1354
# and remove another pack (via _remove_pack_from_memory)
1355
orig_names = packs.names()
1356
orig_at_load = packs._packs_at_load
1357
to_remove_name = iter(orig_names).next()
1358
r.start_write_group()
1359
self.addCleanup(r.abort_write_group)
1360
r.texts.insert_record_stream([versionedfile.FulltextContentFactory(
1361
('text', 'rev'), (), None, 'content\n')])
1362
new_pack = packs._new_pack
1363
self.assertTrue(new_pack.data_inserted())
1365
packs.allocate(new_pack)
1366
packs._new_pack = None
1367
removed_pack = packs.get_pack_by_name(to_remove_name)
1368
packs._remove_pack_from_memory(removed_pack)
1369
names = packs.names()
1370
all_nodes, deleted_nodes, new_nodes = packs._diff_pack_names()
1371
new_names = set([x[0][0] for x in new_nodes])
1372
self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1373
self.assertEqual(set(names) - set(orig_names), new_names)
1374
self.assertEqual(set([new_pack.name]), new_names)
1375
self.assertEqual([to_remove_name],
1376
sorted([x[0][0] for x in deleted_nodes]))
1377
packs.reload_pack_names()
1378
reloaded_names = packs.names()
1379
self.assertEqual(orig_at_load, packs._packs_at_load)
1380
self.assertEqual(names, reloaded_names)
1381
all_nodes, deleted_nodes, new_nodes = packs._diff_pack_names()
1382
new_names = set([x[0][0] for x in new_nodes])
1383
self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1384
self.assertEqual(set(names) - set(orig_names), new_names)
1385
self.assertEqual(set([new_pack.name]), new_names)
1386
self.assertEqual([to_remove_name],
1387
sorted([x[0][0] for x in deleted_nodes]))
1389
def test_autopack_reloads_and_stops(self):
1390
tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1391
# After we have determined what needs to be autopacked, trigger a
1392
# full-pack via the other repo which will cause us to re-evaluate and
1393
# decide we don't need to do anything
1394
orig_execute = packs._execute_pack_operations
1395
def _munged_execute_pack_ops(*args, **kwargs):
1396
tree.branch.repository.pack()
1397
return orig_execute(*args, **kwargs)
1398
packs._execute_pack_operations = _munged_execute_pack_ops
1399
packs._max_pack_count = lambda x: 1
1400
packs.pack_distribution = lambda x: [10]
1401
self.assertFalse(packs.autopack())
1402
self.assertEqual(1, len(packs.names()))
1403
self.assertEqual(tree.branch.repository._pack_collection.names(),
1407
class TestPack(TestCaseWithTransport):
1408
"""Tests for the Pack object."""
1410
def assertCurrentlyEqual(self, left, right):
1411
self.assertTrue(left == right)
1412
self.assertTrue(right == left)
1413
self.assertFalse(left != right)
1414
self.assertFalse(right != left)
1416
def assertCurrentlyNotEqual(self, left, right):
1417
self.assertFalse(left == right)
1418
self.assertFalse(right == left)
1419
self.assertTrue(left != right)
1420
self.assertTrue(right != left)
1422
def test___eq____ne__(self):
1423
left = pack_repo.ExistingPack('', '', '', '', '', '')
1424
right = pack_repo.ExistingPack('', '', '', '', '', '')
1425
self.assertCurrentlyEqual(left, right)
1426
# change all attributes and ensure equality changes as we do.
1427
left.revision_index = 'a'
1428
self.assertCurrentlyNotEqual(left, right)
1429
right.revision_index = 'a'
1430
self.assertCurrentlyEqual(left, right)
1431
left.inventory_index = 'a'
1432
self.assertCurrentlyNotEqual(left, right)
1433
right.inventory_index = 'a'
1434
self.assertCurrentlyEqual(left, right)
1435
left.text_index = 'a'
1436
self.assertCurrentlyNotEqual(left, right)
1437
right.text_index = 'a'
1438
self.assertCurrentlyEqual(left, right)
1439
left.signature_index = 'a'
1440
self.assertCurrentlyNotEqual(left, right)
1441
right.signature_index = 'a'
1442
self.assertCurrentlyEqual(left, right)
1444
self.assertCurrentlyNotEqual(left, right)
1446
self.assertCurrentlyEqual(left, right)
1447
left.transport = 'a'
1448
self.assertCurrentlyNotEqual(left, right)
1449
right.transport = 'a'
1450
self.assertCurrentlyEqual(left, right)
1452
def test_file_name(self):
1453
pack = pack_repo.ExistingPack('', 'a_name', '', '', '', '')
1454
self.assertEqual('a_name.pack', pack.file_name())
1457
class TestNewPack(TestCaseWithTransport):
1458
"""Tests for pack_repo.NewPack."""
1460
def test_new_instance_attributes(self):
1461
upload_transport = self.get_transport('upload')
1462
pack_transport = self.get_transport('pack')
1463
index_transport = self.get_transport('index')
1464
upload_transport.mkdir('.')
1465
collection = pack_repo.RepositoryPackCollection(
1467
transport=self.get_transport('.'),
1468
index_transport=index_transport,
1469
upload_transport=upload_transport,
1470
pack_transport=pack_transport,
1471
index_builder_class=BTreeBuilder,
1472
index_class=BTreeGraphIndex,
1473
use_chk_index=False)
1474
pack = pack_repo.NewPack(collection)
1475
self.addCleanup(pack.abort) # Make sure the write stream gets closed
1476
self.assertIsInstance(pack.revision_index, BTreeBuilder)
1477
self.assertIsInstance(pack.inventory_index, BTreeBuilder)
1478
self.assertIsInstance(pack._hash, type(osutils.md5()))
1479
self.assertTrue(pack.upload_transport is upload_transport)
1480
self.assertTrue(pack.index_transport is index_transport)
1481
self.assertTrue(pack.pack_transport is pack_transport)
1482
self.assertEqual(None, pack.index_sizes)
1483
self.assertEqual(20, len(pack.random_name))
1484
self.assertIsInstance(pack.random_name, str)
1485
self.assertIsInstance(pack.start_time, float)
1488
class TestPacker(TestCaseWithTransport):
1489
"""Tests for the packs repository Packer class."""
1491
def test_pack_optimizes_pack_order(self):
1492
builder = self.make_branch_builder('.', format="1.9")
1493
builder.start_series()
1494
builder.build_snapshot('A', None, [
1495
('add', ('', 'root-id', 'directory', None)),
1496
('add', ('f', 'f-id', 'file', 'content\n'))])
1497
builder.build_snapshot('B', ['A'],
1498
[('modify', ('f-id', 'new-content\n'))])
1499
builder.build_snapshot('C', ['B'],
1500
[('modify', ('f-id', 'third-content\n'))])
1501
builder.build_snapshot('D', ['C'],
1502
[('modify', ('f-id', 'fourth-content\n'))])
1503
b = builder.get_branch()
1505
builder.finish_series()
1506
self.addCleanup(b.unlock)
1507
# At this point, we should have 4 pack files available
1508
# Because of how they were built, they correspond to
1509
# ['D', 'C', 'B', 'A']
1510
packs = b.repository._pack_collection.packs
1511
packer = pack_repo.Packer(b.repository._pack_collection,
1513
revision_ids=['B', 'C'])
1514
# Now, when we are copying the B & C revisions, their pack files should
1515
# be moved to the front of the stack
1516
# The new ordering moves B & C to the front of the .packs attribute,
1517
# and leaves the others in the original order.
1518
new_packs = [packs[1], packs[2], packs[0], packs[3]]
1519
new_pack = packer.pack()
1520
self.assertEqual(new_packs, packer.packs)
1523
class TestOptimisingPacker(TestCaseWithTransport):
1524
"""Tests for the OptimisingPacker class."""
1526
def get_pack_collection(self):
1527
repo = self.make_repository('.')
1528
return repo._pack_collection
1530
def test_open_pack_will_optimise(self):
1531
packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
1533
new_pack = packer.open_pack()
1534
self.addCleanup(new_pack.abort) # ensure cleanup
1535
self.assertIsInstance(new_pack, pack_repo.NewPack)
1536
self.assertTrue(new_pack.revision_index._optimize_for_size)
1537
self.assertTrue(new_pack.inventory_index._optimize_for_size)
1538
self.assertTrue(new_pack.text_index._optimize_for_size)
1539
self.assertTrue(new_pack.signature_index._optimize_for_size)
1542
class TestCrossFormatPacks(TestCaseWithTransport):
1544
def log_pack(self, hint=None):
1545
self.calls.append(('pack', hint))
1546
self.orig_pack(hint=hint)
1547
if self.expect_hint:
1548
self.assertTrue(hint)
1550
def run_stream(self, src_fmt, target_fmt, expect_pack_called):
1551
self.expect_hint = expect_pack_called
1553
source_tree = self.make_branch_and_tree('src', format=src_fmt)
1554
source_tree.lock_write()
1555
self.addCleanup(source_tree.unlock)
1556
tip = source_tree.commit('foo')
1557
target = self.make_repository('target', format=target_fmt)
1559
self.addCleanup(target.unlock)
1560
source = source_tree.branch.repository._get_source(target._format)
1561
self.orig_pack = target.pack
1562
target.pack = self.log_pack
1563
search = target.search_missing_revision_ids(
1564
source_tree.branch.repository, tip)
1565
stream = source.get_stream(search)
1566
from_format = source_tree.branch.repository._format
1567
sink = target._get_sink()
1568
sink.insert_stream(stream, from_format, [])
1569
if expect_pack_called:
1570
self.assertLength(1, self.calls)
1572
self.assertLength(0, self.calls)
1574
def run_fetch(self, src_fmt, target_fmt, expect_pack_called):
1575
self.expect_hint = expect_pack_called
1577
source_tree = self.make_branch_and_tree('src', format=src_fmt)
1578
source_tree.lock_write()
1579
self.addCleanup(source_tree.unlock)
1580
tip = source_tree.commit('foo')
1581
target = self.make_repository('target', format=target_fmt)
1583
self.addCleanup(target.unlock)
1584
source = source_tree.branch.repository
1585
self.orig_pack = target.pack
1586
target.pack = self.log_pack
1587
target.fetch(source)
1588
if expect_pack_called:
1589
self.assertLength(1, self.calls)
1591
self.assertLength(0, self.calls)
1593
def test_sink_format_hint_no(self):
1594
# When the target format says packing makes no difference, pack is not
1596
self.run_stream('1.9', 'rich-root-pack', False)
1598
def test_sink_format_hint_yes(self):
1599
# When the target format says packing makes a difference, pack is
1601
self.run_stream('1.9', '2a', True)
1603
def test_sink_format_same_no(self):
1604
# When the formats are the same, pack is not called.
1605
self.run_stream('2a', '2a', False)
1607
def test_IDS_format_hint_no(self):
1608
# When the target format says packing makes no difference, pack is not
1610
self.run_fetch('1.9', 'rich-root-pack', False)
1612
def test_IDS_format_hint_yes(self):
1613
# When the target format says packing makes a difference, pack is
1615
self.run_fetch('1.9', '2a', True)
1617
def test_IDS_format_same_no(self):
1618
# When the formats are the same, pack is not called.
1619
self.run_fetch('2a', '2a', False)
added
removed
bzrlib/tests/test_repository.py
