/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
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
37
    transport,
38
38
    )
52
52
    revision as _mod_revision,
53
53
    upgrade,
54
54
    versionedfile,
 
55
    vf_repository,
55
56
    workingtree,
56
57
    )
57
58
from bzrlib.repofmt import (
58
59
    groupcompress_repo,
59
60
    knitrepo,
 
61
    knitpack_repo,
60
62
    pack_repo,
61
 
    weaverepo,
62
63
    )
63
64
 
64
65
 
67
68
    def test_get_set_default_format(self):
68
69
        old_default = bzrdir.format_registry.get('default')
69
70
        private_default = old_default().repository_format.__class__
70
 
        old_format = repository.RepositoryFormat.get_default_format()
 
71
        old_format = repository.format_registry.get_default()
71
72
        self.assertTrue(isinstance(old_format, private_default))
72
73
        def make_sample_bzrdir():
73
74
            my_bzrdir = bzrdir.BzrDirMetaFormat1()
87
88
            bzrdir.format_registry.remove('default')
88
89
            bzrdir.format_registry.remove('sample')
89
90
            bzrdir.format_registry.register('default', old_default, '')
90
 
        self.assertIsInstance(repository.RepositoryFormat.get_default_format(),
 
91
        self.assertIsInstance(repository.format_registry.get_default(),
91
92
                              old_format.__class__)
92
93
 
93
94
 
115
116
        return "opened repository."
116
117
 
117
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
 
118
128
class TestRepositoryFormat(TestCaseWithTransport):
119
129
    """Tests for the Repository format detection used by the bzr meta dir facility.BzrBranchFormat facility."""
120
130
 
129
139
            t = transport.get_transport(url)
130
140
            found_format = repository.RepositoryFormat.find_format(dir)
131
141
            self.assertIsInstance(found_format, format.__class__)
132
 
        check_format(weaverepo.RepositoryFormat7(), "bar")
 
142
        check_format(repository.format_registry.get_default(), "bar")
133
143
 
134
144
    def test_find_format_no_repository(self):
135
145
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
145
155
                          dir)
146
156
 
147
157
    def test_register_unregister_format(self):
 
158
        # Test deprecated format registration functions
148
159
        format = SampleRepositoryFormat()
149
160
        # make a control dir
150
161
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
151
162
        # make a repo
152
163
        format.initialize(dir)
153
164
        # register a format for it.
154
 
        repository.RepositoryFormat.register_format(format)
 
165
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
166
            repository.RepositoryFormat.register_format, format)
155
167
        # which repository.Open will refuse (not supported)
156
 
        self.assertRaises(UnsupportedFormatError, repository.Repository.open, self.get_url())
 
168
        self.assertRaises(UnsupportedFormatError, repository.Repository.open,
 
169
            self.get_url())
157
170
        # but open(unsupported) will work
158
171
        self.assertEqual(format.open(dir), "opened repository.")
159
172
        # unregister the format
160
 
        repository.RepositoryFormat.unregister_format(format)
161
 
 
162
 
 
163
 
class TestFormat6(TestCaseWithTransport):
164
 
 
165
 
    def test_attribute__fetch_order(self):
166
 
        """Weaves need topological data insertion."""
167
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
168
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
169
 
        self.assertEqual('topological', repo._format._fetch_order)
170
 
 
171
 
    def test_attribute__fetch_uses_deltas(self):
172
 
        """Weaves do not reuse deltas."""
173
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
174
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
175
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
176
 
 
177
 
    def test_attribute__fetch_reconcile(self):
178
 
        """Weave repositories need a reconcile after fetch."""
179
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
180
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
181
 
        self.assertEqual(True, repo._format._fetch_reconcile)
182
 
 
183
 
    def test_no_ancestry_weave(self):
184
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
185
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
186
 
        # We no longer need to create the ancestry.weave file
187
 
        # since it is *never* used.
188
 
        self.assertRaises(NoSuchFile,
189
 
                          control.transport.get,
190
 
                          'ancestry.weave')
191
 
 
192
 
    def test_supports_external_lookups(self):
193
 
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
194
 
        repo = weaverepo.RepositoryFormat6().initialize(control)
195
 
        self.assertFalse(repo._format.supports_external_lookups)
196
 
 
197
 
 
198
 
class TestFormat7(TestCaseWithTransport):
199
 
 
200
 
    def test_attribute__fetch_order(self):
201
 
        """Weaves need topological data insertion."""
202
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
203
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
204
 
        self.assertEqual('topological', repo._format._fetch_order)
205
 
 
206
 
    def test_attribute__fetch_uses_deltas(self):
207
 
        """Weaves do not reuse deltas."""
208
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
209
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
210
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
211
 
 
212
 
    def test_attribute__fetch_reconcile(self):
213
 
        """Weave repositories need a reconcile after fetch."""
214
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
215
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
216
 
        self.assertEqual(True, repo._format._fetch_reconcile)
217
 
 
218
 
    def test_disk_layout(self):
219
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
220
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
221
 
        # in case of side effects of locking.
222
 
        repo.lock_write()
223
 
        repo.unlock()
224
 
        # we want:
225
 
        # format 'Bazaar-NG Repository format 7'
226
 
        # lock ''
227
 
        # inventory.weave == empty_weave
228
 
        # empty revision-store directory
229
 
        # empty weaves directory
230
 
        t = control.get_repository_transport(None)
231
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
232
 
                             t.get('format').read())
233
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
234
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
235
 
        self.assertEqualDiff('# bzr weave file v5\n'
236
 
                             'w\n'
237
 
                             'W\n',
238
 
                             t.get('inventory.weave').read())
239
 
        # Creating a file with id Foo:Bar results in a non-escaped file name on
240
 
        # disk.
241
 
        control.create_branch()
242
 
        tree = control.create_workingtree()
243
 
        tree.add(['foo'], ['Foo:Bar'], ['file'])
244
 
        tree.put_file_bytes_non_atomic('Foo:Bar', 'content\n')
245
 
        try:
246
 
            tree.commit('first post', rev_id='first')
247
 
        except errors.IllegalPath:
248
 
            if sys.platform != 'win32':
249
 
                raise
250
 
            self.knownFailure('Foo:Bar cannot be used as a file-id on windows'
251
 
                              ' in repo format 7')
252
 
            return
253
 
        self.assertEqualDiff(
254
 
            '# bzr weave file v5\n'
255
 
            'i\n'
256
 
            '1 7fe70820e08a1aac0ef224d9c66ab66831cc4ab1\n'
257
 
            'n first\n'
258
 
            '\n'
259
 
            'w\n'
260
 
            '{ 0\n'
261
 
            '. content\n'
262
 
            '}\n'
263
 
            'W\n',
264
 
            t.get('weaves/74/Foo%3ABar.weave').read())
265
 
 
266
 
    def test_shared_disk_layout(self):
267
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
268
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
269
 
        # we want:
270
 
        # format 'Bazaar-NG Repository format 7'
271
 
        # inventory.weave == empty_weave
272
 
        # empty revision-store directory
273
 
        # empty weaves directory
274
 
        # a 'shared-storage' marker file.
275
 
        # lock is not present when unlocked
276
 
        t = control.get_repository_transport(None)
277
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
278
 
                             t.get('format').read())
279
 
        self.assertEqualDiff('', t.get('shared-storage').read())
280
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
281
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
282
 
        self.assertEqualDiff('# bzr weave file v5\n'
283
 
                             'w\n'
284
 
                             'W\n',
285
 
                             t.get('inventory.weave').read())
286
 
        self.assertFalse(t.has('branch-lock'))
287
 
 
288
 
    def test_creates_lockdir(self):
289
 
        """Make sure it appears to be controlled by a LockDir existence"""
290
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
291
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
292
 
        t = control.get_repository_transport(None)
293
 
        # TODO: Should check there is a 'lock' toplevel directory,
294
 
        # regardless of contents
295
 
        self.assertFalse(t.has('lock/held/info'))
296
 
        repo.lock_write()
297
 
        try:
298
 
            self.assertTrue(t.has('lock/held/info'))
299
 
        finally:
300
 
            # unlock so we don't get a warning about failing to do so
301
 
            repo.unlock()
302
 
 
303
 
    def test_uses_lockdir(self):
304
 
        """repo format 7 actually locks on lockdir"""
305
 
        base_url = self.get_url()
306
 
        control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
307
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
308
 
        t = control.get_repository_transport(None)
309
 
        repo.lock_write()
310
 
        repo.unlock()
311
 
        del repo
312
 
        # make sure the same lock is created by opening it
313
 
        repo = repository.Repository.open(base_url)
314
 
        repo.lock_write()
315
 
        self.assertTrue(t.has('lock/held/info'))
316
 
        repo.unlock()
317
 
        self.assertFalse(t.has('lock/held/info'))
318
 
 
319
 
    def test_shared_no_tree_disk_layout(self):
320
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
321
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
322
 
        repo.set_make_working_trees(False)
323
 
        # we want:
324
 
        # format 'Bazaar-NG Repository format 7'
325
 
        # lock ''
326
 
        # inventory.weave == empty_weave
327
 
        # empty revision-store directory
328
 
        # empty weaves directory
329
 
        # a 'shared-storage' marker file.
330
 
        t = control.get_repository_transport(None)
331
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
332
 
                             t.get('format').read())
333
 
        ## self.assertEqualDiff('', t.get('lock').read())
334
 
        self.assertEqualDiff('', t.get('shared-storage').read())
335
 
        self.assertEqualDiff('', t.get('no-working-trees').read())
336
 
        repo.set_make_working_trees(True)
337
 
        self.assertFalse(t.has('no-working-trees'))
338
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
339
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
340
 
        self.assertEqualDiff('# bzr weave file v5\n'
341
 
                             'w\n'
342
 
                             'W\n',
343
 
                             t.get('inventory.weave').read())
344
 
 
345
 
    def test_supports_external_lookups(self):
346
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
347
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
348
 
        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)
349
209
 
350
210
 
351
211
class TestFormatKnit1(TestCaseWithTransport):
519
379
        # classes do not barf inappropriately when a surprising repository type
520
380
        # is handed to them.
521
381
        dummy_a = DummyRepository()
 
382
        dummy_a._format = RepositoryFormat()
 
383
        dummy_a._format.supports_full_versioned_files = True
522
384
        dummy_b = DummyRepository()
 
385
        dummy_b._format = RepositoryFormat()
 
386
        dummy_b._format.supports_full_versioned_files = True
523
387
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
524
388
 
525
389
    def assertGetsDefaultInterRepository(self, repo_a, repo_b):
529
393
        no actual sane default in the presence of incompatible data models.
530
394
        """
531
395
        inter_repo = repository.InterRepository.get(repo_a, repo_b)
532
 
        self.assertEqual(repository.InterSameDataRepository,
 
396
        self.assertEqual(vf_repository.InterSameDataRepository,
533
397
                         inter_repo.__class__)
534
398
        self.assertEqual(repo_a, inter_repo.source)
535
399
        self.assertEqual(repo_b, inter_repo.target)
549
413
        dummy_a._serializer = repo._serializer
550
414
        dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
551
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
552
417
        dummy_b._serializer = repo._serializer
553
418
        dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
554
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
555
421
        repository.InterRepository.register_optimiser(InterDummy)
556
422
        try:
557
423
            # we should get the default for something InterDummy returns False
570
436
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
571
437
 
572
438
 
573
 
class TestInterWeaveRepo(TestCaseWithTransport):
574
 
 
575
 
    def test_is_compatible_and_registered(self):
576
 
        # InterWeaveRepo is compatible when either side
577
 
        # is a format 5/6/7 branch
578
 
        from bzrlib.repofmt import knitrepo, weaverepo
579
 
        formats = [weaverepo.RepositoryFormat5(),
580
 
                   weaverepo.RepositoryFormat6(),
581
 
                   weaverepo.RepositoryFormat7()]
582
 
        incompatible_formats = [weaverepo.RepositoryFormat4(),
583
 
                                knitrepo.RepositoryFormatKnit1(),
584
 
                                ]
585
 
        repo_a = self.make_repository('a')
586
 
        repo_b = self.make_repository('b')
587
 
        is_compatible = weaverepo.InterWeaveRepo.is_compatible
588
 
        for source in incompatible_formats:
589
 
            # force incompatible left then right
590
 
            repo_a._format = source
591
 
            repo_b._format = formats[0]
592
 
            self.assertFalse(is_compatible(repo_a, repo_b))
593
 
            self.assertFalse(is_compatible(repo_b, repo_a))
594
 
        for source in formats:
595
 
            repo_a._format = source
596
 
            for target in formats:
597
 
                repo_b._format = target
598
 
                self.assertTrue(is_compatible(repo_a, repo_b))
599
 
        self.assertEqual(weaverepo.InterWeaveRepo,
600
 
                         repository.InterRepository.get(repo_a,
601
 
                                                        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"
602
449
 
603
450
 
604
451
class TestRepositoryConverter(TestCaseWithTransport):
605
452
 
606
453
    def test_convert_empty(self):
 
454
        source_format = TestRepositoryFormat1()
 
455
        target_format = TestRepositoryFormat2()
 
456
        repository.format_registry.register(source_format)
 
457
        self.addCleanup(repository.format_registry.remove,
 
458
            source_format)
 
459
        repository.format_registry.register(target_format)
 
460
        self.addCleanup(repository.format_registry.remove,
 
461
            target_format)
607
462
        t = self.get_transport()
608
463
        t.mkdir('repository')
609
464
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
610
 
        repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
611
 
        target_format = knitrepo.RepositoryFormatKnit1()
 
465
        repo = TestRepositoryFormat1().initialize(repo_dir)
612
466
        converter = repository.CopyConverter(target_format)
613
467
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
614
468
        try:
619
473
        self.assertTrue(isinstance(target_format, repo._format.__class__))
620
474
 
621
475
 
622
 
class TestMisc(TestCase):
623
 
 
624
 
    def test_unescape_xml(self):
625
 
        """We get some kind of error when malformed entities are passed"""
626
 
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;')
627
 
 
628
 
 
629
476
class TestRepositoryFormatKnit3(TestCaseWithTransport):
630
477
 
631
478
    def test_attribute__fetch_order(self):
826
673
        target = self.make_repository('target', format='rich-root-pack')
827
674
        stream = source._get_source(target._format)
828
675
        # We don't want the child GroupCHKStreamSource
829
 
        self.assertIs(type(stream), repository.StreamSource)
 
676
        self.assertIs(type(stream), vf_repository.StreamSource)
830
677
 
831
678
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
832
679
        source_builder = self.make_branch_builder('source',
908
755
        source = self.make_repository('source', format='pack-0.92')
909
756
        target = self.make_repository('target', format='pack-0.92')
910
757
        stream_source = source._get_source(target._format)
911
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
758
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
912
759
 
913
760
    def test_source_to_exact_pack_rich_root_pack(self):
914
761
        source = self.make_repository('source', format='rich-root-pack')
915
762
        target = self.make_repository('target', format='rich-root-pack')
916
763
        stream_source = source._get_source(target._format)
917
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
764
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
918
765
 
919
766
    def test_source_to_exact_pack_19(self):
920
767
        source = self.make_repository('source', format='1.9')
921
768
        target = self.make_repository('target', format='1.9')
922
769
        stream_source = source._get_source(target._format)
923
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
770
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
924
771
 
925
772
    def test_source_to_exact_pack_19_rich_root(self):
926
773
        source = self.make_repository('source', format='1.9-rich-root')
927
774
        target = self.make_repository('target', format='1.9-rich-root')
928
775
        stream_source = source._get_source(target._format)
929
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
776
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
930
777
 
931
778
    def test_source_to_remote_exact_pack_19(self):
932
779
        trans = self.make_smart_server('target')
935
782
        target = self.make_repository('target', format='1.9')
936
783
        target = repository.Repository.open(trans.base)
937
784
        stream_source = source._get_source(target._format)
938
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
785
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
939
786
 
940
787
    def test_stream_source_to_non_exact(self):
941
788
        source = self.make_repository('source', format='pack-0.92')
942
789
        target = self.make_repository('target', format='1.9')
943
790
        stream = source._get_source(target._format)
944
 
        self.assertIs(type(stream), repository.StreamSource)
 
791
        self.assertIs(type(stream), vf_repository.StreamSource)
945
792
 
946
793
    def test_stream_source_to_non_exact_rich_root(self):
947
794
        source = self.make_repository('source', format='1.9')
948
795
        target = self.make_repository('target', format='1.9-rich-root')
949
796
        stream = source._get_source(target._format)
950
 
        self.assertIs(type(stream), repository.StreamSource)
 
797
        self.assertIs(type(stream), vf_repository.StreamSource)
951
798
 
952
799
    def test_source_to_remote_non_exact_pack_19(self):
953
800
        trans = self.make_smart_server('target')
956
803
        target = self.make_repository('target', format='1.6')
957
804
        target = repository.Repository.open(trans.base)
958
805
        stream_source = source._get_source(target._format)
959
 
        self.assertIs(type(stream_source), repository.StreamSource)
 
806
        self.assertIs(type(stream_source), vf_repository.StreamSource)
960
807
 
961
808
    def test_stream_source_to_knit(self):
962
809
        source = self.make_repository('source', format='pack-0.92')
963
810
        target = self.make_repository('target', format='dirstate')
964
811
        stream = source._get_source(target._format)
965
 
        self.assertIs(type(stream), repository.StreamSource)
 
812
        self.assertIs(type(stream), vf_repository.StreamSource)
966
813
 
967
814
 
968
815
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
1604
1451
        # Because of how they were built, they correspond to
1605
1452
        # ['D', 'C', 'B', 'A']
1606
1453
        packs = b.repository._pack_collection.packs
1607
 
        packer = pack_repo.Packer(b.repository._pack_collection,
 
1454
        packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
1608
1455
                                  packs, 'testing',
1609
1456
                                  revision_ids=['B', 'C'])
1610
1457
        # Now, when we are copying the B & C revisions, their pack files should
1624
1471
        return repo._pack_collection
1625
1472
 
1626
1473
    def test_open_pack_will_optimise(self):
1627
 
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
 
1474
        packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
1628
1475
                                            [], '.test')
1629
1476
        new_pack = packer.open_pack()
1630
1477
        self.addCleanup(new_pack.abort) # ensure cleanup
1755
1602
        self.addCleanup(target.unlock)
1756
1603
        source = source_tree.branch.repository._get_source(target._format)
1757
1604
        self.orig_pack = target.pack
1758
 
        target.pack = self.log_pack
 
1605
        self.overrideAttr(target, "pack", self.log_pack)
1759
1606
        search = target.search_missing_revision_ids(
1760
 
            source_tree.branch.repository, tip)
 
1607
            source_tree.branch.repository, revision_ids=[tip])
1761
1608
        stream = source.get_stream(search)
1762
1609
        from_format = source_tree.branch.repository._format
1763
1610
        sink = target._get_sink()
1779
1626
        self.addCleanup(target.unlock)
1780
1627
        source = source_tree.branch.repository
1781
1628
        self.orig_pack = target.pack
1782
 
        target.pack = self.log_pack
 
1629
        self.overrideAttr(target, "pack", self.log_pack)
1783
1630
        target.fetch(source)
1784
1631
        if expect_pack_called:
1785
1632
            self.assertLength(1, self.calls)