← 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: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

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
 
from bzrlib.errors import (NoSuchFile,
30
 
                           UnknownFormatError,
31
 
                           UnsupportedFormatError,
32
 
                           )
 
28
from bzrlib.errors import (
 
29
    UnknownFormatError,
 
30
    UnsupportedFormatError,
 
31
    )
33
32
from bzrlib import (
34
33
    btree_index,
35
34
    graph,
 
35
    symbol_versioning,
36
36
    tests,
 
37
    transport,
37
38
    )
38
39
from bzrlib.btree_index import BTreeBuilder, BTreeGraphIndex
39
40
from bzrlib.index import GraphIndex
42
43
    TestCase,
43
44
    TestCaseWithTransport,
44
45
    )
45
 
from bzrlib.transport import (
46
 
    get_transport,
47
 
    )
48
46
from bzrlib import (
49
47
    bzrdir,
50
48
    errors,
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
 
69
68
    def test_get_set_default_format(self):
70
69
        old_default = bzrdir.format_registry.get('default')
71
70
        private_default = old_default().repository_format.__class__
72
 
        old_format = repository.RepositoryFormat.get_default_format()
 
71
        old_format = repository.format_registry.get_default()
73
72
        self.assertTrue(isinstance(old_format, private_default))
74
73
        def make_sample_bzrdir():
75
74
            my_bzrdir = bzrdir.BzrDirMetaFormat1()
89
88
            bzrdir.format_registry.remove('default')
90
89
            bzrdir.format_registry.remove('sample')
91
90
            bzrdir.format_registry.register('default', old_default, '')
92
 
        self.assertIsInstance(repository.RepositoryFormat.get_default_format(),
 
91
        self.assertIsInstance(repository.format_registry.get_default(),
93
92
                              old_format.__class__)
94
93
 
95
94
 
117
116
        return "opened repository."
118
117
 
119
118
 
 
119
class SampleExtraRepositoryFormat(repository.RepositoryFormat):
 
120
    """A sample format that can not be used in a metadir
 
121
 
 
122
    """
 
123
 
 
124
    def get_format_string(self):
 
125
        raise NotImplementedError
 
126
 
 
127
 
120
128
class TestRepositoryFormat(TestCaseWithTransport):
121
129
    """Tests for the Repository format detection used by the bzr meta dir facility.BzrBranchFormat facility."""
122
130
 
128
136
        def check_format(format, url):
129
137
            dir = format._matchingbzrdir.initialize(url)
130
138
            format.initialize(dir)
131
 
            t = get_transport(url)
 
139
            t = transport.get_transport(url)
132
140
            found_format = repository.RepositoryFormat.find_format(dir)
133
 
            self.failUnless(isinstance(found_format, format.__class__))
134
 
        check_format(weaverepo.RepositoryFormat7(), "bar")
 
141
            self.assertIsInstance(found_format, format.__class__)
 
142
        check_format(repository.format_registry.get_default(), "bar")
135
143
 
136
144
    def test_find_format_no_repository(self):
137
145
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
147
155
                          dir)
148
156
 
149
157
    def test_register_unregister_format(self):
 
158
        # Test deprecated format registration functions
150
159
        format = SampleRepositoryFormat()
151
160
        # make a control dir
152
161
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
153
162
        # make a repo
154
163
        format.initialize(dir)
155
164
        # register a format for it.
156
 
        repository.RepositoryFormat.register_format(format)
 
165
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
166
            repository.RepositoryFormat.register_format, format)
157
167
        # which repository.Open will refuse (not supported)
158
 
        self.assertRaises(UnsupportedFormatError, repository.Repository.open, self.get_url())
 
168
        self.assertRaises(UnsupportedFormatError, repository.Repository.open,
 
169
            self.get_url())
159
170
        # but open(unsupported) will work
160
171
        self.assertEqual(format.open(dir), "opened repository.")
161
172
        # unregister the format
162
 
        repository.RepositoryFormat.unregister_format(format)
163
 
 
164
 
 
165
 
class TestFormat6(TestCaseWithTransport):
166
 
 
167
 
    def test_attribute__fetch_order(self):
168
 
        """Weaves need topological data insertion."""
169
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
170
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
171
 
        self.assertEqual('topological', repo._format._fetch_order)
172
 
 
173
 
    def test_attribute__fetch_uses_deltas(self):
174
 
        """Weaves do not reuse deltas."""
175
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
176
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
177
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
178
 
 
179
 
    def test_attribute__fetch_reconcile(self):
180
 
        """Weave repositories need a reconcile after fetch."""
181
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
182
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
183
 
        self.assertEqual(True, repo._format._fetch_reconcile)
184
 
 
185
 
    def test_no_ancestry_weave(self):
186
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
187
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
188
 
        # We no longer need to create the ancestry.weave file
189
 
        # since it is *never* used.
190
 
        self.assertRaises(NoSuchFile,
191
 
                          control.transport.get,
192
 
                          'ancestry.weave')
193
 
 
194
 
    def test_supports_external_lookups(self):
195
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
196
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
197
 
        self.assertFalse(repo._format.supports_external_lookups)
198
 
 
199
 
 
200
 
class TestFormat7(TestCaseWithTransport):
201
 
 
202
 
    def test_attribute__fetch_order(self):
203
 
        """Weaves need topological data insertion."""
204
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
205
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
206
 
        self.assertEqual('topological', repo._format._fetch_order)
207
 
 
208
 
    def test_attribute__fetch_uses_deltas(self):
209
 
        """Weaves do not reuse deltas."""
210
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
211
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
212
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
213
 
 
214
 
    def test_attribute__fetch_reconcile(self):
215
 
        """Weave repositories need a reconcile after fetch."""
216
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
217
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
218
 
        self.assertEqual(True, repo._format._fetch_reconcile)
219
 
 
220
 
    def test_disk_layout(self):
221
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
222
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
223
 
        # in case of side effects of locking.
224
 
        repo.lock_write()
225
 
        repo.unlock()
226
 
        # we want:
227
 
        # format 'Bazaar-NG Repository format 7'
228
 
        # lock ''
229
 
        # inventory.weave == empty_weave
230
 
        # empty revision-store directory
231
 
        # empty weaves directory
232
 
        t = control.get_repository_transport(None)
233
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
234
 
                             t.get('format').read())
235
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
236
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
237
 
        self.assertEqualDiff('# bzr weave file v5\n'
238
 
                             'w\n'
239
 
                             'W\n',
240
 
                             t.get('inventory.weave').read())
241
 
        # Creating a file with id Foo:Bar results in a non-escaped file name on
242
 
        # disk.
243
 
        control.create_branch()
244
 
        tree = control.create_workingtree()
245
 
        tree.add(['foo'], ['Foo:Bar'], ['file'])
246
 
        tree.put_file_bytes_non_atomic('Foo:Bar', 'content\n')
247
 
        try:
248
 
            tree.commit('first post', rev_id='first')
249
 
        except errors.IllegalPath:
250
 
            if sys.platform != 'win32':
251
 
                raise
252
 
            self.knownFailure('Foo:Bar cannot be used as a file-id on windows'
253
 
                              ' in repo format 7')
254
 
            return
255
 
        self.assertEqualDiff(
256
 
            '# bzr weave file v5\n'
257
 
            'i\n'
258
 
            '1 7fe70820e08a1aac0ef224d9c66ab66831cc4ab1\n'
259
 
            'n first\n'
260
 
            '\n'
261
 
            'w\n'
262
 
            '{ 0\n'
263
 
            '. content\n'
264
 
            '}\n'
265
 
            'W\n',
266
 
            t.get('weaves/74/Foo%3ABar.weave').read())
267
 
 
268
 
    def test_shared_disk_layout(self):
269
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
270
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
271
 
        # we want:
272
 
        # format 'Bazaar-NG Repository format 7'
273
 
        # inventory.weave == empty_weave
274
 
        # empty revision-store directory
275
 
        # empty weaves directory
276
 
        # a 'shared-storage' marker file.
277
 
        # lock is not present when unlocked
278
 
        t = control.get_repository_transport(None)
279
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
280
 
                             t.get('format').read())
281
 
        self.assertEqualDiff('', t.get('shared-storage').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
 
        self.assertFalse(t.has('branch-lock'))
289
 
 
290
 
    def test_creates_lockdir(self):
291
 
        """Make sure it appears to be controlled by a LockDir existence"""
292
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
293
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
294
 
        t = control.get_repository_transport(None)
295
 
        # TODO: Should check there is a 'lock' toplevel directory,
296
 
        # regardless of contents
297
 
        self.assertFalse(t.has('lock/held/info'))
298
 
        repo.lock_write()
299
 
        try:
300
 
            self.assertTrue(t.has('lock/held/info'))
301
 
        finally:
302
 
            # unlock so we don't get a warning about failing to do so
303
 
            repo.unlock()
304
 
 
305
 
    def test_uses_lockdir(self):
306
 
        """repo format 7 actually locks on lockdir"""
307
 
        base_url = self.get_url()
308
 
        control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
309
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
310
 
        t = control.get_repository_transport(None)
311
 
        repo.lock_write()
312
 
        repo.unlock()
313
 
        del repo
314
 
        # make sure the same lock is created by opening it
315
 
        repo = repository.Repository.open(base_url)
316
 
        repo.lock_write()
317
 
        self.assertTrue(t.has('lock/held/info'))
318
 
        repo.unlock()
319
 
        self.assertFalse(t.has('lock/held/info'))
320
 
 
321
 
    def test_shared_no_tree_disk_layout(self):
322
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
323
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
324
 
        repo.set_make_working_trees(False)
325
 
        # we want:
326
 
        # format 'Bazaar-NG Repository format 7'
327
 
        # lock ''
328
 
        # inventory.weave == empty_weave
329
 
        # empty revision-store directory
330
 
        # empty weaves directory
331
 
        # a 'shared-storage' marker file.
332
 
        t = control.get_repository_transport(None)
333
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
334
 
                             t.get('format').read())
335
 
        ## self.assertEqualDiff('', t.get('lock').read())
336
 
        self.assertEqualDiff('', t.get('shared-storage').read())
337
 
        self.assertEqualDiff('', t.get('no-working-trees').read())
338
 
        repo.set_make_working_trees(True)
339
 
        self.assertFalse(t.has('no-working-trees'))
340
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
341
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
342
 
        self.assertEqualDiff('# bzr weave file v5\n'
343
 
                             'w\n'
344
 
                             'W\n',
345
 
                             t.get('inventory.weave').read())
346
 
 
347
 
    def test_supports_external_lookups(self):
348
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
349
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
350
 
        self.assertFalse(repo._format.supports_external_lookups)
 
173
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
174
            repository.RepositoryFormat.unregister_format, format)
 
175
 
 
176
 
 
177
class TestRepositoryFormatRegistry(TestCase):
 
178
 
 
179
    def setUp(self):
 
180
        super(TestRepositoryFormatRegistry, self).setUp()
 
181
        self.registry = repository.RepositoryFormatRegistry()
 
182
 
 
183
    def test_register_unregister_format(self):
 
184
        format = SampleRepositoryFormat()
 
185
        self.registry.register(format)
 
186
        self.assertEquals(format, self.registry.get("Sample .bzr repository format."))
 
187
        self.registry.remove(format)
 
188
        self.assertRaises(KeyError, self.registry.get, "Sample .bzr repository format.")
 
189
 
 
190
    def test_get_all(self):
 
191
        format = SampleRepositoryFormat()
 
192
        self.assertEquals([], self.registry._get_all())
 
193
        self.registry.register(format)
 
194
        self.assertEquals([format], self.registry._get_all())
 
195
 
 
196
    def test_register_extra(self):
 
197
        format = SampleExtraRepositoryFormat()
 
198
        self.assertEquals([], self.registry._get_all())
 
199
        self.registry.register_extra(format)
 
200
        self.assertEquals([format], self.registry._get_all())
 
201
 
 
202
    def test_register_extra_lazy(self):
 
203
        self.assertEquals([], self.registry._get_all())
 
204
        self.registry.register_extra_lazy("bzrlib.tests.test_repository",
 
205
            "SampleExtraRepositoryFormat")
 
206
        formats = self.registry._get_all()
 
207
        self.assertEquals(1, len(formats))
 
208
        self.assertIsInstance(formats[0], SampleExtraRepositoryFormat)
351
209
 
352
210
 
353
211
class TestFormatKnit1(TestCaseWithTransport):
521
379
        # classes do not barf inappropriately when a surprising repository type
522
380
        # is handed to them.
523
381
        dummy_a = DummyRepository()
 
382
        dummy_a._format = RepositoryFormat()
 
383
        dummy_a._format.supports_full_versioned_files = True
524
384
        dummy_b = DummyRepository()
 
385
        dummy_b._format = RepositoryFormat()
 
386
        dummy_b._format.supports_full_versioned_files = True
525
387
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
526
388
 
527
389
    def assertGetsDefaultInterRepository(self, repo_a, repo_b):
531
393
        no actual sane default in the presence of incompatible data models.
532
394
        """
533
395
        inter_repo = repository.InterRepository.get(repo_a, repo_b)
534
 
        self.assertEqual(repository.InterSameDataRepository,
 
396
        self.assertEqual(vf_repository.InterSameDataRepository,
535
397
                         inter_repo.__class__)
536
398
        self.assertEqual(repo_a, inter_repo.source)
537
399
        self.assertEqual(repo_b, inter_repo.target)
551
413
        dummy_a._serializer = repo._serializer
552
414
        dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
553
415
        dummy_a._format.rich_root_data = repo._format.rich_root_data
 
416
        dummy_a._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
554
417
        dummy_b._serializer = repo._serializer
555
418
        dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
556
419
        dummy_b._format.rich_root_data = repo._format.rich_root_data
 
420
        dummy_b._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
557
421
        repository.InterRepository.register_optimiser(InterDummy)
558
422
        try:
559
423
            # we should get the default for something InterDummy returns False
572
436
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
573
437
 
574
438
 
575
 
class TestInterWeaveRepo(TestCaseWithTransport):
576
 
 
577
 
    def test_is_compatible_and_registered(self):
578
 
        # InterWeaveRepo is compatible when either side
579
 
        # is a format 5/6/7 branch
580
 
        from bzrlib.repofmt import knitrepo, weaverepo
581
 
        formats = [weaverepo.RepositoryFormat5(),
582
 
                   weaverepo.RepositoryFormat6(),
583
 
                   weaverepo.RepositoryFormat7()]
584
 
        incompatible_formats = [weaverepo.RepositoryFormat4(),
585
 
                                knitrepo.RepositoryFormatKnit1(),
586
 
                                ]
587
 
        repo_a = self.make_repository('a')
588
 
        repo_b = self.make_repository('b')
589
 
        is_compatible = repository.InterWeaveRepo.is_compatible
590
 
        for source in incompatible_formats:
591
 
            # force incompatible left then right
592
 
            repo_a._format = source
593
 
            repo_b._format = formats[0]
594
 
            self.assertFalse(is_compatible(repo_a, repo_b))
595
 
            self.assertFalse(is_compatible(repo_b, repo_a))
596
 
        for source in formats:
597
 
            repo_a._format = source
598
 
            for target in formats:
599
 
                repo_b._format = target
600
 
                self.assertTrue(is_compatible(repo_a, repo_b))
601
 
        self.assertEqual(repository.InterWeaveRepo,
602
 
                         repository.InterRepository.get(repo_a,
603
 
                                                        repo_b).__class__)
 
439
class TestRepositoryFormat1(knitrepo.RepositoryFormatKnit1):
 
440
 
 
441
    def get_format_string(self):
 
442
        return "Test Format 1"
 
443
 
 
444
 
 
445
class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
 
446
 
 
447
    def get_format_string(self):
 
448
        return "Test Format 2"
604
449
 
605
450
 
606
451
class TestRepositoryConverter(TestCaseWithTransport):
607
452
 
608
453
    def test_convert_empty(self):
609
 
        t = get_transport(self.get_url('.'))
 
454
        source_format = TestRepositoryFormat1()
 
455
        target_format = TestRepositoryFormat2()
 
456
        repository.format_registry.register(source_format)
 
457
        self.addCleanup(repository.format_registry.remove,
 
458
            source_format)
 
459
        repository.format_registry.register(target_format)
 
460
        self.addCleanup(repository.format_registry.remove,
 
461
            target_format)
 
462
        t = self.get_transport()
610
463
        t.mkdir('repository')
611
464
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
612
 
        repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
613
 
        target_format = knitrepo.RepositoryFormatKnit1()
 
465
        repo = TestRepositoryFormat1().initialize(repo_dir)
614
466
        converter = repository.CopyConverter(target_format)
615
467
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
616
468
        try:
621
473
        self.assertTrue(isinstance(target_format, repo._format.__class__))
622
474
 
623
475
 
624
 
class TestMisc(TestCase):
625
 
 
626
 
    def test_unescape_xml(self):
627
 
        """We get some kind of error when malformed entities are passed"""
628
 
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;')
629
 
 
630
 
 
631
476
class TestRepositoryFormatKnit3(TestCaseWithTransport):
632
477
 
633
478
    def test_attribute__fetch_order(self):
828
673
        target = self.make_repository('target', format='rich-root-pack')
829
674
        stream = source._get_source(target._format)
830
675
        # We don't want the child GroupCHKStreamSource
831
 
        self.assertIs(type(stream), repository.StreamSource)
 
676
        self.assertIs(type(stream), vf_repository.StreamSource)
832
677
 
833
678
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
834
679
        source_builder = self.make_branch_builder('source',
910
755
        source = self.make_repository('source', format='pack-0.92')
911
756
        target = self.make_repository('target', format='pack-0.92')
912
757
        stream_source = source._get_source(target._format)
913
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
758
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
914
759
 
915
760
    def test_source_to_exact_pack_rich_root_pack(self):
916
761
        source = self.make_repository('source', format='rich-root-pack')
917
762
        target = self.make_repository('target', format='rich-root-pack')
918
763
        stream_source = source._get_source(target._format)
919
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
764
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
920
765
 
921
766
    def test_source_to_exact_pack_19(self):
922
767
        source = self.make_repository('source', format='1.9')
923
768
        target = self.make_repository('target', format='1.9')
924
769
        stream_source = source._get_source(target._format)
925
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
770
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
926
771
 
927
772
    def test_source_to_exact_pack_19_rich_root(self):
928
773
        source = self.make_repository('source', format='1.9-rich-root')
929
774
        target = self.make_repository('target', format='1.9-rich-root')
930
775
        stream_source = source._get_source(target._format)
931
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
776
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
932
777
 
933
778
    def test_source_to_remote_exact_pack_19(self):
934
779
        trans = self.make_smart_server('target')
937
782
        target = self.make_repository('target', format='1.9')
938
783
        target = repository.Repository.open(trans.base)
939
784
        stream_source = source._get_source(target._format)
940
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
785
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
941
786
 
942
787
    def test_stream_source_to_non_exact(self):
943
788
        source = self.make_repository('source', format='pack-0.92')
944
789
        target = self.make_repository('target', format='1.9')
945
790
        stream = source._get_source(target._format)
946
 
        self.assertIs(type(stream), repository.StreamSource)
 
791
        self.assertIs(type(stream), vf_repository.StreamSource)
947
792
 
948
793
    def test_stream_source_to_non_exact_rich_root(self):
949
794
        source = self.make_repository('source', format='1.9')
950
795
        target = self.make_repository('target', format='1.9-rich-root')
951
796
        stream = source._get_source(target._format)
952
 
        self.assertIs(type(stream), repository.StreamSource)
 
797
        self.assertIs(type(stream), vf_repository.StreamSource)
953
798
 
954
799
    def test_source_to_remote_non_exact_pack_19(self):
955
800
        trans = self.make_smart_server('target')
958
803
        target = self.make_repository('target', format='1.6')
959
804
        target = repository.Repository.open(trans.base)
960
805
        stream_source = source._get_source(target._format)
961
 
        self.assertIs(type(stream_source), repository.StreamSource)
 
806
        self.assertIs(type(stream_source), vf_repository.StreamSource)
962
807
 
963
808
    def test_stream_source_to_knit(self):
964
809
        source = self.make_repository('source', format='pack-0.92')
965
810
        target = self.make_repository('target', format='dirstate')
966
811
        stream = source._get_source(target._format)
967
 
        self.assertIs(type(stream), repository.StreamSource)
 
812
        self.assertIs(type(stream), vf_repository.StreamSource)
968
813
 
969
814
 
970
815
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
972
817
 
973
818
    def setUp(self):
974
819
        super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
975
 
        self.builder = self.make_branch_builder('source',
976
 
            format='development6-rich-root')
 
820
        self.builder = self.make_branch_builder('source')
977
821
        self.builder.start_series()
978
822
        self.builder.build_snapshot('initial', None,
979
823
            [('add', ('', 'tree-root', 'directory', None))])
1607
1451
        # Because of how they were built, they correspond to
1608
1452
        # ['D', 'C', 'B', 'A']
1609
1453
        packs = b.repository._pack_collection.packs
1610
 
        packer = pack_repo.Packer(b.repository._pack_collection,
 
1454
        packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
1611
1455
                                  packs, 'testing',
1612
1456
                                  revision_ids=['B', 'C'])
1613
1457
        # Now, when we are copying the B & C revisions, their pack files should
1627
1471
        return repo._pack_collection
1628
1472
 
1629
1473
    def test_open_pack_will_optimise(self):
1630
 
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
 
1474
        packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
1631
1475
                                            [], '.test')
1632
1476
        new_pack = packer.open_pack()
1633
1477
        self.addCleanup(new_pack.abort) # ensure cleanup
1638
1482
        self.assertTrue(new_pack.signature_index._optimize_for_size)
1639
1483
 
1640
1484
 
 
1485
class TestGCCHKPacker(TestCaseWithTransport):
 
1486
 
 
1487
    def make_abc_branch(self):
 
1488
        builder = self.make_branch_builder('source')
 
1489
        builder.start_series()
 
1490
        builder.build_snapshot('A', None, [
 
1491
            ('add', ('', 'root-id', 'directory', None)),
 
1492
            ('add', ('file', 'file-id', 'file', 'content\n')),
 
1493
            ])
 
1494
        builder.build_snapshot('B', ['A'], [
 
1495
            ('add', ('dir', 'dir-id', 'directory', None))])
 
1496
        builder.build_snapshot('C', ['B'], [
 
1497
            ('modify', ('file-id', 'new content\n'))])
 
1498
        builder.finish_series()
 
1499
        return builder.get_branch()
 
1500
 
 
1501
    def make_branch_with_disjoint_inventory_and_revision(self):
 
1502
        """a repo with separate packs for a revisions Revision and Inventory.
 
1503
 
 
1504
        There will be one pack file that holds the Revision content, and one
 
1505
        for the Inventory content.
 
1506
 
 
1507
        :return: (repository,
 
1508
                  pack_name_with_rev_A_Revision,
 
1509
                  pack_name_with_rev_A_Inventory,
 
1510
                  pack_name_with_rev_C_content)
 
1511
        """
 
1512
        b_source = self.make_abc_branch()
 
1513
        b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
 
1514
        b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
 
1515
        b_stacked.lock_write()
 
1516
        self.addCleanup(b_stacked.unlock)
 
1517
        b_stacked.fetch(b_source, 'B')
 
1518
        # Now re-open the stacked repo directly (no fallbacks) so that we can
 
1519
        # fill in the A rev.
 
1520
        repo_not_stacked = b_stacked.bzrdir.open_repository()
 
1521
        repo_not_stacked.lock_write()
 
1522
        self.addCleanup(repo_not_stacked.unlock)
 
1523
        # Now we should have a pack file with A's inventory, but not its
 
1524
        # Revision
 
1525
        self.assertEqual([('A',), ('B',)],
 
1526
                         sorted(repo_not_stacked.inventories.keys()))
 
1527
        self.assertEqual([('B',)],
 
1528
                         sorted(repo_not_stacked.revisions.keys()))
 
1529
        stacked_pack_names = repo_not_stacked._pack_collection.names()
 
1530
        # We have a couple names here, figure out which has A's inventory
 
1531
        for name in stacked_pack_names:
 
1532
            pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
 
1533
            keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
 
1534
            if ('A',) in keys:
 
1535
                inv_a_pack_name = name
 
1536
                break
 
1537
        else:
 
1538
            self.fail('Could not find pack containing A\'s inventory')
 
1539
        repo_not_stacked.fetch(b_source.repository, 'A')
 
1540
        self.assertEqual([('A',), ('B',)],
 
1541
                         sorted(repo_not_stacked.revisions.keys()))
 
1542
        new_pack_names = set(repo_not_stacked._pack_collection.names())
 
1543
        rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
 
1544
        self.assertEqual(1, len(rev_a_pack_names))
 
1545
        rev_a_pack_name = list(rev_a_pack_names)[0]
 
1546
        # Now fetch 'C', so we have a couple pack files to join
 
1547
        repo_not_stacked.fetch(b_source.repository, 'C')
 
1548
        rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
 
1549
        rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
 
1550
        self.assertEqual(1, len(rev_c_pack_names))
 
1551
        rev_c_pack_name = list(rev_c_pack_names)[0]
 
1552
        return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
 
1553
                rev_c_pack_name)
 
1554
 
 
1555
    def test_pack_with_distant_inventories(self):
 
1556
        # See https://bugs.launchpad.net/bzr/+bug/437003
 
1557
        # When repacking, it is possible to have an inventory in a different
 
1558
        # pack file than the associated revision. An autopack can then come
 
1559
        # along, and miss that inventory, and complain.
 
1560
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1561
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1562
        a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
 
1563
        c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
 
1564
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1565
                    [a_pack, c_pack], '.test-pack')
 
1566
        # This would raise ValueError in bug #437003, but should not raise an
 
1567
        # error once fixed.
 
1568
        packer.pack()
 
1569
 
 
1570
    def test_pack_with_missing_inventory(self):
 
1571
        # Similar to test_pack_with_missing_inventory, but this time, we force
 
1572
        # the A inventory to actually be gone from the repository.
 
1573
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1574
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1575
        inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
 
1576
        repo._pack_collection._remove_pack_from_memory(inv_a_pack)
 
1577
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1578
            repo._pack_collection.all_packs(), '.test-pack')
 
1579
        e = self.assertRaises(ValueError, packer.pack)
 
1580
        packer.new_pack.abort()
 
1581
        self.assertContainsRe(str(e),
 
1582
            r"We are missing inventories for revisions: .*'A'")
 
1583
 
 
1584
 
1641
1585
class TestCrossFormatPacks(TestCaseWithTransport):
1642
1586
 
1643
1587
    def log_pack(self, hint=None):
1660
1604
        self.orig_pack = target.pack
1661
1605
        target.pack = self.log_pack
1662
1606
        search = target.search_missing_revision_ids(
1663
 
            source_tree.branch.repository, tip)
 
1607
            source_tree.branch.repository, revision_ids=[tip])
1664
1608
        stream = source.get_stream(search)
1665
1609
        from_format = source_tree.branch.repository._format
1666
1610
        sink = target._get_sink()