← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

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
54
52
    revision as _mod_revision,
55
53
    upgrade,
56
54
    versionedfile,
 
55
    vf_repository,
57
56
    workingtree,
58
57
    )
59
58
from bzrlib.repofmt import (
60
59
    groupcompress_repo,
61
60
    knitrepo,
 
61
    knitpack_repo,
62
62
    pack_repo,
63
 
    weaverepo,
64
63
    )
65
64
 
66
65
 
93
92
                              old_format.__class__)
94
93
 
95
94
 
96
 
class SampleRepositoryFormat(repository.RepositoryFormat):
 
95
class SampleRepositoryFormat(repository.RepositoryFormatMetaDir):
97
96
    """A sample format
98
97
 
99
98
    this format is initializable, unsupported to aid in testing the
100
99
    open and open(unsupported=True) routines.
101
100
    """
102
101
 
103
 
    def get_format_string(self):
 
102
    @classmethod
 
103
    def get_format_string(cls):
104
104
        """See RepositoryFormat.get_format_string()."""
105
105
        return "Sample .bzr repository format."
106
106
 
137
137
        def check_format(format, url):
138
138
            dir = format._matchingbzrdir.initialize(url)
139
139
            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__))
143
 
        check_format(weaverepo.RepositoryFormat7(), "bar")
 
140
            t = transport.get_transport_from_path(url)
 
141
            found_format = repository.RepositoryFormatMetaDir.find_format(dir)
 
142
            self.assertIsInstance(found_format, format.__class__)
 
143
        check_format(repository.format_registry.get_default(), "bar")
144
144
 
145
145
    def test_find_format_no_repository(self):
146
146
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
147
147
        self.assertRaises(errors.NoRepositoryPresent,
148
 
                          repository.RepositoryFormat.find_format,
 
148
                          repository.RepositoryFormatMetaDir.find_format,
149
149
                          dir)
150
150
 
 
151
    def test_from_string(self):
 
152
        self.assertIsInstance(
 
153
            SampleRepositoryFormat.from_string(
 
154
                "Sample .bzr repository format."),
 
155
            SampleRepositoryFormat)
 
156
        self.assertRaises(AssertionError,
 
157
            SampleRepositoryFormat.from_string,
 
158
                "Different .bzr repository format.")
 
159
 
151
160
    def test_find_format_unknown_format(self):
152
161
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
153
162
        SampleRepositoryFormat().initialize(dir)
154
163
        self.assertRaises(UnknownFormatError,
155
 
                          repository.RepositoryFormat.find_format,
 
164
                          repository.RepositoryFormatMetaDir.find_format,
156
165
                          dir)
157
166
 
 
167
    def test_find_format_with_features(self):
 
168
        tree = self.make_branch_and_tree('.', format='2a')
 
169
        tree.branch.repository.update_feature_flags({"name": "necessity"})
 
170
        found_format = repository.RepositoryFormatMetaDir.find_format(tree.bzrdir)
 
171
        self.assertIsInstance(found_format, repository.RepositoryFormatMetaDir)
 
172
        self.assertEquals(found_format.features.get("name"), "necessity")
 
173
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
 
174
            True)
 
175
        self.addCleanup(repository.RepositoryFormatMetaDir.unregister_feature,
 
176
            "name")
 
177
        repository.RepositoryFormatMetaDir.register_feature("name")
 
178
        found_format.check_support_status(True)
 
179
 
158
180
    def test_register_unregister_format(self):
159
181
        # Test deprecated format registration functions
160
182
        format = SampleRepositoryFormat()
209
231
        self.assertIsInstance(formats[0], SampleExtraRepositoryFormat)
210
232
 
211
233
 
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
234
class TestFormatKnit1(TestCaseWithTransport):
401
235
 
402
236
    def test_attribute__fetch_order(self):
568
402
        # classes do not barf inappropriately when a surprising repository type
569
403
        # is handed to them.
570
404
        dummy_a = DummyRepository()
 
405
        dummy_a._format = RepositoryFormat()
 
406
        dummy_a._format.supports_full_versioned_files = True
571
407
        dummy_b = DummyRepository()
 
408
        dummy_b._format = RepositoryFormat()
 
409
        dummy_b._format.supports_full_versioned_files = True
572
410
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
573
411
 
574
412
    def assertGetsDefaultInterRepository(self, repo_a, repo_b):
578
416
        no actual sane default in the presence of incompatible data models.
579
417
        """
580
418
        inter_repo = repository.InterRepository.get(repo_a, repo_b)
581
 
        self.assertEqual(repository.InterSameDataRepository,
 
419
        self.assertEqual(vf_repository.InterSameDataRepository,
582
420
                         inter_repo.__class__)
583
421
        self.assertEqual(repo_a, inter_repo.source)
584
422
        self.assertEqual(repo_b, inter_repo.target)
598
436
        dummy_a._serializer = repo._serializer
599
437
        dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
600
438
        dummy_a._format.rich_root_data = repo._format.rich_root_data
 
439
        dummy_a._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
601
440
        dummy_b._serializer = repo._serializer
602
441
        dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
603
442
        dummy_b._format.rich_root_data = repo._format.rich_root_data
 
443
        dummy_b._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
604
444
        repository.InterRepository.register_optimiser(InterDummy)
605
445
        try:
606
446
            # we should get the default for something InterDummy returns False
619
459
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
620
460
 
621
461
 
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__)
 
462
class TestRepositoryFormat1(knitrepo.RepositoryFormatKnit1):
 
463
 
 
464
    @classmethod
 
465
    def get_format_string(cls):
 
466
        return "Test Format 1"
 
467
 
 
468
 
 
469
class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
 
470
 
 
471
    @classmethod
 
472
    def get_format_string(cls):
 
473
        return "Test Format 2"
651
474
 
652
475
 
653
476
class TestRepositoryConverter(TestCaseWithTransport):
654
477
 
655
478
    def test_convert_empty(self):
 
479
        source_format = TestRepositoryFormat1()
 
480
        target_format = TestRepositoryFormat2()
 
481
        repository.format_registry.register(source_format)
 
482
        self.addCleanup(repository.format_registry.remove,
 
483
            source_format)
 
484
        repository.format_registry.register(target_format)
 
485
        self.addCleanup(repository.format_registry.remove,
 
486
            target_format)
656
487
        t = self.get_transport()
657
488
        t.mkdir('repository')
658
489
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
659
 
        repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
660
 
        target_format = knitrepo.RepositoryFormatKnit1()
 
490
        repo = TestRepositoryFormat1().initialize(repo_dir)
661
491
        converter = repository.CopyConverter(target_format)
662
492
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
663
493
        try:
668
498
        self.assertTrue(isinstance(target_format, repo._format.__class__))
669
499
 
670
500
 
671
 
class TestMisc(TestCase):
672
 
 
673
 
    def test_unescape_xml(self):
674
 
        """We get some kind of error when malformed entities are passed"""
675
 
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;')
676
 
 
677
 
 
678
501
class TestRepositoryFormatKnit3(TestCaseWithTransport):
679
502
 
680
503
    def test_attribute__fetch_order(self):
701
524
        revision_tree.lock_read()
702
525
        try:
703
526
            self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
704
 
                revision_tree.inventory.root.file_id)
 
527
                revision_tree.get_root_id())
705
528
        finally:
706
529
            revision_tree.unlock()
707
530
        format = bzrdir.BzrDirMetaFormat1()
711
534
        revision_tree = tree.branch.repository.revision_tree('dull')
712
535
        revision_tree.lock_read()
713
536
        try:
714
 
            revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
 
537
            revision_tree.get_file_lines(revision_tree.get_root_id())
715
538
        finally:
716
539
            revision_tree.unlock()
717
540
        tree.commit("Another dull commit", rev_id='dull2')
718
541
        revision_tree = tree.branch.repository.revision_tree('dull2')
719
542
        revision_tree.lock_read()
720
543
        self.addCleanup(revision_tree.unlock)
721
 
        self.assertEqual('dull', revision_tree.inventory.root.revision)
 
544
        self.assertEqual('dull',
 
545
                revision_tree.get_file_revision(revision_tree.get_root_id()))
722
546
 
723
547
    def test_supports_external_lookups(self):
724
548
        format = bzrdir.BzrDirMetaFormat1()
875
699
        target = self.make_repository('target', format='rich-root-pack')
876
700
        stream = source._get_source(target._format)
877
701
        # We don't want the child GroupCHKStreamSource
878
 
        self.assertIs(type(stream), repository.StreamSource)
 
702
        self.assertIs(type(stream), vf_repository.StreamSource)
879
703
 
880
704
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
881
705
        source_builder = self.make_branch_builder('source',
908
732
 
909
733
        # On a regular pass, getting the inventories and chk pages for rev-2
910
734
        # would only get the newly created chk pages
911
 
        search = graph.SearchResult(set(['rev-2']), set(['rev-1']), 1,
 
735
        search = vf_search.SearchResult(set(['rev-2']), set(['rev-1']), 1,
912
736
                                    set(['rev-2']))
913
737
        simple_chk_records = []
914
738
        for vf_name, substream in source.get_stream(search):
957
781
        source = self.make_repository('source', format='pack-0.92')
958
782
        target = self.make_repository('target', format='pack-0.92')
959
783
        stream_source = source._get_source(target._format)
960
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
784
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
961
785
 
962
786
    def test_source_to_exact_pack_rich_root_pack(self):
963
787
        source = self.make_repository('source', format='rich-root-pack')
964
788
        target = self.make_repository('target', format='rich-root-pack')
965
789
        stream_source = source._get_source(target._format)
966
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
790
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
967
791
 
968
792
    def test_source_to_exact_pack_19(self):
969
793
        source = self.make_repository('source', format='1.9')
970
794
        target = self.make_repository('target', format='1.9')
971
795
        stream_source = source._get_source(target._format)
972
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
796
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
973
797
 
974
798
    def test_source_to_exact_pack_19_rich_root(self):
975
799
        source = self.make_repository('source', format='1.9-rich-root')
976
800
        target = self.make_repository('target', format='1.9-rich-root')
977
801
        stream_source = source._get_source(target._format)
978
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
802
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
979
803
 
980
804
    def test_source_to_remote_exact_pack_19(self):
981
805
        trans = self.make_smart_server('target')
984
808
        target = self.make_repository('target', format='1.9')
985
809
        target = repository.Repository.open(trans.base)
986
810
        stream_source = source._get_source(target._format)
987
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
811
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
988
812
 
989
813
    def test_stream_source_to_non_exact(self):
990
814
        source = self.make_repository('source', format='pack-0.92')
991
815
        target = self.make_repository('target', format='1.9')
992
816
        stream = source._get_source(target._format)
993
 
        self.assertIs(type(stream), repository.StreamSource)
 
817
        self.assertIs(type(stream), vf_repository.StreamSource)
994
818
 
995
819
    def test_stream_source_to_non_exact_rich_root(self):
996
820
        source = self.make_repository('source', format='1.9')
997
821
        target = self.make_repository('target', format='1.9-rich-root')
998
822
        stream = source._get_source(target._format)
999
 
        self.assertIs(type(stream), repository.StreamSource)
 
823
        self.assertIs(type(stream), vf_repository.StreamSource)
1000
824
 
1001
825
    def test_source_to_remote_non_exact_pack_19(self):
1002
826
        trans = self.make_smart_server('target')
1005
829
        target = self.make_repository('target', format='1.6')
1006
830
        target = repository.Repository.open(trans.base)
1007
831
        stream_source = source._get_source(target._format)
1008
 
        self.assertIs(type(stream_source), repository.StreamSource)
 
832
        self.assertIs(type(stream_source), vf_repository.StreamSource)
1009
833
 
1010
834
    def test_stream_source_to_knit(self):
1011
835
        source = self.make_repository('source', format='pack-0.92')
1012
836
        target = self.make_repository('target', format='dirstate')
1013
837
        stream = source._get_source(target._format)
1014
 
        self.assertIs(type(stream), repository.StreamSource)
 
838
        self.assertIs(type(stream), vf_repository.StreamSource)
1015
839
 
1016
840
 
1017
841
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
1095
919
            revision = _mod_revision.Revision('rev1a',
1096
920
                committer='jrandom@example.com', timestamp=0,
1097
921
                inventory_sha1='', timezone=0, message='foo', parent_ids=[])
1098
 
            repo.add_revision('rev1a',revision, inv)
 
922
            repo.add_revision('rev1a', revision, inv)
1099
923
 
1100
924
            # make rev1b, which has no Revision, but has an Inventory, and
1101
925
            # file1
1136
960
        revision = _mod_revision.Revision(revision_id,
1137
961
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
1138
962
            timezone=0, message='foo', parent_ids=parent_ids)
1139
 
        repo.add_revision(revision_id,revision, inv)
 
963
        repo.add_revision(revision_id, revision, inv)
1140
964
 
1141
965
    def add_file(self, repo, inv, filename, revision, parents):
1142
966
        file_id = filename + '-id'
1272
1096
            sorted(set([osutils.splitext(n)[0] for n in
1273
1097
                        packs._index_transport.list_dir('.')])))
1274
1098
 
 
1099
    def test__obsolete_packs_missing_directory(self):
 
1100
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1101
        r.control_transport.rmdir('obsolete_packs')
 
1102
        names = packs.names()
 
1103
        pack = packs.get_pack_by_name(names[0])
 
1104
        # Schedule this one for removal
 
1105
        packs._remove_pack_from_memory(pack)
 
1106
        # Now trigger the obsoletion, and ensure that all the remaining files
 
1107
        # are still renamed
 
1108
        packs._obsolete_packs([pack])
 
1109
        self.assertEqual([n + '.pack' for n in names[1:]],
 
1110
                         sorted(packs._pack_transport.list_dir('.')))
 
1111
        # names[0] should not be present in the index anymore
 
1112
        self.assertEqual(names[1:],
 
1113
            sorted(set([osutils.splitext(n)[0] for n in
 
1114
                        packs._index_transport.list_dir('.')])))
 
1115
 
1275
1116
    def test_pack_distribution_zero(self):
1276
1117
        packs = self.get_packs()
1277
1118
        self.assertEqual([0], packs.pack_distribution(0))
1547
1388
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1548
1389
        self.assertEqual([pack.name], sorted(obsolete_names))
1549
1390
 
 
1391
    def test_pack_no_obsolete_packs_directory(self):
 
1392
        """Bug #314314, don't fail if obsolete_packs directory does
 
1393
        not exist."""
 
1394
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1395
        r.control_transport.rmdir('obsolete_packs')
 
1396
        packs._clear_obsolete_packs()
1550
1397
 
1551
1398
 
1552
1399
class TestPack(TestCaseWithTransport):
1653
1500
        # Because of how they were built, they correspond to
1654
1501
        # ['D', 'C', 'B', 'A']
1655
1502
        packs = b.repository._pack_collection.packs
1656
 
        packer = pack_repo.Packer(b.repository._pack_collection,
 
1503
        packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
1657
1504
                                  packs, 'testing',
1658
1505
                                  revision_ids=['B', 'C'])
1659
1506
        # Now, when we are copying the B & C revisions, their pack files should
1673
1520
        return repo._pack_collection
1674
1521
 
1675
1522
    def test_open_pack_will_optimise(self):
1676
 
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
 
1523
        packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
1677
1524
                                            [], '.test')
1678
1525
        new_pack = packer.open_pack()
1679
1526
        self.addCleanup(new_pack.abort) # ensure cleanup
1684
1531
        self.assertTrue(new_pack.signature_index._optimize_for_size)
1685
1532
 
1686
1533
 
 
1534
class TestGCCHKPacker(TestCaseWithTransport):
 
1535
 
 
1536
    def make_abc_branch(self):
 
1537
        builder = self.make_branch_builder('source')
 
1538
        builder.start_series()
 
1539
        builder.build_snapshot('A', None, [
 
1540
            ('add', ('', 'root-id', 'directory', None)),
 
1541
            ('add', ('file', 'file-id', 'file', 'content\n')),
 
1542
            ])
 
1543
        builder.build_snapshot('B', ['A'], [
 
1544
            ('add', ('dir', 'dir-id', 'directory', None))])
 
1545
        builder.build_snapshot('C', ['B'], [
 
1546
            ('modify', ('file-id', 'new content\n'))])
 
1547
        builder.finish_series()
 
1548
        return builder.get_branch()
 
1549
 
 
1550
    def make_branch_with_disjoint_inventory_and_revision(self):
 
1551
        """a repo with separate packs for a revisions Revision and Inventory.
 
1552
 
 
1553
        There will be one pack file that holds the Revision content, and one
 
1554
        for the Inventory content.
 
1555
 
 
1556
        :return: (repository,
 
1557
                  pack_name_with_rev_A_Revision,
 
1558
                  pack_name_with_rev_A_Inventory,
 
1559
                  pack_name_with_rev_C_content)
 
1560
        """
 
1561
        b_source = self.make_abc_branch()
 
1562
        b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
 
1563
        b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
 
1564
        b_stacked.lock_write()
 
1565
        self.addCleanup(b_stacked.unlock)
 
1566
        b_stacked.fetch(b_source, 'B')
 
1567
        # Now re-open the stacked repo directly (no fallbacks) so that we can
 
1568
        # fill in the A rev.
 
1569
        repo_not_stacked = b_stacked.bzrdir.open_repository()
 
1570
        repo_not_stacked.lock_write()
 
1571
        self.addCleanup(repo_not_stacked.unlock)
 
1572
        # Now we should have a pack file with A's inventory, but not its
 
1573
        # Revision
 
1574
        self.assertEqual([('A',), ('B',)],
 
1575
                         sorted(repo_not_stacked.inventories.keys()))
 
1576
        self.assertEqual([('B',)],
 
1577
                         sorted(repo_not_stacked.revisions.keys()))
 
1578
        stacked_pack_names = repo_not_stacked._pack_collection.names()
 
1579
        # We have a couple names here, figure out which has A's inventory
 
1580
        for name in stacked_pack_names:
 
1581
            pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
 
1582
            keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
 
1583
            if ('A',) in keys:
 
1584
                inv_a_pack_name = name
 
1585
                break
 
1586
        else:
 
1587
            self.fail('Could not find pack containing A\'s inventory')
 
1588
        repo_not_stacked.fetch(b_source.repository, 'A')
 
1589
        self.assertEqual([('A',), ('B',)],
 
1590
                         sorted(repo_not_stacked.revisions.keys()))
 
1591
        new_pack_names = set(repo_not_stacked._pack_collection.names())
 
1592
        rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
 
1593
        self.assertEqual(1, len(rev_a_pack_names))
 
1594
        rev_a_pack_name = list(rev_a_pack_names)[0]
 
1595
        # Now fetch 'C', so we have a couple pack files to join
 
1596
        repo_not_stacked.fetch(b_source.repository, 'C')
 
1597
        rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
 
1598
        rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
 
1599
        self.assertEqual(1, len(rev_c_pack_names))
 
1600
        rev_c_pack_name = list(rev_c_pack_names)[0]
 
1601
        return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
 
1602
                rev_c_pack_name)
 
1603
 
 
1604
    def test_pack_with_distant_inventories(self):
 
1605
        # See https://bugs.launchpad.net/bzr/+bug/437003
 
1606
        # When repacking, it is possible to have an inventory in a different
 
1607
        # pack file than the associated revision. An autopack can then come
 
1608
        # along, and miss that inventory, and complain.
 
1609
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1610
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1611
        a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
 
1612
        c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
 
1613
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1614
                    [a_pack, c_pack], '.test-pack')
 
1615
        # This would raise ValueError in bug #437003, but should not raise an
 
1616
        # error once fixed.
 
1617
        packer.pack()
 
1618
 
 
1619
    def test_pack_with_missing_inventory(self):
 
1620
        # Similar to test_pack_with_missing_inventory, but this time, we force
 
1621
        # the A inventory to actually be gone from the repository.
 
1622
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1623
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1624
        inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
 
1625
        repo._pack_collection._remove_pack_from_memory(inv_a_pack)
 
1626
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1627
            repo._pack_collection.all_packs(), '.test-pack')
 
1628
        e = self.assertRaises(ValueError, packer.pack)
 
1629
        packer.new_pack.abort()
 
1630
        self.assertContainsRe(str(e),
 
1631
            r"We are missing inventories for revisions: .*'A'")
 
1632
 
 
1633
 
1687
1634
class TestCrossFormatPacks(TestCaseWithTransport):
1688
1635
 
1689
1636
    def log_pack(self, hint=None):
1704
1651
        self.addCleanup(target.unlock)
1705
1652
        source = source_tree.branch.repository._get_source(target._format)
1706
1653
        self.orig_pack = target.pack
1707
 
        target.pack = self.log_pack
 
1654
        self.overrideAttr(target, "pack", self.log_pack)
1708
1655
        search = target.search_missing_revision_ids(
1709
1656
            source_tree.branch.repository, revision_ids=[tip])
1710
1657
        stream = source.get_stream(search)
1728
1675
        self.addCleanup(target.unlock)
1729
1676
        source = source_tree.branch.repository
1730
1677
        self.orig_pack = target.pack
1731
 
        target.pack = self.log_pack
 
1678
        self.overrideAttr(target, "pack", self.log_pack)
1732
1679
        target.fetch(source)
1733
1680
        if expect_pack_called:
1734
1681
            self.assertLength(1, self.calls)
1762
1709
    def test_IDS_format_same_no(self):
1763
1710
        # When the formats are the same, pack is not called.
1764
1711
        self.run_fetch('2a', '2a', False)
 
1712
 
 
1713
 
 
1714
class Test_LazyListJoin(tests.TestCase):
 
1715
 
 
1716
    def test__repr__(self):
 
1717
        lazy = repository._LazyListJoin(['a'], ['b'])
 
1718
        self.assertEqual("bzrlib.repository._LazyListJoin((['a'], ['b']))",
 
1719
                         repr(lazy))
 
1720
 
 
1721
 
 
1722
class TestFeatures(tests.TestCaseWithTransport):
 
1723
 
 
1724
    def test_open_with_present_feature(self):
 
1725
        self.addCleanup(
 
1726
            repository.RepositoryFormatMetaDir.unregister_feature,
 
1727
            "makes-cheese-sandwich")
 
1728
        repository.RepositoryFormatMetaDir.register_feature(
 
1729
            "makes-cheese-sandwich")
 
1730
        repo = self.make_repository('.')
 
1731
        repo.lock_write()
 
1732
        repo._format.features["makes-cheese-sandwich"] = "required"
 
1733
        repo._format.check_support_status(False)
 
1734
        repo.unlock()
 
1735
 
 
1736
    def test_open_with_missing_required_feature(self):
 
1737
        repo = self.make_repository('.')
 
1738
        repo.lock_write()
 
1739
        repo._format.features["makes-cheese-sandwich"] = "required"
 
1740
        self.assertRaises(errors.MissingFeature,
 
1741
            repo._format.check_support_status, False)