← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

(vila) Revise legal option names to be less drastic. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
"""
24
24
 
25
25
from stat import S_ISDIR
26
 
import sys
27
26
 
28
27
import bzrlib
29
28
from bzrlib.errors import (
30
 
    NoSuchFile,
31
29
    UnknownFormatError,
32
30
    UnsupportedFormatError,
33
31
    )
34
32
from bzrlib import (
35
33
    btree_index,
36
 
    graph,
37
34
    symbol_versioning,
38
35
    tests,
39
36
    transport,
 
37
    vf_search,
40
38
    )
41
39
from bzrlib.btree_index import BTreeBuilder, BTreeGraphIndex
42
40
from bzrlib.index import GraphIndex
47
45
    )
48
46
from bzrlib import (
49
47
    bzrdir,
 
48
    controldir,
50
49
    errors,
51
50
    inventory,
52
51
    osutils,
54
53
    revision as _mod_revision,
55
54
    upgrade,
56
55
    versionedfile,
 
56
    vf_repository,
57
57
    workingtree,
58
58
    )
59
59
from bzrlib.repofmt import (
60
60
    groupcompress_repo,
61
61
    knitrepo,
 
62
    knitpack_repo,
62
63
    pack_repo,
63
 
    weaverepo,
64
64
    )
65
65
 
66
66
 
67
67
class TestDefaultFormat(TestCase):
68
68
 
69
69
    def test_get_set_default_format(self):
70
 
        old_default = bzrdir.format_registry.get('default')
 
70
        old_default = controldir.format_registry.get('default')
71
71
        private_default = old_default().repository_format.__class__
72
72
        old_format = repository.format_registry.get_default()
73
73
        self.assertTrue(isinstance(old_format, private_default))
75
75
            my_bzrdir = bzrdir.BzrDirMetaFormat1()
76
76
            my_bzrdir.repository_format = SampleRepositoryFormat()
77
77
            return my_bzrdir
78
 
        bzrdir.format_registry.remove('default')
79
 
        bzrdir.format_registry.register('sample', make_sample_bzrdir, '')
80
 
        bzrdir.format_registry.set_default('sample')
 
78
        controldir.format_registry.remove('default')
 
79
        controldir.format_registry.register('sample', make_sample_bzrdir, '')
 
80
        controldir.format_registry.set_default('sample')
81
81
        # creating a repository should now create an instrumented dir.
82
82
        try:
83
83
            # the default branch format is used by the meta dir format
86
86
            result = dir.create_repository()
87
87
            self.assertEqual(result, 'A bzr repository dir')
88
88
        finally:
89
 
            bzrdir.format_registry.remove('default')
90
 
            bzrdir.format_registry.remove('sample')
91
 
            bzrdir.format_registry.register('default', old_default, '')
 
89
            controldir.format_registry.remove('default')
 
90
            controldir.format_registry.remove('sample')
 
91
            controldir.format_registry.register('default', old_default, '')
92
92
        self.assertIsInstance(repository.format_registry.get_default(),
93
93
                              old_format.__class__)
94
94
 
95
95
 
96
 
class SampleRepositoryFormat(repository.RepositoryFormat):
 
96
class SampleRepositoryFormat(repository.RepositoryFormatMetaDir):
97
97
    """A sample format
98
98
 
99
99
    this format is initializable, unsupported to aid in testing the
100
100
    open and open(unsupported=True) routines.
101
101
    """
102
102
 
103
 
    def get_format_string(self):
 
103
    @classmethod
 
104
    def get_format_string(cls):
104
105
        """See RepositoryFormat.get_format_string()."""
105
106
        return "Sample .bzr repository format."
106
107
 
137
138
        def check_format(format, url):
138
139
            dir = format._matchingbzrdir.initialize(url)
139
140
            format.initialize(dir)
140
 
            t = transport.get_transport(url)
141
 
            found_format = repository.RepositoryFormat.find_format(dir)
142
 
            self.failUnless(isinstance(found_format, format.__class__))
 
141
            t = transport.get_transport_from_path(url)
 
142
            found_format = repository.RepositoryFormatMetaDir.find_format(dir)
 
143
            self.assertIsInstance(found_format, format.__class__)
143
144
        check_format(repository.format_registry.get_default(), "bar")
144
145
 
145
146
    def test_find_format_no_repository(self):
146
147
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
147
148
        self.assertRaises(errors.NoRepositoryPresent,
148
 
                          repository.RepositoryFormat.find_format,
 
149
                          repository.RepositoryFormatMetaDir.find_format,
149
150
                          dir)
150
151
 
 
152
    def test_from_string(self):
 
153
        self.assertIsInstance(
 
154
            SampleRepositoryFormat.from_string(
 
155
                "Sample .bzr repository format."),
 
156
            SampleRepositoryFormat)
 
157
        self.assertRaises(AssertionError,
 
158
            SampleRepositoryFormat.from_string,
 
159
                "Different .bzr repository format.")
 
160
 
151
161
    def test_find_format_unknown_format(self):
152
162
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
153
163
        SampleRepositoryFormat().initialize(dir)
154
164
        self.assertRaises(UnknownFormatError,
155
 
                          repository.RepositoryFormat.find_format,
 
165
                          repository.RepositoryFormatMetaDir.find_format,
156
166
                          dir)
157
167
 
158
 
    def test_register_unregister_format(self):
159
 
        # Test deprecated format registration functions
160
 
        format = SampleRepositoryFormat()
161
 
        # make a control dir
162
 
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
163
 
        # make a repo
164
 
        format.initialize(dir)
165
 
        # register a format for it.
166
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
167
 
            repository.RepositoryFormat.register_format, format)
168
 
        # which repository.Open will refuse (not supported)
169
 
        self.assertRaises(UnsupportedFormatError, repository.Repository.open,
170
 
            self.get_url())
171
 
        # but open(unsupported) will work
172
 
        self.assertEqual(format.open(dir), "opened repository.")
173
 
        # unregister the format
174
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
175
 
            repository.RepositoryFormat.unregister_format, format)
 
168
    def test_find_format_with_features(self):
 
169
        tree = self.make_branch_and_tree('.', format='2a')
 
170
        tree.branch.repository.update_feature_flags({"name": "necessity"})
 
171
        found_format = repository.RepositoryFormatMetaDir.find_format(tree.bzrdir)
 
172
        self.assertIsInstance(found_format, repository.RepositoryFormatMetaDir)
 
173
        self.assertEquals(found_format.features.get("name"), "necessity")
 
174
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
 
175
            True)
 
176
        self.addCleanup(repository.RepositoryFormatMetaDir.unregister_feature,
 
177
            "name")
 
178
        repository.RepositoryFormatMetaDir.register_feature("name")
 
179
        found_format.check_support_status(True)
176
180
 
177
181
 
178
182
class TestRepositoryFormatRegistry(TestCase):
209
213
        self.assertIsInstance(formats[0], SampleExtraRepositoryFormat)
210
214
 
211
215
 
212
 
class TestFormat6(TestCaseWithTransport):
213
 
 
214
 
    def test_attribute__fetch_order(self):
215
 
        """Weaves need topological data insertion."""
216
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
217
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
218
 
        self.assertEqual('topological', repo._format._fetch_order)
219
 
 
220
 
    def test_attribute__fetch_uses_deltas(self):
221
 
        """Weaves do not reuse deltas."""
222
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
223
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
224
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
225
 
 
226
 
    def test_attribute__fetch_reconcile(self):
227
 
        """Weave repositories need a reconcile after fetch."""
228
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
229
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
230
 
        self.assertEqual(True, repo._format._fetch_reconcile)
231
 
 
232
 
    def test_no_ancestry_weave(self):
233
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
234
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
235
 
        # We no longer need to create the ancestry.weave file
236
 
        # since it is *never* used.
237
 
        self.assertRaises(NoSuchFile,
238
 
                          control.transport.get,
239
 
                          'ancestry.weave')
240
 
 
241
 
    def test_supports_external_lookups(self):
242
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
243
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
244
 
        self.assertFalse(repo._format.supports_external_lookups)
245
 
 
246
 
 
247
 
class TestFormat7(TestCaseWithTransport):
248
 
 
249
 
    def test_attribute__fetch_order(self):
250
 
        """Weaves need topological data insertion."""
251
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
252
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
253
 
        self.assertEqual('topological', repo._format._fetch_order)
254
 
 
255
 
    def test_attribute__fetch_uses_deltas(self):
256
 
        """Weaves do not reuse deltas."""
257
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
258
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
259
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
260
 
 
261
 
    def test_attribute__fetch_reconcile(self):
262
 
        """Weave repositories need a reconcile after fetch."""
263
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
264
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
265
 
        self.assertEqual(True, repo._format._fetch_reconcile)
266
 
 
267
 
    def test_disk_layout(self):
268
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
269
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
270
 
        # in case of side effects of locking.
271
 
        repo.lock_write()
272
 
        repo.unlock()
273
 
        # we want:
274
 
        # format 'Bazaar-NG Repository format 7'
275
 
        # lock ''
276
 
        # inventory.weave == empty_weave
277
 
        # empty revision-store directory
278
 
        # empty weaves directory
279
 
        t = control.get_repository_transport(None)
280
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
281
 
                             t.get('format').read())
282
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
283
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
284
 
        self.assertEqualDiff('# bzr weave file v5\n'
285
 
                             'w\n'
286
 
                             'W\n',
287
 
                             t.get('inventory.weave').read())
288
 
        # Creating a file with id Foo:Bar results in a non-escaped file name on
289
 
        # disk.
290
 
        control.create_branch()
291
 
        tree = control.create_workingtree()
292
 
        tree.add(['foo'], ['Foo:Bar'], ['file'])
293
 
        tree.put_file_bytes_non_atomic('Foo:Bar', 'content\n')
294
 
        try:
295
 
            tree.commit('first post', rev_id='first')
296
 
        except errors.IllegalPath:
297
 
            if sys.platform != 'win32':
298
 
                raise
299
 
            self.knownFailure('Foo:Bar cannot be used as a file-id on windows'
300
 
                              ' in repo format 7')
301
 
            return
302
 
        self.assertEqualDiff(
303
 
            '# bzr weave file v5\n'
304
 
            'i\n'
305
 
            '1 7fe70820e08a1aac0ef224d9c66ab66831cc4ab1\n'
306
 
            'n first\n'
307
 
            '\n'
308
 
            'w\n'
309
 
            '{ 0\n'
310
 
            '. content\n'
311
 
            '}\n'
312
 
            'W\n',
313
 
            t.get('weaves/74/Foo%3ABar.weave').read())
314
 
 
315
 
    def test_shared_disk_layout(self):
316
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
317
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
318
 
        # we want:
319
 
        # format 'Bazaar-NG Repository format 7'
320
 
        # inventory.weave == empty_weave
321
 
        # empty revision-store directory
322
 
        # empty weaves directory
323
 
        # a 'shared-storage' marker file.
324
 
        # lock is not present when unlocked
325
 
        t = control.get_repository_transport(None)
326
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
327
 
                             t.get('format').read())
328
 
        self.assertEqualDiff('', t.get('shared-storage').read())
329
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
330
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
331
 
        self.assertEqualDiff('# bzr weave file v5\n'
332
 
                             'w\n'
333
 
                             'W\n',
334
 
                             t.get('inventory.weave').read())
335
 
        self.assertFalse(t.has('branch-lock'))
336
 
 
337
 
    def test_creates_lockdir(self):
338
 
        """Make sure it appears to be controlled by a LockDir existence"""
339
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
340
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
341
 
        t = control.get_repository_transport(None)
342
 
        # TODO: Should check there is a 'lock' toplevel directory,
343
 
        # regardless of contents
344
 
        self.assertFalse(t.has('lock/held/info'))
345
 
        repo.lock_write()
346
 
        try:
347
 
            self.assertTrue(t.has('lock/held/info'))
348
 
        finally:
349
 
            # unlock so we don't get a warning about failing to do so
350
 
            repo.unlock()
351
 
 
352
 
    def test_uses_lockdir(self):
353
 
        """repo format 7 actually locks on lockdir"""
354
 
        base_url = self.get_url()
355
 
        control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
356
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
357
 
        t = control.get_repository_transport(None)
358
 
        repo.lock_write()
359
 
        repo.unlock()
360
 
        del repo
361
 
        # make sure the same lock is created by opening it
362
 
        repo = repository.Repository.open(base_url)
363
 
        repo.lock_write()
364
 
        self.assertTrue(t.has('lock/held/info'))
365
 
        repo.unlock()
366
 
        self.assertFalse(t.has('lock/held/info'))
367
 
 
368
 
    def test_shared_no_tree_disk_layout(self):
369
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
370
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
371
 
        repo.set_make_working_trees(False)
372
 
        # we want:
373
 
        # format 'Bazaar-NG Repository format 7'
374
 
        # lock ''
375
 
        # inventory.weave == empty_weave
376
 
        # empty revision-store directory
377
 
        # empty weaves directory
378
 
        # a 'shared-storage' marker file.
379
 
        t = control.get_repository_transport(None)
380
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
381
 
                             t.get('format').read())
382
 
        ## self.assertEqualDiff('', t.get('lock').read())
383
 
        self.assertEqualDiff('', t.get('shared-storage').read())
384
 
        self.assertEqualDiff('', t.get('no-working-trees').read())
385
 
        repo.set_make_working_trees(True)
386
 
        self.assertFalse(t.has('no-working-trees'))
387
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
388
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
389
 
        self.assertEqualDiff('# bzr weave file v5\n'
390
 
                             'w\n'
391
 
                             'W\n',
392
 
                             t.get('inventory.weave').read())
393
 
 
394
 
    def test_supports_external_lookups(self):
395
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
396
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
397
 
        self.assertFalse(repo._format.supports_external_lookups)
398
 
 
399
 
 
400
216
class TestFormatKnit1(TestCaseWithTransport):
401
217
 
402
218
    def test_attribute__fetch_order(self):
403
219
        """Knits need topological data insertion."""
404
220
        repo = self.make_repository('.',
405
 
                format=bzrdir.format_registry.get('knit')())
 
221
                format=controldir.format_registry.get('knit')())
406
222
        self.assertEqual('topological', repo._format._fetch_order)
407
223
 
408
224
    def test_attribute__fetch_uses_deltas(self):
409
225
        """Knits reuse deltas."""
410
226
        repo = self.make_repository('.',
411
 
                format=bzrdir.format_registry.get('knit')())
 
227
                format=controldir.format_registry.get('knit')())
412
228
        self.assertEqual(True, repo._format._fetch_uses_deltas)
413
229
 
414
230
    def test_disk_layout(self):
500
316
        is valid when the api is not being abused.
501
317
        """
502
318
        repo = self.make_repository('.',
503
 
                format=bzrdir.format_registry.get('knit')())
 
319
                format=controldir.format_registry.get('knit')())
504
320
        inv_xml = '<inventory format="5">\n</inventory>\n'
505
321
        inv = repo._deserialise_inventory('test-rev-id', inv_xml)
506
322
        self.assertEqual('test-rev-id', inv.root.revision)
508
324
    def test_deserialise_uses_global_revision_id(self):
509
325
        """If it is set, then we re-use the global revision id"""
510
326
        repo = self.make_repository('.',
511
 
                format=bzrdir.format_registry.get('knit')())
 
327
                format=controldir.format_registry.get('knit')())
512
328
        inv_xml = ('<inventory format="5" revision_id="other-rev-id">\n'
513
329
                   '</inventory>\n')
514
330
        # Arguably, the deserialise_inventory should detect a mismatch, and
521
337
 
522
338
    def test_supports_external_lookups(self):
523
339
        repo = self.make_repository('.',
524
 
                format=bzrdir.format_registry.get('knit')())
 
340
                format=controldir.format_registry.get('knit')())
525
341
        self.assertFalse(repo._format.supports_external_lookups)
526
342
 
527
343
 
568
384
        # classes do not barf inappropriately when a surprising repository type
569
385
        # is handed to them.
570
386
        dummy_a = DummyRepository()
 
387
        dummy_a._format = RepositoryFormat()
 
388
        dummy_a._format.supports_full_versioned_files = True
571
389
        dummy_b = DummyRepository()
 
390
        dummy_b._format = RepositoryFormat()
 
391
        dummy_b._format.supports_full_versioned_files = True
572
392
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
573
393
 
574
394
    def assertGetsDefaultInterRepository(self, repo_a, repo_b):
578
398
        no actual sane default in the presence of incompatible data models.
579
399
        """
580
400
        inter_repo = repository.InterRepository.get(repo_a, repo_b)
581
 
        self.assertEqual(repository.InterSameDataRepository,
 
401
        self.assertEqual(vf_repository.InterSameDataRepository,
582
402
                         inter_repo.__class__)
583
403
        self.assertEqual(repo_a, inter_repo.source)
584
404
        self.assertEqual(repo_b, inter_repo.target)
598
418
        dummy_a._serializer = repo._serializer
599
419
        dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
600
420
        dummy_a._format.rich_root_data = repo._format.rich_root_data
 
421
        dummy_a._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
601
422
        dummy_b._serializer = repo._serializer
602
423
        dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
603
424
        dummy_b._format.rich_root_data = repo._format.rich_root_data
 
425
        dummy_b._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
604
426
        repository.InterRepository.register_optimiser(InterDummy)
605
427
        try:
606
428
            # we should get the default for something InterDummy returns False
619
441
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
620
442
 
621
443
 
622
 
class TestInterWeaveRepo(TestCaseWithTransport):
623
 
 
624
 
    def test_is_compatible_and_registered(self):
625
 
        # InterWeaveRepo is compatible when either side
626
 
        # is a format 5/6/7 branch
627
 
        from bzrlib.repofmt import knitrepo, weaverepo
628
 
        formats = [weaverepo.RepositoryFormat5(),
629
 
                   weaverepo.RepositoryFormat6(),
630
 
                   weaverepo.RepositoryFormat7()]
631
 
        incompatible_formats = [weaverepo.RepositoryFormat4(),
632
 
                                knitrepo.RepositoryFormatKnit1(),
633
 
                                ]
634
 
        repo_a = self.make_repository('a')
635
 
        repo_b = self.make_repository('b')
636
 
        is_compatible = weaverepo.InterWeaveRepo.is_compatible
637
 
        for source in incompatible_formats:
638
 
            # force incompatible left then right
639
 
            repo_a._format = source
640
 
            repo_b._format = formats[0]
641
 
            self.assertFalse(is_compatible(repo_a, repo_b))
642
 
            self.assertFalse(is_compatible(repo_b, repo_a))
643
 
        for source in formats:
644
 
            repo_a._format = source
645
 
            for target in formats:
646
 
                repo_b._format = target
647
 
                self.assertTrue(is_compatible(repo_a, repo_b))
648
 
        self.assertEqual(weaverepo.InterWeaveRepo,
649
 
                         repository.InterRepository.get(repo_a,
650
 
                                                        repo_b).__class__)
651
 
 
652
 
 
653
444
class TestRepositoryFormat1(knitrepo.RepositoryFormatKnit1):
654
445
 
655
 
    def get_format_string(self):
 
446
    @classmethod
 
447
    def get_format_string(cls):
656
448
        return "Test Format 1"
657
449
 
658
450
 
659
451
class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
660
452
 
661
 
    def get_format_string(self):
 
453
    @classmethod
 
454
    def get_format_string(cls):
662
455
        return "Test Format 2"
663
456
 
664
457
 
713
506
        revision_tree.lock_read()
714
507
        try:
715
508
            self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
716
 
                revision_tree.inventory.root.file_id)
 
509
                revision_tree.get_root_id())
717
510
        finally:
718
511
            revision_tree.unlock()
719
512
        format = bzrdir.BzrDirMetaFormat1()
723
516
        revision_tree = tree.branch.repository.revision_tree('dull')
724
517
        revision_tree.lock_read()
725
518
        try:
726
 
            revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
 
519
            revision_tree.get_file_lines(revision_tree.get_root_id())
727
520
        finally:
728
521
            revision_tree.unlock()
729
522
        tree.commit("Another dull commit", rev_id='dull2')
730
523
        revision_tree = tree.branch.repository.revision_tree('dull2')
731
524
        revision_tree.lock_read()
732
525
        self.addCleanup(revision_tree.unlock)
733
 
        self.assertEqual('dull', revision_tree.inventory.root.revision)
 
526
        self.assertEqual('dull',
 
527
                revision_tree.get_file_revision(revision_tree.get_root_id()))
734
528
 
735
529
    def test_supports_external_lookups(self):
736
530
        format = bzrdir.BzrDirMetaFormat1()
887
681
        target = self.make_repository('target', format='rich-root-pack')
888
682
        stream = source._get_source(target._format)
889
683
        # We don't want the child GroupCHKStreamSource
890
 
        self.assertIs(type(stream), repository.StreamSource)
 
684
        self.assertIs(type(stream), vf_repository.StreamSource)
891
685
 
892
686
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
893
687
        source_builder = self.make_branch_builder('source',
920
714
 
921
715
        # On a regular pass, getting the inventories and chk pages for rev-2
922
716
        # would only get the newly created chk pages
923
 
        search = graph.SearchResult(set(['rev-2']), set(['rev-1']), 1,
 
717
        search = vf_search.SearchResult(set(['rev-2']), set(['rev-1']), 1,
924
718
                                    set(['rev-2']))
925
719
        simple_chk_records = []
926
720
        for vf_name, substream in source.get_stream(search):
969
763
        source = self.make_repository('source', format='pack-0.92')
970
764
        target = self.make_repository('target', format='pack-0.92')
971
765
        stream_source = source._get_source(target._format)
972
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
766
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
973
767
 
974
768
    def test_source_to_exact_pack_rich_root_pack(self):
975
769
        source = self.make_repository('source', format='rich-root-pack')
976
770
        target = self.make_repository('target', format='rich-root-pack')
977
771
        stream_source = source._get_source(target._format)
978
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
772
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
979
773
 
980
774
    def test_source_to_exact_pack_19(self):
981
775
        source = self.make_repository('source', format='1.9')
982
776
        target = self.make_repository('target', format='1.9')
983
777
        stream_source = source._get_source(target._format)
984
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
778
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
985
779
 
986
780
    def test_source_to_exact_pack_19_rich_root(self):
987
781
        source = self.make_repository('source', format='1.9-rich-root')
988
782
        target = self.make_repository('target', format='1.9-rich-root')
989
783
        stream_source = source._get_source(target._format)
990
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
784
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
991
785
 
992
786
    def test_source_to_remote_exact_pack_19(self):
993
787
        trans = self.make_smart_server('target')
996
790
        target = self.make_repository('target', format='1.9')
997
791
        target = repository.Repository.open(trans.base)
998
792
        stream_source = source._get_source(target._format)
999
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
793
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
1000
794
 
1001
795
    def test_stream_source_to_non_exact(self):
1002
796
        source = self.make_repository('source', format='pack-0.92')
1003
797
        target = self.make_repository('target', format='1.9')
1004
798
        stream = source._get_source(target._format)
1005
 
        self.assertIs(type(stream), repository.StreamSource)
 
799
        self.assertIs(type(stream), vf_repository.StreamSource)
1006
800
 
1007
801
    def test_stream_source_to_non_exact_rich_root(self):
1008
802
        source = self.make_repository('source', format='1.9')
1009
803
        target = self.make_repository('target', format='1.9-rich-root')
1010
804
        stream = source._get_source(target._format)
1011
 
        self.assertIs(type(stream), repository.StreamSource)
 
805
        self.assertIs(type(stream), vf_repository.StreamSource)
1012
806
 
1013
807
    def test_source_to_remote_non_exact_pack_19(self):
1014
808
        trans = self.make_smart_server('target')
1017
811
        target = self.make_repository('target', format='1.6')
1018
812
        target = repository.Repository.open(trans.base)
1019
813
        stream_source = source._get_source(target._format)
1020
 
        self.assertIs(type(stream_source), repository.StreamSource)
 
814
        self.assertIs(type(stream_source), vf_repository.StreamSource)
1021
815
 
1022
816
    def test_stream_source_to_knit(self):
1023
817
        source = self.make_repository('source', format='pack-0.92')
1024
818
        target = self.make_repository('target', format='dirstate')
1025
819
        stream = source._get_source(target._format)
1026
 
        self.assertIs(type(stream), repository.StreamSource)
 
820
        self.assertIs(type(stream), vf_repository.StreamSource)
1027
821
 
1028
822
 
1029
823
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
1107
901
            revision = _mod_revision.Revision('rev1a',
1108
902
                committer='jrandom@example.com', timestamp=0,
1109
903
                inventory_sha1='', timezone=0, message='foo', parent_ids=[])
1110
 
            repo.add_revision('rev1a',revision, inv)
 
904
            repo.add_revision('rev1a', revision, inv)
1111
905
 
1112
906
            # make rev1b, which has no Revision, but has an Inventory, and
1113
907
            # file1
1148
942
        revision = _mod_revision.Revision(revision_id,
1149
943
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
1150
944
            timezone=0, message='foo', parent_ids=parent_ids)
1151
 
        repo.add_revision(revision_id,revision, inv)
 
945
        repo.add_revision(revision_id, revision, inv)
1152
946
 
1153
947
    def add_file(self, repo, inv, filename, revision, parents):
1154
948
        file_id = filename + '-id'
1182
976
class TestRepositoryPackCollection(TestCaseWithTransport):
1183
977
 
1184
978
    def get_format(self):
1185
 
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
 
979
        return controldir.format_registry.make_bzrdir('pack-0.92')
1186
980
 
1187
981
    def get_packs(self):
1188
982
        format = self.get_format()
1284
1078
            sorted(set([osutils.splitext(n)[0] for n in
1285
1079
                        packs._index_transport.list_dir('.')])))
1286
1080
 
 
1081
    def test__obsolete_packs_missing_directory(self):
 
1082
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1083
        r.control_transport.rmdir('obsolete_packs')
 
1084
        names = packs.names()
 
1085
        pack = packs.get_pack_by_name(names[0])
 
1086
        # Schedule this one for removal
 
1087
        packs._remove_pack_from_memory(pack)
 
1088
        # Now trigger the obsoletion, and ensure that all the remaining files
 
1089
        # are still renamed
 
1090
        packs._obsolete_packs([pack])
 
1091
        self.assertEqual([n + '.pack' for n in names[1:]],
 
1092
                         sorted(packs._pack_transport.list_dir('.')))
 
1093
        # names[0] should not be present in the index anymore
 
1094
        self.assertEqual(names[1:],
 
1095
            sorted(set([osutils.splitext(n)[0] for n in
 
1096
                        packs._index_transport.list_dir('.')])))
 
1097
 
1287
1098
    def test_pack_distribution_zero(self):
1288
1099
        packs = self.get_packs()
1289
1100
        self.assertEqual([0], packs.pack_distribution(0))
1559
1370
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1560
1371
        self.assertEqual([pack.name], sorted(obsolete_names))
1561
1372
 
 
1373
    def test_pack_no_obsolete_packs_directory(self):
 
1374
        """Bug #314314, don't fail if obsolete_packs directory does
 
1375
        not exist."""
 
1376
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1377
        r.control_transport.rmdir('obsolete_packs')
 
1378
        packs._clear_obsolete_packs()
1562
1379
 
1563
1380
 
1564
1381
class TestPack(TestCaseWithTransport):
1665
1482
        # Because of how they were built, they correspond to
1666
1483
        # ['D', 'C', 'B', 'A']
1667
1484
        packs = b.repository._pack_collection.packs
1668
 
        packer = pack_repo.Packer(b.repository._pack_collection,
 
1485
        packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
1669
1486
                                  packs, 'testing',
1670
1487
                                  revision_ids=['B', 'C'])
1671
1488
        # Now, when we are copying the B & C revisions, their pack files should
1685
1502
        return repo._pack_collection
1686
1503
 
1687
1504
    def test_open_pack_will_optimise(self):
1688
 
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
 
1505
        packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
1689
1506
                                            [], '.test')
1690
1507
        new_pack = packer.open_pack()
1691
1508
        self.addCleanup(new_pack.abort) # ensure cleanup
1696
1513
        self.assertTrue(new_pack.signature_index._optimize_for_size)
1697
1514
 
1698
1515
 
 
1516
class TestGCCHKPacker(TestCaseWithTransport):
 
1517
 
 
1518
    def make_abc_branch(self):
 
1519
        builder = self.make_branch_builder('source')
 
1520
        builder.start_series()
 
1521
        builder.build_snapshot('A', None, [
 
1522
            ('add', ('', 'root-id', 'directory', None)),
 
1523
            ('add', ('file', 'file-id', 'file', 'content\n')),
 
1524
            ])
 
1525
        builder.build_snapshot('B', ['A'], [
 
1526
            ('add', ('dir', 'dir-id', 'directory', None))])
 
1527
        builder.build_snapshot('C', ['B'], [
 
1528
            ('modify', ('file-id', 'new content\n'))])
 
1529
        builder.finish_series()
 
1530
        return builder.get_branch()
 
1531
 
 
1532
    def make_branch_with_disjoint_inventory_and_revision(self):
 
1533
        """a repo with separate packs for a revisions Revision and Inventory.
 
1534
 
 
1535
        There will be one pack file that holds the Revision content, and one
 
1536
        for the Inventory content.
 
1537
 
 
1538
        :return: (repository,
 
1539
                  pack_name_with_rev_A_Revision,
 
1540
                  pack_name_with_rev_A_Inventory,
 
1541
                  pack_name_with_rev_C_content)
 
1542
        """
 
1543
        b_source = self.make_abc_branch()
 
1544
        b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
 
1545
        b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
 
1546
        b_stacked.lock_write()
 
1547
        self.addCleanup(b_stacked.unlock)
 
1548
        b_stacked.fetch(b_source, 'B')
 
1549
        # Now re-open the stacked repo directly (no fallbacks) so that we can
 
1550
        # fill in the A rev.
 
1551
        repo_not_stacked = b_stacked.bzrdir.open_repository()
 
1552
        repo_not_stacked.lock_write()
 
1553
        self.addCleanup(repo_not_stacked.unlock)
 
1554
        # Now we should have a pack file with A's inventory, but not its
 
1555
        # Revision
 
1556
        self.assertEqual([('A',), ('B',)],
 
1557
                         sorted(repo_not_stacked.inventories.keys()))
 
1558
        self.assertEqual([('B',)],
 
1559
                         sorted(repo_not_stacked.revisions.keys()))
 
1560
        stacked_pack_names = repo_not_stacked._pack_collection.names()
 
1561
        # We have a couple names here, figure out which has A's inventory
 
1562
        for name in stacked_pack_names:
 
1563
            pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
 
1564
            keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
 
1565
            if ('A',) in keys:
 
1566
                inv_a_pack_name = name
 
1567
                break
 
1568
        else:
 
1569
            self.fail('Could not find pack containing A\'s inventory')
 
1570
        repo_not_stacked.fetch(b_source.repository, 'A')
 
1571
        self.assertEqual([('A',), ('B',)],
 
1572
                         sorted(repo_not_stacked.revisions.keys()))
 
1573
        new_pack_names = set(repo_not_stacked._pack_collection.names())
 
1574
        rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
 
1575
        self.assertEqual(1, len(rev_a_pack_names))
 
1576
        rev_a_pack_name = list(rev_a_pack_names)[0]
 
1577
        # Now fetch 'C', so we have a couple pack files to join
 
1578
        repo_not_stacked.fetch(b_source.repository, 'C')
 
1579
        rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
 
1580
        rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
 
1581
        self.assertEqual(1, len(rev_c_pack_names))
 
1582
        rev_c_pack_name = list(rev_c_pack_names)[0]
 
1583
        return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
 
1584
                rev_c_pack_name)
 
1585
 
 
1586
    def test_pack_with_distant_inventories(self):
 
1587
        # See https://bugs.launchpad.net/bzr/+bug/437003
 
1588
        # When repacking, it is possible to have an inventory in a different
 
1589
        # pack file than the associated revision. An autopack can then come
 
1590
        # along, and miss that inventory, and complain.
 
1591
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1592
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1593
        a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
 
1594
        c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
 
1595
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1596
                    [a_pack, c_pack], '.test-pack')
 
1597
        # This would raise ValueError in bug #437003, but should not raise an
 
1598
        # error once fixed.
 
1599
        packer.pack()
 
1600
 
 
1601
    def test_pack_with_missing_inventory(self):
 
1602
        # Similar to test_pack_with_missing_inventory, but this time, we force
 
1603
        # the A inventory to actually be gone from the repository.
 
1604
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1605
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1606
        inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
 
1607
        repo._pack_collection._remove_pack_from_memory(inv_a_pack)
 
1608
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1609
            repo._pack_collection.all_packs(), '.test-pack')
 
1610
        e = self.assertRaises(ValueError, packer.pack)
 
1611
        packer.new_pack.abort()
 
1612
        self.assertContainsRe(str(e),
 
1613
            r"We are missing inventories for revisions: .*'A'")
 
1614
 
 
1615
 
1699
1616
class TestCrossFormatPacks(TestCaseWithTransport):
1700
1617
 
1701
1618
    def log_pack(self, hint=None):
1716
1633
        self.addCleanup(target.unlock)
1717
1634
        source = source_tree.branch.repository._get_source(target._format)
1718
1635
        self.orig_pack = target.pack
1719
 
        target.pack = self.log_pack
 
1636
        self.overrideAttr(target, "pack", self.log_pack)
1720
1637
        search = target.search_missing_revision_ids(
1721
1638
            source_tree.branch.repository, revision_ids=[tip])
1722
1639
        stream = source.get_stream(search)
1740
1657
        self.addCleanup(target.unlock)
1741
1658
        source = source_tree.branch.repository
1742
1659
        self.orig_pack = target.pack
1743
 
        target.pack = self.log_pack
 
1660
        self.overrideAttr(target, "pack", self.log_pack)
1744
1661
        target.fetch(source)
1745
1662
        if expect_pack_called:
1746
1663
            self.assertLength(1, self.calls)
1774
1691
    def test_IDS_format_same_no(self):
1775
1692
        # When the formats are the same, pack is not called.
1776
1693
        self.run_fetch('2a', '2a', False)
 
1694
 
 
1695
 
 
1696
class Test_LazyListJoin(tests.TestCase):
 
1697
 
 
1698
    def test__repr__(self):
 
1699
        lazy = repository._LazyListJoin(['a'], ['b'])
 
1700
        self.assertEqual("bzrlib.repository._LazyListJoin((['a'], ['b']))",
 
1701
                         repr(lazy))
 
1702
 
 
1703
 
 
1704
class TestFeatures(tests.TestCaseWithTransport):
 
1705
 
 
1706
    def test_open_with_present_feature(self):
 
1707
        self.addCleanup(
 
1708
            repository.RepositoryFormatMetaDir.unregister_feature,
 
1709
            "makes-cheese-sandwich")
 
1710
        repository.RepositoryFormatMetaDir.register_feature(
 
1711
            "makes-cheese-sandwich")
 
1712
        repo = self.make_repository('.')
 
1713
        repo.lock_write()
 
1714
        repo._format.features["makes-cheese-sandwich"] = "required"
 
1715
        repo._format.check_support_status(False)
 
1716
        repo.unlock()
 
1717
 
 
1718
    def test_open_with_missing_required_feature(self):
 
1719
        repo = self.make_repository('.')
 
1720
        repo.lock_write()
 
1721
        repo._format.features["makes-cheese-sandwich"] = "required"
 
1722
        self.assertRaises(errors.MissingFeature,
 
1723
            repo._format.check_support_status, False)