← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

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
 
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,
60
58
    groupcompress_repo,
61
59
    knitrepo,
62
60
    pack_repo,
63
 
    weaverepo,
64
61
    )
65
62
 
66
63
 
69
66
    def test_get_set_default_format(self):
70
67
        old_default = bzrdir.format_registry.get('default')
71
68
        private_default = old_default().repository_format.__class__
72
 
        old_format = repository.RepositoryFormat.get_default_format()
 
69
        old_format = repository.format_registry.get_default()
73
70
        self.assertTrue(isinstance(old_format, private_default))
74
71
        def make_sample_bzrdir():
75
72
            my_bzrdir = bzrdir.BzrDirMetaFormat1()
89
86
            bzrdir.format_registry.remove('default')
90
87
            bzrdir.format_registry.remove('sample')
91
88
            bzrdir.format_registry.register('default', old_default, '')
92
 
        self.assertIsInstance(repository.RepositoryFormat.get_default_format(),
 
89
        self.assertIsInstance(repository.format_registry.get_default(),
93
90
                              old_format.__class__)
94
91
 
95
92
 
117
114
        return "opened repository."
118
115
 
119
116
 
 
117
class SampleExtraRepositoryFormat(repository.RepositoryFormat):
 
118
    """A sample format that can not be used in a metadir
 
119
 
 
120
    """
 
121
 
 
122
    def get_format_string(self):
 
123
        raise NotImplementedError
 
124
 
 
125
 
120
126
class TestRepositoryFormat(TestCaseWithTransport):
121
127
    """Tests for the Repository format detection used by the bzr meta dir facility.BzrBranchFormat facility."""
122
128
 
128
134
        def check_format(format, url):
129
135
            dir = format._matchingbzrdir.initialize(url)
130
136
            format.initialize(dir)
131
 
            t = get_transport(url)
 
137
            t = transport.get_transport(url)
132
138
            found_format = repository.RepositoryFormat.find_format(dir)
133
139
            self.failUnless(isinstance(found_format, format.__class__))
134
 
        check_format(weaverepo.RepositoryFormat7(), "bar")
 
140
        check_format(repository.format_registry.get_default(), "bar")
135
141
 
136
142
    def test_find_format_no_repository(self):
137
143
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
147
153
                          dir)
148
154
 
149
155
    def test_register_unregister_format(self):
 
156
        # Test deprecated format registration functions
150
157
        format = SampleRepositoryFormat()
151
158
        # make a control dir
152
159
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
153
160
        # make a repo
154
161
        format.initialize(dir)
155
162
        # register a format for it.
156
 
        repository.RepositoryFormat.register_format(format)
 
163
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
164
            repository.RepositoryFormat.register_format, format)
157
165
        # which repository.Open will refuse (not supported)
158
 
        self.assertRaises(UnsupportedFormatError, repository.Repository.open, self.get_url())
 
166
        self.assertRaises(UnsupportedFormatError, repository.Repository.open,
 
167
            self.get_url())
159
168
        # but open(unsupported) will work
160
169
        self.assertEqual(format.open(dir), "opened repository.")
161
170
        # 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)
 
171
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
172
            repository.RepositoryFormat.unregister_format, format)
 
173
 
 
174
 
 
175
class TestRepositoryFormatRegistry(TestCase):
 
176
 
 
177
    def setUp(self):
 
178
        super(TestRepositoryFormatRegistry, self).setUp()
 
179
        self.registry = repository.RepositoryFormatRegistry()
 
180
 
 
181
    def test_register_unregister_format(self):
 
182
        format = SampleRepositoryFormat()
 
183
        self.registry.register(format)
 
184
        self.assertEquals(format, self.registry.get("Sample .bzr repository format."))
 
185
        self.registry.remove(format)
 
186
        self.assertRaises(KeyError, self.registry.get, "Sample .bzr repository format.")
 
187
 
 
188
    def test_get_all(self):
 
189
        format = SampleRepositoryFormat()
 
190
        self.assertEquals([], self.registry._get_all())
 
191
        self.registry.register(format)
 
192
        self.assertEquals([format], self.registry._get_all())
 
193
 
 
194
    def test_register_extra(self):
 
195
        format = SampleExtraRepositoryFormat()
 
196
        self.assertEquals([], self.registry._get_all())
 
197
        self.registry.register_extra(format)
 
198
        self.assertEquals([format], self.registry._get_all())
 
199
 
 
200
    def test_register_extra_lazy(self):
 
201
        self.assertEquals([], self.registry._get_all())
 
202
        self.registry.register_extra_lazy("bzrlib.tests.test_repository",
 
203
            "SampleExtraRepositoryFormat")
 
204
        formats = self.registry._get_all()
 
205
        self.assertEquals(1, len(formats))
 
206
        self.assertIsInstance(formats[0], SampleExtraRepositoryFormat)
351
207
 
352
208
 
353
209
class TestFormatKnit1(TestCaseWithTransport):
572
428
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
573
429
 
574
430
 
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__)
 
431
class TestRepositoryFormat1(knitrepo.RepositoryFormatKnit1):
 
432
 
 
433
    def get_format_string(self):
 
434
        return "Test Format 1"
 
435
 
 
436
 
 
437
class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
 
438
 
 
439
    def get_format_string(self):
 
440
        return "Test Format 2"
604
441
 
605
442
 
606
443
class TestRepositoryConverter(TestCaseWithTransport):
607
444
 
608
445
    def test_convert_empty(self):
609
 
        t = get_transport(self.get_url('.'))
 
446
        source_format = TestRepositoryFormat1()
 
447
        target_format = TestRepositoryFormat2()
 
448
        repository.format_registry.register(source_format)
 
449
        self.addCleanup(repository.format_registry.remove,
 
450
            source_format)
 
451
        repository.format_registry.register(target_format)
 
452
        self.addCleanup(repository.format_registry.remove,
 
453
            target_format)
 
454
        t = self.get_transport()
610
455
        t.mkdir('repository')
611
456
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
612
 
        repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
613
 
        target_format = knitrepo.RepositoryFormatKnit1()
 
457
        repo = TestRepositoryFormat1().initialize(repo_dir)
614
458
        converter = repository.CopyConverter(target_format)
615
459
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
616
460
        try:
621
465
        self.assertTrue(isinstance(target_format, repo._format.__class__))
622
466
 
623
467
 
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
468
class TestRepositoryFormatKnit3(TestCaseWithTransport):
632
469
 
633
470
    def test_attribute__fetch_order(self):
972
809
 
973
810
    def setUp(self):
974
811
        super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
975
 
        self.builder = self.make_branch_builder('source',
976
 
            format='development6-rich-root')
 
812
        self.builder = self.make_branch_builder('source')
977
813
        self.builder.start_series()
978
814
        self.builder.build_snapshot('initial', None,
979
815
            [('add', ('', 'tree-root', 'directory', None))])
1638
1474
        self.assertTrue(new_pack.signature_index._optimize_for_size)
1639
1475
 
1640
1476
 
 
1477
class TestGCCHKPacker(TestCaseWithTransport):
 
1478
 
 
1479
    def make_abc_branch(self):
 
1480
        builder = self.make_branch_builder('source')
 
1481
        builder.start_series()
 
1482
        builder.build_snapshot('A', None, [
 
1483
            ('add', ('', 'root-id', 'directory', None)),
 
1484
            ('add', ('file', 'file-id', 'file', 'content\n')),
 
1485
            ])
 
1486
        builder.build_snapshot('B', ['A'], [
 
1487
            ('add', ('dir', 'dir-id', 'directory', None))])
 
1488
        builder.build_snapshot('C', ['B'], [
 
1489
            ('modify', ('file-id', 'new content\n'))])
 
1490
        builder.finish_series()
 
1491
        return builder.get_branch()
 
1492
 
 
1493
    def make_branch_with_disjoint_inventory_and_revision(self):
 
1494
        """a repo with separate packs for a revisions Revision and Inventory.
 
1495
 
 
1496
        There will be one pack file that holds the Revision content, and one
 
1497
        for the Inventory content.
 
1498
 
 
1499
        :return: (repository,
 
1500
                  pack_name_with_rev_A_Revision,
 
1501
                  pack_name_with_rev_A_Inventory,
 
1502
                  pack_name_with_rev_C_content)
 
1503
        """
 
1504
        b_source = self.make_abc_branch()
 
1505
        b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
 
1506
        b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
 
1507
        b_stacked.lock_write()
 
1508
        self.addCleanup(b_stacked.unlock)
 
1509
        b_stacked.fetch(b_source, 'B')
 
1510
        # Now re-open the stacked repo directly (no fallbacks) so that we can
 
1511
        # fill in the A rev.
 
1512
        repo_not_stacked = b_stacked.bzrdir.open_repository()
 
1513
        repo_not_stacked.lock_write()
 
1514
        self.addCleanup(repo_not_stacked.unlock)
 
1515
        # Now we should have a pack file with A's inventory, but not its
 
1516
        # Revision
 
1517
        self.assertEqual([('A',), ('B',)],
 
1518
                         sorted(repo_not_stacked.inventories.keys()))
 
1519
        self.assertEqual([('B',)],
 
1520
                         sorted(repo_not_stacked.revisions.keys()))
 
1521
        stacked_pack_names = repo_not_stacked._pack_collection.names()
 
1522
        # We have a couple names here, figure out which has A's inventory
 
1523
        for name in stacked_pack_names:
 
1524
            pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
 
1525
            keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
 
1526
            if ('A',) in keys:
 
1527
                inv_a_pack_name = name
 
1528
                break
 
1529
        else:
 
1530
            self.fail('Could not find pack containing A\'s inventory')
 
1531
        repo_not_stacked.fetch(b_source.repository, 'A')
 
1532
        self.assertEqual([('A',), ('B',)],
 
1533
                         sorted(repo_not_stacked.revisions.keys()))
 
1534
        new_pack_names = set(repo_not_stacked._pack_collection.names())
 
1535
        rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
 
1536
        self.assertEqual(1, len(rev_a_pack_names))
 
1537
        rev_a_pack_name = list(rev_a_pack_names)[0]
 
1538
        # Now fetch 'C', so we have a couple pack files to join
 
1539
        repo_not_stacked.fetch(b_source.repository, 'C')
 
1540
        rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
 
1541
        rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
 
1542
        self.assertEqual(1, len(rev_c_pack_names))
 
1543
        rev_c_pack_name = list(rev_c_pack_names)[0]
 
1544
        return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
 
1545
                rev_c_pack_name)
 
1546
 
 
1547
    def test_pack_with_distant_inventories(self):
 
1548
        # See https://bugs.launchpad.net/bzr/+bug/437003
 
1549
        # When repacking, it is possible to have an inventory in a different
 
1550
        # pack file than the associated revision. An autopack can then come
 
1551
        # along, and miss that inventory, and complain.
 
1552
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1553
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1554
        a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
 
1555
        c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
 
1556
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1557
                    [a_pack, c_pack], '.test-pack')
 
1558
        # This would raise ValueError in bug #437003, but should not raise an
 
1559
        # error once fixed.
 
1560
        packer.pack()
 
1561
 
 
1562
    def test_pack_with_missing_inventory(self):
 
1563
        # Similar to test_pack_with_missing_inventory, but this time, we force
 
1564
        # the A inventory to actually be gone from the repository.
 
1565
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1566
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1567
        inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
 
1568
        repo._pack_collection._remove_pack_from_memory(inv_a_pack)
 
1569
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1570
            repo._pack_collection.all_packs(), '.test-pack')
 
1571
        e = self.assertRaises(ValueError, packer.pack)
 
1572
        packer.new_pack.abort()
 
1573
        self.assertContainsRe(str(e),
 
1574
            r"We are missing inventories for revisions: .*'A'")
 
1575
 
 
1576
 
1641
1577
class TestCrossFormatPacks(TestCaseWithTransport):
1642
1578
 
1643
1579
    def log_pack(self, hint=None):
1660
1596
        self.orig_pack = target.pack
1661
1597
        target.pack = self.log_pack
1662
1598
        search = target.search_missing_revision_ids(
1663
 
            source_tree.branch.repository, tip)
 
1599
            source_tree.branch.repository, revision_ids=[tip])
1664
1600
        stream = source.get_stream(search)
1665
1601
        from_format = source_tree.branch.repository._format
1666
1602
        sink = target._get_sink()