~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

(vila) Forbid more operations on ReadonlyTransportDecorator (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006, 2007, 2008 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the Repository facility that are not interface tests.
18
18
 
19
 
For interface tests see tests/repository_implementations/*.py.
 
19
For interface tests see tests/per_repository/*.py.
20
20
 
21
21
For concrete class tests see this file, and for storage formats tests
22
22
also see this file.
23
23
"""
24
24
 
25
 
import md5
26
25
from stat import S_ISDIR
27
 
from StringIO import StringIO
28
26
 
29
27
import bzrlib
30
 
from bzrlib.errors import (NotBranchError,
31
 
                           NoSuchFile,
32
 
                           UnknownFormatError,
33
 
                           UnsupportedFormatError,
34
 
                           )
35
 
from bzrlib import graph
36
 
from bzrlib.index import GraphIndex, InMemoryGraphIndex
 
28
from bzrlib.errors import (
 
29
    UnknownFormatError,
 
30
    UnsupportedFormatError,
 
31
    )
 
32
from bzrlib import (
 
33
    btree_index,
 
34
    symbol_versioning,
 
35
    tests,
 
36
    transport,
 
37
    vf_search,
 
38
    )
 
39
from bzrlib.btree_index import BTreeBuilder, BTreeGraphIndex
 
40
from bzrlib.index import GraphIndex
37
41
from bzrlib.repository import RepositoryFormat
38
 
from bzrlib.smart import server
39
42
from bzrlib.tests import (
40
43
    TestCase,
41
44
    TestCaseWithTransport,
42
 
    TestSkipped,
43
 
    test_knit,
44
 
    )
45
 
from bzrlib.transport import (
46
 
    fakenfs,
47
 
    get_transport,
48
 
    )
49
 
from bzrlib.transport.memory import MemoryServer
50
 
from bzrlib.util import bencode
 
45
    )
51
46
from bzrlib import (
52
47
    bzrdir,
 
48
    controldir,
53
49
    errors,
54
50
    inventory,
55
 
    progress,
 
51
    osutils,
56
52
    repository,
57
53
    revision as _mod_revision,
58
 
    symbol_versioning,
59
54
    upgrade,
 
55
    versionedfile,
 
56
    vf_repository,
60
57
    workingtree,
61
58
    )
62
 
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
 
59
from bzrlib.repofmt import (
 
60
    groupcompress_repo,
 
61
    knitrepo,
 
62
    knitpack_repo,
 
63
    pack_repo,
 
64
    )
63
65
 
64
66
 
65
67
class TestDefaultFormat(TestCase):
66
68
 
67
69
    def test_get_set_default_format(self):
68
 
        old_default = bzrdir.format_registry.get('default')
 
70
        old_default = controldir.format_registry.get('default')
69
71
        private_default = old_default().repository_format.__class__
70
 
        old_format = repository.RepositoryFormat.get_default_format()
 
72
        old_format = repository.format_registry.get_default()
71
73
        self.assertTrue(isinstance(old_format, private_default))
72
74
        def make_sample_bzrdir():
73
75
            my_bzrdir = bzrdir.BzrDirMetaFormat1()
74
76
            my_bzrdir.repository_format = SampleRepositoryFormat()
75
77
            return my_bzrdir
76
 
        bzrdir.format_registry.remove('default')
77
 
        bzrdir.format_registry.register('sample', make_sample_bzrdir, '')
78
 
        bzrdir.format_registry.set_default('sample')
 
78
        controldir.format_registry.remove('default')
 
79
        controldir.format_registry.register('sample', make_sample_bzrdir, '')
 
80
        controldir.format_registry.set_default('sample')
79
81
        # creating a repository should now create an instrumented dir.
80
82
        try:
81
83
            # the default branch format is used by the meta dir format
84
86
            result = dir.create_repository()
85
87
            self.assertEqual(result, 'A bzr repository dir')
86
88
        finally:
87
 
            bzrdir.format_registry.remove('default')
88
 
            bzrdir.format_registry.remove('sample')
89
 
            bzrdir.format_registry.register('default', old_default, '')
90
 
        self.assertIsInstance(repository.RepositoryFormat.get_default_format(),
 
89
            controldir.format_registry.remove('default')
 
90
            controldir.format_registry.remove('sample')
 
91
            controldir.format_registry.register('default', old_default, '')
 
92
        self.assertIsInstance(repository.format_registry.get_default(),
91
93
                              old_format.__class__)
92
94
 
93
95
 
94
 
class SampleRepositoryFormat(repository.RepositoryFormat):
 
96
class SampleRepositoryFormat(repository.RepositoryFormatMetaDir):
95
97
    """A sample format
96
98
 
97
 
    this format is initializable, unsupported to aid in testing the 
 
99
    this format is initializable, unsupported to aid in testing the
98
100
    open and open(unsupported=True) routines.
99
101
    """
100
102
 
101
 
    def get_format_string(self):
 
103
    @classmethod
 
104
    def get_format_string(cls):
102
105
        """See RepositoryFormat.get_format_string()."""
103
106
        return "Sample .bzr repository format."
104
107
 
115
118
        return "opened repository."
116
119
 
117
120
 
 
121
class SampleExtraRepositoryFormat(repository.RepositoryFormat):
 
122
    """A sample format that can not be used in a metadir
 
123
 
 
124
    """
 
125
 
 
126
    def get_format_string(self):
 
127
        raise NotImplementedError
 
128
 
 
129
 
118
130
class TestRepositoryFormat(TestCaseWithTransport):
119
131
    """Tests for the Repository format detection used by the bzr meta dir facility.BzrBranchFormat facility."""
120
132
 
121
133
    def test_find_format(self):
122
134
        # is the right format object found for a repository?
123
135
        # create a branch with a few known format objects.
124
 
        # this is not quite the same as 
 
136
        # this is not quite the same as
125
137
        self.build_tree(["foo/", "bar/"])
126
138
        def check_format(format, url):
127
139
            dir = format._matchingbzrdir.initialize(url)
128
140
            format.initialize(dir)
129
 
            t = get_transport(url)
130
 
            found_format = repository.RepositoryFormat.find_format(dir)
131
 
            self.failUnless(isinstance(found_format, format.__class__))
132
 
        check_format(weaverepo.RepositoryFormat7(), "bar")
133
 
        
 
141
            t = transport.get_transport_from_path(url)
 
142
            found_format = repository.RepositoryFormatMetaDir.find_format(dir)
 
143
            self.assertIsInstance(found_format, format.__class__)
 
144
        check_format(repository.format_registry.get_default(), "bar")
 
145
 
134
146
    def test_find_format_no_repository(self):
135
147
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
136
148
        self.assertRaises(errors.NoRepositoryPresent,
137
 
                          repository.RepositoryFormat.find_format,
 
149
                          repository.RepositoryFormatMetaDir.find_format,
138
150
                          dir)
139
151
 
 
152
    def test_from_string(self):
 
153
        self.assertIsInstance(
 
154
            SampleRepositoryFormat.from_string(
 
155
                "Sample .bzr repository format."),
 
156
            SampleRepositoryFormat)
 
157
        self.assertRaises(AssertionError,
 
158
            SampleRepositoryFormat.from_string,
 
159
                "Different .bzr repository format.")
 
160
 
140
161
    def test_find_format_unknown_format(self):
141
162
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
142
163
        SampleRepositoryFormat().initialize(dir)
143
164
        self.assertRaises(UnknownFormatError,
144
 
                          repository.RepositoryFormat.find_format,
 
165
                          repository.RepositoryFormatMetaDir.find_format,
145
166
                          dir)
146
167
 
 
168
    def test_find_format_with_features(self):
 
169
        tree = self.make_branch_and_tree('.', format='2a')
 
170
        tree.branch.repository.update_feature_flags({"name": "necessity"})
 
171
        found_format = repository.RepositoryFormatMetaDir.find_format(tree.bzrdir)
 
172
        self.assertIsInstance(found_format, repository.RepositoryFormatMetaDir)
 
173
        self.assertEquals(found_format.features.get("name"), "necessity")
 
174
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
 
175
            True)
 
176
        self.addCleanup(repository.RepositoryFormatMetaDir.unregister_feature,
 
177
            "name")
 
178
        repository.RepositoryFormatMetaDir.register_feature("name")
 
179
        found_format.check_support_status(True)
 
180
 
 
181
 
 
182
class TestRepositoryFormatRegistry(TestCase):
 
183
 
 
184
    def setUp(self):
 
185
        super(TestRepositoryFormatRegistry, self).setUp()
 
186
        self.registry = repository.RepositoryFormatRegistry()
 
187
 
147
188
    def test_register_unregister_format(self):
148
189
        format = SampleRepositoryFormat()
149
 
        # make a control dir
150
 
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
151
 
        # make a repo
152
 
        format.initialize(dir)
153
 
        # register a format for it.
154
 
        repository.RepositoryFormat.register_format(format)
155
 
        # which repository.Open will refuse (not supported)
156
 
        self.assertRaises(UnsupportedFormatError, repository.Repository.open, self.get_url())
157
 
        # but open(unsupported) will work
158
 
        self.assertEqual(format.open(dir), "opened repository.")
159
 
        # 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._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._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._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._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._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._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
 
        tree.commit('first post', rev_id='first')
246
 
        self.assertEqualDiff(
247
 
            '# bzr weave file v5\n'
248
 
            'i\n'
249
 
            '1 7fe70820e08a1aac0ef224d9c66ab66831cc4ab1\n'
250
 
            'n first\n'
251
 
            '\n'
252
 
            'w\n'
253
 
            '{ 0\n'
254
 
            '. content\n'
255
 
            '}\n'
256
 
            'W\n',
257
 
            t.get('weaves/74/Foo%3ABar.weave').read())
258
 
 
259
 
    def test_shared_disk_layout(self):
260
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
261
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
262
 
        # we want:
263
 
        # format 'Bazaar-NG Repository format 7'
264
 
        # inventory.weave == empty_weave
265
 
        # empty revision-store directory
266
 
        # empty weaves directory
267
 
        # a 'shared-storage' marker file.
268
 
        # lock is not present when unlocked
269
 
        t = control.get_repository_transport(None)
270
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
271
 
                             t.get('format').read())
272
 
        self.assertEqualDiff('', t.get('shared-storage').read())
273
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
274
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
275
 
        self.assertEqualDiff('# bzr weave file v5\n'
276
 
                             'w\n'
277
 
                             'W\n',
278
 
                             t.get('inventory.weave').read())
279
 
        self.assertFalse(t.has('branch-lock'))
280
 
 
281
 
    def test_creates_lockdir(self):
282
 
        """Make sure it appears to be controlled by a LockDir existence"""
283
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
284
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
285
 
        t = control.get_repository_transport(None)
286
 
        # TODO: Should check there is a 'lock' toplevel directory, 
287
 
        # regardless of contents
288
 
        self.assertFalse(t.has('lock/held/info'))
289
 
        repo.lock_write()
290
 
        try:
291
 
            self.assertTrue(t.has('lock/held/info'))
292
 
        finally:
293
 
            # unlock so we don't get a warning about failing to do so
294
 
            repo.unlock()
295
 
 
296
 
    def test_uses_lockdir(self):
297
 
        """repo format 7 actually locks on lockdir"""
298
 
        base_url = self.get_url()
299
 
        control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
300
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
301
 
        t = control.get_repository_transport(None)
302
 
        repo.lock_write()
303
 
        repo.unlock()
304
 
        del repo
305
 
        # make sure the same lock is created by opening it
306
 
        repo = repository.Repository.open(base_url)
307
 
        repo.lock_write()
308
 
        self.assertTrue(t.has('lock/held/info'))
309
 
        repo.unlock()
310
 
        self.assertFalse(t.has('lock/held/info'))
311
 
 
312
 
    def test_shared_no_tree_disk_layout(self):
313
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
314
 
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
315
 
        repo.set_make_working_trees(False)
316
 
        # we want:
317
 
        # format 'Bazaar-NG Repository format 7'
318
 
        # lock ''
319
 
        # inventory.weave == empty_weave
320
 
        # empty revision-store directory
321
 
        # empty weaves directory
322
 
        # a 'shared-storage' marker file.
323
 
        t = control.get_repository_transport(None)
324
 
        self.assertEqualDiff('Bazaar-NG Repository format 7',
325
 
                             t.get('format').read())
326
 
        ## self.assertEqualDiff('', t.get('lock').read())
327
 
        self.assertEqualDiff('', t.get('shared-storage').read())
328
 
        self.assertEqualDiff('', t.get('no-working-trees').read())
329
 
        repo.set_make_working_trees(True)
330
 
        self.assertFalse(t.has('no-working-trees'))
331
 
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
332
 
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
333
 
        self.assertEqualDiff('# bzr weave file v5\n'
334
 
                             'w\n'
335
 
                             'W\n',
336
 
                             t.get('inventory.weave').read())
337
 
 
338
 
    def test_supports_external_lookups(self):
339
 
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
340
 
        repo = weaverepo.RepositoryFormat7().initialize(control)
341
 
        self.assertFalse(repo._format.supports_external_lookups)
 
190
        self.registry.register(format)
 
191
        self.assertEquals(format, self.registry.get("Sample .bzr repository format."))
 
192
        self.registry.remove(format)
 
193
        self.assertRaises(KeyError, self.registry.get, "Sample .bzr repository format.")
 
194
 
 
195
    def test_get_all(self):
 
196
        format = SampleRepositoryFormat()
 
197
        self.assertEquals([], self.registry._get_all())
 
198
        self.registry.register(format)
 
199
        self.assertEquals([format], self.registry._get_all())
 
200
 
 
201
    def test_register_extra(self):
 
202
        format = SampleExtraRepositoryFormat()
 
203
        self.assertEquals([], self.registry._get_all())
 
204
        self.registry.register_extra(format)
 
205
        self.assertEquals([format], self.registry._get_all())
 
206
 
 
207
    def test_register_extra_lazy(self):
 
208
        self.assertEquals([], self.registry._get_all())
 
209
        self.registry.register_extra_lazy("bzrlib.tests.test_repository",
 
210
            "SampleExtraRepositoryFormat")
 
211
        formats = self.registry._get_all()
 
212
        self.assertEquals(1, len(formats))
 
213
        self.assertIsInstance(formats[0], SampleExtraRepositoryFormat)
342
214
 
343
215
 
344
216
class TestFormatKnit1(TestCaseWithTransport):
345
 
    
 
217
 
346
218
    def test_attribute__fetch_order(self):
347
219
        """Knits need topological data insertion."""
348
220
        repo = self.make_repository('.',
349
 
                format=bzrdir.format_registry.get('knit')())
350
 
        self.assertEqual('topological', repo._fetch_order)
 
221
                format=controldir.format_registry.get('knit')())
 
222
        self.assertEqual('topological', repo._format._fetch_order)
351
223
 
352
224
    def test_attribute__fetch_uses_deltas(self):
353
225
        """Knits reuse deltas."""
354
226
        repo = self.make_repository('.',
355
 
                format=bzrdir.format_registry.get('knit')())
356
 
        self.assertEqual(True, repo._fetch_uses_deltas)
 
227
                format=controldir.format_registry.get('knit')())
 
228
        self.assertEqual(True, repo._format._fetch_uses_deltas)
357
229
 
358
230
    def test_disk_layout(self):
359
231
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
444
316
        is valid when the api is not being abused.
445
317
        """
446
318
        repo = self.make_repository('.',
447
 
                format=bzrdir.format_registry.get('knit')())
 
319
                format=controldir.format_registry.get('knit')())
448
320
        inv_xml = '<inventory format="5">\n</inventory>\n'
449
 
        inv = repo.deserialise_inventory('test-rev-id', inv_xml)
 
321
        inv = repo._deserialise_inventory('test-rev-id', inv_xml)
450
322
        self.assertEqual('test-rev-id', inv.root.revision)
451
323
 
452
324
    def test_deserialise_uses_global_revision_id(self):
453
325
        """If it is set, then we re-use the global revision id"""
454
326
        repo = self.make_repository('.',
455
 
                format=bzrdir.format_registry.get('knit')())
 
327
                format=controldir.format_registry.get('knit')())
456
328
        inv_xml = ('<inventory format="5" revision_id="other-rev-id">\n'
457
329
                   '</inventory>\n')
458
330
        # Arguably, the deserialise_inventory should detect a mismatch, and
459
331
        # raise an error, rather than silently using one revision_id over the
460
332
        # other.
461
 
        self.assertRaises(AssertionError, repo.deserialise_inventory,
 
333
        self.assertRaises(AssertionError, repo._deserialise_inventory,
462
334
            'test-rev-id', inv_xml)
463
 
        inv = repo.deserialise_inventory('other-rev-id', inv_xml)
 
335
        inv = repo._deserialise_inventory('other-rev-id', inv_xml)
464
336
        self.assertEqual('other-rev-id', inv.root.revision)
465
337
 
466
338
    def test_supports_external_lookups(self):
467
339
        repo = self.make_repository('.',
468
 
                format=bzrdir.format_registry.get('knit')())
 
340
                format=controldir.format_registry.get('knit')())
469
341
        self.assertFalse(repo._format.supports_external_lookups)
470
342
 
471
343
 
472
344
class DummyRepository(object):
473
345
    """A dummy repository for testing."""
474
346
 
 
347
    _format = None
475
348
    _serializer = None
476
349
 
477
350
    def supports_rich_root(self):
 
351
        if self._format is not None:
 
352
            return self._format.rich_root_data
478
353
        return False
479
354
 
 
355
    def get_graph(self):
 
356
        raise NotImplementedError
 
357
 
 
358
    def get_parent_map(self, revision_ids):
 
359
        raise NotImplementedError
 
360
 
480
361
 
481
362
class InterDummy(repository.InterRepository):
482
363
    """An inter-repository optimised code path for DummyRepository.
489
370
    @staticmethod
490
371
    def is_compatible(repo_source, repo_target):
491
372
        """InterDummy is compatible with DummyRepository."""
492
 
        return (isinstance(repo_source, DummyRepository) and 
 
373
        return (isinstance(repo_source, DummyRepository) and
493
374
            isinstance(repo_target, DummyRepository))
494
375
 
495
376
 
503
384
        # classes do not barf inappropriately when a surprising repository type
504
385
        # is handed to them.
505
386
        dummy_a = DummyRepository()
 
387
        dummy_a._format = RepositoryFormat()
 
388
        dummy_a._format.supports_full_versioned_files = True
506
389
        dummy_b = DummyRepository()
 
390
        dummy_b._format = RepositoryFormat()
 
391
        dummy_b._format.supports_full_versioned_files = True
507
392
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
508
393
 
509
394
    def assertGetsDefaultInterRepository(self, repo_a, repo_b):
510
395
        """Asserts that InterRepository.get(repo_a, repo_b) -> the default.
511
 
        
 
396
 
512
397
        The effective default is now InterSameDataRepository because there is
513
398
        no actual sane default in the presence of incompatible data models.
514
399
        """
515
400
        inter_repo = repository.InterRepository.get(repo_a, repo_b)
516
 
        self.assertEqual(repository.InterSameDataRepository,
 
401
        self.assertEqual(vf_repository.InterSameDataRepository,
517
402
                         inter_repo.__class__)
518
403
        self.assertEqual(repo_a, inter_repo.source)
519
404
        self.assertEqual(repo_b, inter_repo.target)
525
410
        # pair that it returns true on for the is_compatible static method
526
411
        # check
527
412
        dummy_a = DummyRepository()
 
413
        dummy_a._format = RepositoryFormat()
528
414
        dummy_b = DummyRepository()
 
415
        dummy_b._format = RepositoryFormat()
529
416
        repo = self.make_repository('.')
530
417
        # hack dummies to look like repo somewhat.
531
418
        dummy_a._serializer = repo._serializer
 
419
        dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
 
420
        dummy_a._format.rich_root_data = repo._format.rich_root_data
 
421
        dummy_a._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
532
422
        dummy_b._serializer = repo._serializer
 
423
        dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
 
424
        dummy_b._format.rich_root_data = repo._format.rich_root_data
 
425
        dummy_b._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
533
426
        repository.InterRepository.register_optimiser(InterDummy)
534
427
        try:
535
428
            # we should get the default for something InterDummy returns False
548
441
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
549
442
 
550
443
 
551
 
class TestInterWeaveRepo(TestCaseWithTransport):
552
 
 
553
 
    def test_is_compatible_and_registered(self):
554
 
        # InterWeaveRepo is compatible when either side
555
 
        # is a format 5/6/7 branch
556
 
        from bzrlib.repofmt import knitrepo, weaverepo
557
 
        formats = [weaverepo.RepositoryFormat5(),
558
 
                   weaverepo.RepositoryFormat6(),
559
 
                   weaverepo.RepositoryFormat7()]
560
 
        incompatible_formats = [weaverepo.RepositoryFormat4(),
561
 
                                knitrepo.RepositoryFormatKnit1(),
562
 
                                ]
563
 
        repo_a = self.make_repository('a')
564
 
        repo_b = self.make_repository('b')
565
 
        is_compatible = repository.InterWeaveRepo.is_compatible
566
 
        for source in incompatible_formats:
567
 
            # force incompatible left then right
568
 
            repo_a._format = source
569
 
            repo_b._format = formats[0]
570
 
            self.assertFalse(is_compatible(repo_a, repo_b))
571
 
            self.assertFalse(is_compatible(repo_b, repo_a))
572
 
        for source in formats:
573
 
            repo_a._format = source
574
 
            for target in formats:
575
 
                repo_b._format = target
576
 
                self.assertTrue(is_compatible(repo_a, repo_b))
577
 
        self.assertEqual(repository.InterWeaveRepo,
578
 
                         repository.InterRepository.get(repo_a,
579
 
                                                        repo_b).__class__)
 
444
class TestRepositoryFormat1(knitrepo.RepositoryFormatKnit1):
 
445
 
 
446
    @classmethod
 
447
    def get_format_string(cls):
 
448
        return "Test Format 1"
 
449
 
 
450
 
 
451
class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
 
452
 
 
453
    @classmethod
 
454
    def get_format_string(cls):
 
455
        return "Test Format 2"
580
456
 
581
457
 
582
458
class TestRepositoryConverter(TestCaseWithTransport):
583
459
 
584
460
    def test_convert_empty(self):
585
 
        t = get_transport(self.get_url('.'))
 
461
        source_format = TestRepositoryFormat1()
 
462
        target_format = TestRepositoryFormat2()
 
463
        repository.format_registry.register(source_format)
 
464
        self.addCleanup(repository.format_registry.remove,
 
465
            source_format)
 
466
        repository.format_registry.register(target_format)
 
467
        self.addCleanup(repository.format_registry.remove,
 
468
            target_format)
 
469
        t = self.get_transport()
586
470
        t.mkdir('repository')
587
471
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
588
 
        repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
589
 
        target_format = knitrepo.RepositoryFormatKnit1()
 
472
        repo = TestRepositoryFormat1().initialize(repo_dir)
590
473
        converter = repository.CopyConverter(target_format)
591
474
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
592
475
        try:
597
480
        self.assertTrue(isinstance(target_format, repo._format.__class__))
598
481
 
599
482
 
600
 
class TestMisc(TestCase):
601
 
    
602
 
    def test_unescape_xml(self):
603
 
        """We get some kind of error when malformed entities are passed"""
604
 
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;') 
605
 
 
606
 
 
607
483
class TestRepositoryFormatKnit3(TestCaseWithTransport):
608
484
 
609
485
    def test_attribute__fetch_order(self):
611
487
        format = bzrdir.BzrDirMetaFormat1()
612
488
        format.repository_format = knitrepo.RepositoryFormatKnit3()
613
489
        repo = self.make_repository('.', format=format)
614
 
        self.assertEqual('topological', repo._fetch_order)
 
490
        self.assertEqual('topological', repo._format._fetch_order)
615
491
 
616
492
    def test_attribute__fetch_uses_deltas(self):
617
493
        """Knits reuse deltas."""
618
494
        format = bzrdir.BzrDirMetaFormat1()
619
495
        format.repository_format = knitrepo.RepositoryFormatKnit3()
620
496
        repo = self.make_repository('.', format=format)
621
 
        self.assertEqual(True, repo._fetch_uses_deltas)
 
497
        self.assertEqual(True, repo._format._fetch_uses_deltas)
622
498
 
623
499
    def test_convert(self):
624
500
        """Ensure the upgrade adds weaves for roots"""
630
506
        revision_tree.lock_read()
631
507
        try:
632
508
            self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
633
 
                revision_tree.inventory.root.file_id)
 
509
                revision_tree.get_root_id())
634
510
        finally:
635
511
            revision_tree.unlock()
636
512
        format = bzrdir.BzrDirMetaFormat1()
640
516
        revision_tree = tree.branch.repository.revision_tree('dull')
641
517
        revision_tree.lock_read()
642
518
        try:
643
 
            revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
 
519
            revision_tree.get_file_lines(revision_tree.get_root_id())
644
520
        finally:
645
521
            revision_tree.unlock()
646
522
        tree.commit("Another dull commit", rev_id='dull2')
647
523
        revision_tree = tree.branch.repository.revision_tree('dull2')
648
524
        revision_tree.lock_read()
649
525
        self.addCleanup(revision_tree.unlock)
650
 
        self.assertEqual('dull', revision_tree.inventory.root.revision)
 
526
        self.assertEqual('dull',
 
527
                revision_tree.get_file_revision(revision_tree.get_root_id()))
651
528
 
652
529
    def test_supports_external_lookups(self):
653
530
        format = bzrdir.BzrDirMetaFormat1()
656
533
        self.assertFalse(repo._format.supports_external_lookups)
657
534
 
658
535
 
 
536
class Test2a(tests.TestCaseWithMemoryTransport):
 
537
 
 
538
    def test_chk_bytes_uses_custom_btree_parser(self):
 
539
        mt = self.make_branch_and_memory_tree('test', format='2a')
 
540
        mt.lock_write()
 
541
        self.addCleanup(mt.unlock)
 
542
        mt.add([''], ['root-id'])
 
543
        mt.commit('first')
 
544
        index = mt.branch.repository.chk_bytes._index._graph_index._indices[0]
 
545
        self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
 
546
        # It should also work if we re-open the repo
 
547
        repo = mt.branch.repository.bzrdir.open_repository()
 
548
        repo.lock_read()
 
549
        self.addCleanup(repo.unlock)
 
550
        index = repo.chk_bytes._index._graph_index._indices[0]
 
551
        self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
 
552
 
 
553
    def test_fetch_combines_groups(self):
 
554
        builder = self.make_branch_builder('source', format='2a')
 
555
        builder.start_series()
 
556
        builder.build_snapshot('1', None, [
 
557
            ('add', ('', 'root-id', 'directory', '')),
 
558
            ('add', ('file', 'file-id', 'file', 'content\n'))])
 
559
        builder.build_snapshot('2', ['1'], [
 
560
            ('modify', ('file-id', 'content-2\n'))])
 
561
        builder.finish_series()
 
562
        source = builder.get_branch()
 
563
        target = self.make_repository('target', format='2a')
 
564
        target.fetch(source.repository)
 
565
        target.lock_read()
 
566
        self.addCleanup(target.unlock)
 
567
        details = target.texts._index.get_build_details(
 
568
            [('file-id', '1',), ('file-id', '2',)])
 
569
        file_1_details = details[('file-id', '1')]
 
570
        file_2_details = details[('file-id', '2')]
 
571
        # The index, and what to read off disk, should be the same for both
 
572
        # versions of the file.
 
573
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
 
574
 
 
575
    def test_fetch_combines_groups(self):
 
576
        builder = self.make_branch_builder('source', format='2a')
 
577
        builder.start_series()
 
578
        builder.build_snapshot('1', None, [
 
579
            ('add', ('', 'root-id', 'directory', '')),
 
580
            ('add', ('file', 'file-id', 'file', 'content\n'))])
 
581
        builder.build_snapshot('2', ['1'], [
 
582
            ('modify', ('file-id', 'content-2\n'))])
 
583
        builder.finish_series()
 
584
        source = builder.get_branch()
 
585
        target = self.make_repository('target', format='2a')
 
586
        target.fetch(source.repository)
 
587
        target.lock_read()
 
588
        self.addCleanup(target.unlock)
 
589
        details = target.texts._index.get_build_details(
 
590
            [('file-id', '1',), ('file-id', '2',)])
 
591
        file_1_details = details[('file-id', '1')]
 
592
        file_2_details = details[('file-id', '2')]
 
593
        # The index, and what to read off disk, should be the same for both
 
594
        # versions of the file.
 
595
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
 
596
 
 
597
    def test_fetch_combines_groups(self):
 
598
        builder = self.make_branch_builder('source', format='2a')
 
599
        builder.start_series()
 
600
        builder.build_snapshot('1', None, [
 
601
            ('add', ('', 'root-id', 'directory', '')),
 
602
            ('add', ('file', 'file-id', 'file', 'content\n'))])
 
603
        builder.build_snapshot('2', ['1'], [
 
604
            ('modify', ('file-id', 'content-2\n'))])
 
605
        builder.finish_series()
 
606
        source = builder.get_branch()
 
607
        target = self.make_repository('target', format='2a')
 
608
        target.fetch(source.repository)
 
609
        target.lock_read()
 
610
        self.addCleanup(target.unlock)
 
611
        details = target.texts._index.get_build_details(
 
612
            [('file-id', '1',), ('file-id', '2',)])
 
613
        file_1_details = details[('file-id', '1')]
 
614
        file_2_details = details[('file-id', '2')]
 
615
        # The index, and what to read off disk, should be the same for both
 
616
        # versions of the file.
 
617
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
 
618
 
 
619
    def test_format_pack_compresses_True(self):
 
620
        repo = self.make_repository('repo', format='2a')
 
621
        self.assertTrue(repo._format.pack_compresses)
 
622
 
 
623
    def test_inventories_use_chk_map_with_parent_base_dict(self):
 
624
        tree = self.make_branch_and_memory_tree('repo', format="2a")
 
625
        tree.lock_write()
 
626
        tree.add([''], ['TREE_ROOT'])
 
627
        revid = tree.commit("foo")
 
628
        tree.unlock()
 
629
        tree.lock_read()
 
630
        self.addCleanup(tree.unlock)
 
631
        inv = tree.branch.repository.get_inventory(revid)
 
632
        self.assertNotEqual(None, inv.parent_id_basename_to_file_id)
 
633
        inv.parent_id_basename_to_file_id._ensure_root()
 
634
        inv.id_to_entry._ensure_root()
 
635
        self.assertEqual(65536, inv.id_to_entry._root_node.maximum_size)
 
636
        self.assertEqual(65536,
 
637
            inv.parent_id_basename_to_file_id._root_node.maximum_size)
 
638
 
 
639
    def test_autopack_unchanged_chk_nodes(self):
 
640
        # at 20 unchanged commits, chk pages are packed that are split into
 
641
        # two groups such that the new pack being made doesn't have all its
 
642
        # pages in the source packs (though they are in the repository).
 
643
        # Use a memory backed repository, we don't need to hit disk for this
 
644
        tree = self.make_branch_and_memory_tree('tree', format='2a')
 
645
        tree.lock_write()
 
646
        self.addCleanup(tree.unlock)
 
647
        tree.add([''], ['TREE_ROOT'])
 
648
        for pos in range(20):
 
649
            tree.commit(str(pos))
 
650
 
 
651
    def test_pack_with_hint(self):
 
652
        tree = self.make_branch_and_memory_tree('tree', format='2a')
 
653
        tree.lock_write()
 
654
        self.addCleanup(tree.unlock)
 
655
        tree.add([''], ['TREE_ROOT'])
 
656
        # 1 commit to leave untouched
 
657
        tree.commit('1')
 
658
        to_keep = tree.branch.repository._pack_collection.names()
 
659
        # 2 to combine
 
660
        tree.commit('2')
 
661
        tree.commit('3')
 
662
        all = tree.branch.repository._pack_collection.names()
 
663
        combine = list(set(all) - set(to_keep))
 
664
        self.assertLength(3, all)
 
665
        self.assertLength(2, combine)
 
666
        tree.branch.repository.pack(hint=combine)
 
667
        final = tree.branch.repository._pack_collection.names()
 
668
        self.assertLength(2, final)
 
669
        self.assertFalse(combine[0] in final)
 
670
        self.assertFalse(combine[1] in final)
 
671
        self.assertSubset(to_keep, final)
 
672
 
 
673
    def test_stream_source_to_gc(self):
 
674
        source = self.make_repository('source', format='2a')
 
675
        target = self.make_repository('target', format='2a')
 
676
        stream = source._get_source(target._format)
 
677
        self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
 
678
 
 
679
    def test_stream_source_to_non_gc(self):
 
680
        source = self.make_repository('source', format='2a')
 
681
        target = self.make_repository('target', format='rich-root-pack')
 
682
        stream = source._get_source(target._format)
 
683
        # We don't want the child GroupCHKStreamSource
 
684
        self.assertIs(type(stream), vf_repository.StreamSource)
 
685
 
 
686
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
 
687
        source_builder = self.make_branch_builder('source',
 
688
                            format='2a')
 
689
        # We have to build a fairly large tree, so that we are sure the chk
 
690
        # pages will have split into multiple pages.
 
691
        entries = [('add', ('', 'a-root-id', 'directory', None))]
 
692
        for i in 'abcdefghijklmnopqrstuvwxyz123456789':
 
693
            for j in 'abcdefghijklmnopqrstuvwxyz123456789':
 
694
                fname = i + j
 
695
                fid = fname + '-id'
 
696
                content = 'content for %s\n' % (fname,)
 
697
                entries.append(('add', (fname, fid, 'file', content)))
 
698
        source_builder.start_series()
 
699
        source_builder.build_snapshot('rev-1', None, entries)
 
700
        # Now change a few of them, so we get a few new pages for the second
 
701
        # revision
 
702
        source_builder.build_snapshot('rev-2', ['rev-1'], [
 
703
            ('modify', ('aa-id', 'new content for aa-id\n')),
 
704
            ('modify', ('cc-id', 'new content for cc-id\n')),
 
705
            ('modify', ('zz-id', 'new content for zz-id\n')),
 
706
            ])
 
707
        source_builder.finish_series()
 
708
        source_branch = source_builder.get_branch()
 
709
        source_branch.lock_read()
 
710
        self.addCleanup(source_branch.unlock)
 
711
        target = self.make_repository('target', format='2a')
 
712
        source = source_branch.repository._get_source(target._format)
 
713
        self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
 
714
 
 
715
        # On a regular pass, getting the inventories and chk pages for rev-2
 
716
        # would only get the newly created chk pages
 
717
        search = vf_search.SearchResult(set(['rev-2']), set(['rev-1']), 1,
 
718
                                    set(['rev-2']))
 
719
        simple_chk_records = []
 
720
        for vf_name, substream in source.get_stream(search):
 
721
            if vf_name == 'chk_bytes':
 
722
                for record in substream:
 
723
                    simple_chk_records.append(record.key)
 
724
            else:
 
725
                for _ in substream:
 
726
                    continue
 
727
        # 3 pages, the root (InternalNode), + 2 pages which actually changed
 
728
        self.assertEqual([('sha1:91481f539e802c76542ea5e4c83ad416bf219f73',),
 
729
                          ('sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
 
730
                          ('sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
 
731
                          ('sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)],
 
732
                         simple_chk_records)
 
733
        # Now, when we do a similar call using 'get_stream_for_missing_keys'
 
734
        # we should get a much larger set of pages.
 
735
        missing = [('inventories', 'rev-2')]
 
736
        full_chk_records = []
 
737
        for vf_name, substream in source.get_stream_for_missing_keys(missing):
 
738
            if vf_name == 'inventories':
 
739
                for record in substream:
 
740
                    self.assertEqual(('rev-2',), record.key)
 
741
            elif vf_name == 'chk_bytes':
 
742
                for record in substream:
 
743
                    full_chk_records.append(record.key)
 
744
            else:
 
745
                self.fail('Should not be getting a stream of %s' % (vf_name,))
 
746
        # We have 257 records now. This is because we have 1 root page, and 256
 
747
        # leaf pages in a complete listing.
 
748
        self.assertEqual(257, len(full_chk_records))
 
749
        self.assertSubset(simple_chk_records, full_chk_records)
 
750
 
 
751
    def test_inconsistency_fatal(self):
 
752
        repo = self.make_repository('repo', format='2a')
 
753
        self.assertTrue(repo.revisions._index._inconsistency_fatal)
 
754
        self.assertFalse(repo.texts._index._inconsistency_fatal)
 
755
        self.assertFalse(repo.inventories._index._inconsistency_fatal)
 
756
        self.assertFalse(repo.signatures._index._inconsistency_fatal)
 
757
        self.assertFalse(repo.chk_bytes._index._inconsistency_fatal)
 
758
 
 
759
 
 
760
class TestKnitPackStreamSource(tests.TestCaseWithMemoryTransport):
 
761
 
 
762
    def test_source_to_exact_pack_092(self):
 
763
        source = self.make_repository('source', format='pack-0.92')
 
764
        target = self.make_repository('target', format='pack-0.92')
 
765
        stream_source = source._get_source(target._format)
 
766
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
 
767
 
 
768
    def test_source_to_exact_pack_rich_root_pack(self):
 
769
        source = self.make_repository('source', format='rich-root-pack')
 
770
        target = self.make_repository('target', format='rich-root-pack')
 
771
        stream_source = source._get_source(target._format)
 
772
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
 
773
 
 
774
    def test_source_to_exact_pack_19(self):
 
775
        source = self.make_repository('source', format='1.9')
 
776
        target = self.make_repository('target', format='1.9')
 
777
        stream_source = source._get_source(target._format)
 
778
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
 
779
 
 
780
    def test_source_to_exact_pack_19_rich_root(self):
 
781
        source = self.make_repository('source', format='1.9-rich-root')
 
782
        target = self.make_repository('target', format='1.9-rich-root')
 
783
        stream_source = source._get_source(target._format)
 
784
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
 
785
 
 
786
    def test_source_to_remote_exact_pack_19(self):
 
787
        trans = self.make_smart_server('target')
 
788
        trans.ensure_base()
 
789
        source = self.make_repository('source', format='1.9')
 
790
        target = self.make_repository('target', format='1.9')
 
791
        target = repository.Repository.open(trans.base)
 
792
        stream_source = source._get_source(target._format)
 
793
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
 
794
 
 
795
    def test_stream_source_to_non_exact(self):
 
796
        source = self.make_repository('source', format='pack-0.92')
 
797
        target = self.make_repository('target', format='1.9')
 
798
        stream = source._get_source(target._format)
 
799
        self.assertIs(type(stream), vf_repository.StreamSource)
 
800
 
 
801
    def test_stream_source_to_non_exact_rich_root(self):
 
802
        source = self.make_repository('source', format='1.9')
 
803
        target = self.make_repository('target', format='1.9-rich-root')
 
804
        stream = source._get_source(target._format)
 
805
        self.assertIs(type(stream), vf_repository.StreamSource)
 
806
 
 
807
    def test_source_to_remote_non_exact_pack_19(self):
 
808
        trans = self.make_smart_server('target')
 
809
        trans.ensure_base()
 
810
        source = self.make_repository('source', format='1.9')
 
811
        target = self.make_repository('target', format='1.6')
 
812
        target = repository.Repository.open(trans.base)
 
813
        stream_source = source._get_source(target._format)
 
814
        self.assertIs(type(stream_source), vf_repository.StreamSource)
 
815
 
 
816
    def test_stream_source_to_knit(self):
 
817
        source = self.make_repository('source', format='pack-0.92')
 
818
        target = self.make_repository('target', format='dirstate')
 
819
        stream = source._get_source(target._format)
 
820
        self.assertIs(type(stream), vf_repository.StreamSource)
 
821
 
 
822
 
 
823
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
 
824
    """Tests for _find_parent_ids_of_revisions."""
 
825
 
 
826
    def setUp(self):
 
827
        super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
 
828
        self.builder = self.make_branch_builder('source')
 
829
        self.builder.start_series()
 
830
        self.builder.build_snapshot('initial', None,
 
831
            [('add', ('', 'tree-root', 'directory', None))])
 
832
        self.repo = self.builder.get_branch().repository
 
833
        self.addCleanup(self.builder.finish_series)
 
834
 
 
835
    def assertParentIds(self, expected_result, rev_set):
 
836
        self.assertEqual(sorted(expected_result),
 
837
            sorted(self.repo._find_parent_ids_of_revisions(rev_set)))
 
838
 
 
839
    def test_simple(self):
 
840
        self.builder.build_snapshot('revid1', None, [])
 
841
        self.builder.build_snapshot('revid2', ['revid1'], [])
 
842
        rev_set = ['revid2']
 
843
        self.assertParentIds(['revid1'], rev_set)
 
844
 
 
845
    def test_not_first_parent(self):
 
846
        self.builder.build_snapshot('revid1', None, [])
 
847
        self.builder.build_snapshot('revid2', ['revid1'], [])
 
848
        self.builder.build_snapshot('revid3', ['revid2'], [])
 
849
        rev_set = ['revid3', 'revid2']
 
850
        self.assertParentIds(['revid1'], rev_set)
 
851
 
 
852
    def test_not_null(self):
 
853
        rev_set = ['initial']
 
854
        self.assertParentIds([], rev_set)
 
855
 
 
856
    def test_not_null_set(self):
 
857
        self.builder.build_snapshot('revid1', None, [])
 
858
        rev_set = [_mod_revision.NULL_REVISION]
 
859
        self.assertParentIds([], rev_set)
 
860
 
 
861
    def test_ghost(self):
 
862
        self.builder.build_snapshot('revid1', None, [])
 
863
        rev_set = ['ghost', 'revid1']
 
864
        self.assertParentIds(['initial'], rev_set)
 
865
 
 
866
    def test_ghost_parent(self):
 
867
        self.builder.build_snapshot('revid1', None, [])
 
868
        self.builder.build_snapshot('revid2', ['revid1', 'ghost'], [])
 
869
        rev_set = ['revid2', 'revid1']
 
870
        self.assertParentIds(['ghost', 'initial'], rev_set)
 
871
 
 
872
    def test_righthand_parent(self):
 
873
        self.builder.build_snapshot('revid1', None, [])
 
874
        self.builder.build_snapshot('revid2a', ['revid1'], [])
 
875
        self.builder.build_snapshot('revid2b', ['revid1'], [])
 
876
        self.builder.build_snapshot('revid3', ['revid2a', 'revid2b'], [])
 
877
        rev_set = ['revid3', 'revid2a']
 
878
        self.assertParentIds(['revid1', 'revid2b'], rev_set)
 
879
 
 
880
 
659
881
class TestWithBrokenRepo(TestCaseWithTransport):
660
882
    """These tests seem to be more appropriate as interface tests?"""
661
883
 
674
896
            inv = inventory.Inventory(revision_id='rev1a')
675
897
            inv.root.revision = 'rev1a'
676
898
            self.add_file(repo, inv, 'file1', 'rev1a', [])
 
899
            repo.texts.add_lines((inv.root.file_id, 'rev1a'), [], [])
677
900
            repo.add_inventory('rev1a', inv, [])
678
901
            revision = _mod_revision.Revision('rev1a',
679
902
                committer='jrandom@example.com', timestamp=0,
680
903
                inventory_sha1='', timezone=0, message='foo', parent_ids=[])
681
 
            repo.add_revision('rev1a',revision, inv)
 
904
            repo.add_revision('rev1a', revision, inv)
682
905
 
683
906
            # make rev1b, which has no Revision, but has an Inventory, and
684
907
            # file1
714
937
    def add_revision(self, repo, revision_id, inv, parent_ids):
715
938
        inv.revision_id = revision_id
716
939
        inv.root.revision = revision_id
 
940
        repo.texts.add_lines((inv.root.file_id, revision_id), [], [])
717
941
        repo.add_inventory(revision_id, inv, parent_ids)
718
942
        revision = _mod_revision.Revision(revision_id,
719
943
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
720
944
            timezone=0, message='foo', parent_ids=parent_ids)
721
 
        repo.add_revision(revision_id,revision, inv)
 
945
        repo.add_revision(revision_id, revision, inv)
722
946
 
723
947
    def add_file(self, repo, inv, filename, revision, parents):
724
948
        file_id = filename + '-id'
736
960
        """
737
961
        broken_repo = self.make_broken_repository()
738
962
        empty_repo = self.make_repository('empty-repo')
739
 
        self.assertRaises(errors.RevisionNotPresent, empty_repo.fetch, broken_repo)
 
963
        try:
 
964
            empty_repo.fetch(broken_repo)
 
965
        except (errors.RevisionNotPresent, errors.BzrCheckError):
 
966
            # Test successful: compression parent not being copied leads to
 
967
            # error.
 
968
            return
 
969
        empty_repo.lock_read()
 
970
        self.addCleanup(empty_repo.unlock)
 
971
        text = empty_repo.texts.get_record_stream(
 
972
            [('file2-id', 'rev3')], 'topological', True).next()
 
973
        self.assertEqual('line\n', text.get_bytes_as('fulltext'))
740
974
 
741
975
 
742
976
class TestRepositoryPackCollection(TestCaseWithTransport):
743
977
 
744
978
    def get_format(self):
745
 
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
 
979
        return controldir.format_registry.make_bzrdir('pack-0.92')
 
980
 
 
981
    def get_packs(self):
 
982
        format = self.get_format()
 
983
        repo = self.make_repository('.', format=format)
 
984
        return repo._pack_collection
 
985
 
 
986
    def make_packs_and_alt_repo(self, write_lock=False):
 
987
        """Create a pack repo with 3 packs, and access it via a second repo."""
 
988
        tree = self.make_branch_and_tree('.', format=self.get_format())
 
989
        tree.lock_write()
 
990
        self.addCleanup(tree.unlock)
 
991
        rev1 = tree.commit('one')
 
992
        rev2 = tree.commit('two')
 
993
        rev3 = tree.commit('three')
 
994
        r = repository.Repository.open('.')
 
995
        if write_lock:
 
996
            r.lock_write()
 
997
        else:
 
998
            r.lock_read()
 
999
        self.addCleanup(r.unlock)
 
1000
        packs = r._pack_collection
 
1001
        packs.ensure_loaded()
 
1002
        return tree, r, packs, [rev1, rev2, rev3]
 
1003
 
 
1004
    def test__clear_obsolete_packs(self):
 
1005
        packs = self.get_packs()
 
1006
        obsolete_pack_trans = packs.transport.clone('obsolete_packs')
 
1007
        obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
 
1008
        obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
 
1009
        obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
 
1010
        obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
 
1011
        obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
 
1012
        res = packs._clear_obsolete_packs()
 
1013
        self.assertEqual(['a-pack', 'another-pack'], sorted(res))
 
1014
        self.assertEqual([], obsolete_pack_trans.list_dir('.'))
 
1015
 
 
1016
    def test__clear_obsolete_packs_preserve(self):
 
1017
        packs = self.get_packs()
 
1018
        obsolete_pack_trans = packs.transport.clone('obsolete_packs')
 
1019
        obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
 
1020
        obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
 
1021
        obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
 
1022
        obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
 
1023
        obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
 
1024
        res = packs._clear_obsolete_packs(preserve=set(['a-pack']))
 
1025
        self.assertEqual(['a-pack', 'another-pack'], sorted(res))
 
1026
        self.assertEqual(['a-pack.iix', 'a-pack.pack', 'a-pack.rix'],
 
1027
                         sorted(obsolete_pack_trans.list_dir('.')))
746
1028
 
747
1029
    def test__max_pack_count(self):
748
1030
        """The maximum pack count is a function of the number of revisions."""
749
 
        format = self.get_format()
750
 
        repo = self.make_repository('.', format=format)
751
 
        packs = repo._pack_collection
752
1031
        # no revisions - one pack, so that we can have a revision free repo
753
1032
        # without it blowing up
 
1033
        packs = self.get_packs()
754
1034
        self.assertEqual(1, packs._max_pack_count(0))
755
1035
        # after that the sum of the digits, - check the first 1-9
756
1036
        self.assertEqual(1, packs._max_pack_count(1))
771
1051
        # check some arbitrary big numbers
772
1052
        self.assertEqual(25, packs._max_pack_count(112894))
773
1053
 
 
1054
    def test_repr(self):
 
1055
        packs = self.get_packs()
 
1056
        self.assertContainsRe(repr(packs),
 
1057
            'RepositoryPackCollection(.*Repository(.*))')
 
1058
 
 
1059
    def test__obsolete_packs(self):
 
1060
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1061
        names = packs.names()
 
1062
        pack = packs.get_pack_by_name(names[0])
 
1063
        # Schedule this one for removal
 
1064
        packs._remove_pack_from_memory(pack)
 
1065
        # Simulate a concurrent update by renaming the .pack file and one of
 
1066
        # the indices
 
1067
        packs.transport.rename('packs/%s.pack' % (names[0],),
 
1068
                               'obsolete_packs/%s.pack' % (names[0],))
 
1069
        packs.transport.rename('indices/%s.iix' % (names[0],),
 
1070
                               'obsolete_packs/%s.iix' % (names[0],))
 
1071
        # Now trigger the obsoletion, and ensure that all the remaining files
 
1072
        # are still renamed
 
1073
        packs._obsolete_packs([pack])
 
1074
        self.assertEqual([n + '.pack' for n in names[1:]],
 
1075
                         sorted(packs._pack_transport.list_dir('.')))
 
1076
        # names[0] should not be present in the index anymore
 
1077
        self.assertEqual(names[1:],
 
1078
            sorted(set([osutils.splitext(n)[0] for n in
 
1079
                        packs._index_transport.list_dir('.')])))
 
1080
 
 
1081
    def test__obsolete_packs_missing_directory(self):
 
1082
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1083
        r.control_transport.rmdir('obsolete_packs')
 
1084
        names = packs.names()
 
1085
        pack = packs.get_pack_by_name(names[0])
 
1086
        # Schedule this one for removal
 
1087
        packs._remove_pack_from_memory(pack)
 
1088
        # Now trigger the obsoletion, and ensure that all the remaining files
 
1089
        # are still renamed
 
1090
        packs._obsolete_packs([pack])
 
1091
        self.assertEqual([n + '.pack' for n in names[1:]],
 
1092
                         sorted(packs._pack_transport.list_dir('.')))
 
1093
        # names[0] should not be present in the index anymore
 
1094
        self.assertEqual(names[1:],
 
1095
            sorted(set([osutils.splitext(n)[0] for n in
 
1096
                        packs._index_transport.list_dir('.')])))
 
1097
 
774
1098
    def test_pack_distribution_zero(self):
775
 
        format = self.get_format()
776
 
        repo = self.make_repository('.', format=format)
777
 
        packs = repo._pack_collection
 
1099
        packs = self.get_packs()
778
1100
        self.assertEqual([0], packs.pack_distribution(0))
779
1101
 
780
1102
    def test_ensure_loaded_unlocked(self):
781
 
        format = self.get_format()
782
 
        repo = self.make_repository('.', format=format)
 
1103
        packs = self.get_packs()
783
1104
        self.assertRaises(errors.ObjectNotLocked,
784
 
                          repo._pack_collection.ensure_loaded)
 
1105
                          packs.ensure_loaded)
785
1106
 
786
1107
    def test_pack_distribution_one_to_nine(self):
787
 
        format = self.get_format()
788
 
        repo = self.make_repository('.', format=format)
789
 
        packs = repo._pack_collection
 
1108
        packs = self.get_packs()
790
1109
        self.assertEqual([1],
791
1110
            packs.pack_distribution(1))
792
1111
        self.assertEqual([1, 1],
808
1127
 
809
1128
    def test_pack_distribution_stable_at_boundaries(self):
810
1129
        """When there are multi-rev packs the counts are stable."""
811
 
        format = self.get_format()
812
 
        repo = self.make_repository('.', format=format)
813
 
        packs = repo._pack_collection
 
1130
        packs = self.get_packs()
814
1131
        # in 10s:
815
1132
        self.assertEqual([10], packs.pack_distribution(10))
816
1133
        self.assertEqual([10, 1], packs.pack_distribution(11))
825
1142
        self.assertEqual([100, 100, 10, 1], packs.pack_distribution(211))
826
1143
 
827
1144
    def test_plan_pack_operations_2009_revisions_skip_all_packs(self):
828
 
        format = self.get_format()
829
 
        repo = self.make_repository('.', format=format)
830
 
        packs = repo._pack_collection
 
1145
        packs = self.get_packs()
831
1146
        existing_packs = [(2000, "big"), (9, "medium")]
832
1147
        # rev count - 2009 -> 2x1000 + 9x1
833
1148
        pack_operations = packs.plan_autopack_combinations(
835
1150
        self.assertEqual([], pack_operations)
836
1151
 
837
1152
    def test_plan_pack_operations_2010_revisions_skip_all_packs(self):
838
 
        format = self.get_format()
839
 
        repo = self.make_repository('.', format=format)
840
 
        packs = repo._pack_collection
 
1153
        packs = self.get_packs()
841
1154
        existing_packs = [(2000, "big"), (9, "medium"), (1, "single")]
842
1155
        # rev count - 2010 -> 2x1000 + 1x10
843
1156
        pack_operations = packs.plan_autopack_combinations(
845
1158
        self.assertEqual([], pack_operations)
846
1159
 
847
1160
    def test_plan_pack_operations_2010_combines_smallest_two(self):
848
 
        format = self.get_format()
849
 
        repo = self.make_repository('.', format=format)
850
 
        packs = repo._pack_collection
 
1161
        packs = self.get_packs()
851
1162
        existing_packs = [(1999, "big"), (9, "medium"), (1, "single2"),
852
1163
            (1, "single1")]
853
1164
        # rev count - 2010 -> 2x1000 + 1x10 (3)
854
1165
        pack_operations = packs.plan_autopack_combinations(
855
1166
            existing_packs, [1000, 1000, 10])
856
 
        self.assertEqual([[2, ["single2", "single1"]], [0, []]], pack_operations)
 
1167
        self.assertEqual([[2, ["single2", "single1"]]], pack_operations)
 
1168
 
 
1169
    def test_plan_pack_operations_creates_a_single_op(self):
 
1170
        packs = self.get_packs()
 
1171
        existing_packs = [(50, 'a'), (40, 'b'), (30, 'c'), (10, 'd'),
 
1172
                          (10, 'e'), (6, 'f'), (4, 'g')]
 
1173
        # rev count 150 -> 1x100 and 5x10
 
1174
        # The two size 10 packs do not need to be touched. The 50, 40, 30 would
 
1175
        # be combined into a single 120 size pack, and the 6 & 4 would
 
1176
        # becombined into a size 10 pack. However, if we have to rewrite them,
 
1177
        # we save a pack file with no increased I/O by putting them into the
 
1178
        # same file.
 
1179
        distribution = packs.pack_distribution(150)
 
1180
        pack_operations = packs.plan_autopack_combinations(existing_packs,
 
1181
                                                           distribution)
 
1182
        self.assertEqual([[130, ['a', 'b', 'c', 'f', 'g']]], pack_operations)
857
1183
 
858
1184
    def test_all_packs_none(self):
859
1185
        format = self.get_format()
897
1223
        tree.lock_read()
898
1224
        self.addCleanup(tree.unlock)
899
1225
        packs = tree.branch.repository._pack_collection
 
1226
        packs.reset()
900
1227
        packs.ensure_loaded()
901
1228
        name = packs.names()[0]
902
1229
        pack_1 = packs.get_pack_by_name(name)
911
1238
        # and the same instance should be returned on successive calls.
912
1239
        self.assertTrue(pack_1 is packs.get_pack_by_name(name))
913
1240
 
 
1241
    def test_reload_pack_names_new_entry(self):
 
1242
        tree, r, packs, revs = self.make_packs_and_alt_repo()
 
1243
        names = packs.names()
 
1244
        # Add a new pack file into the repository
 
1245
        rev4 = tree.commit('four')
 
1246
        new_names = tree.branch.repository._pack_collection.names()
 
1247
        new_name = set(new_names).difference(names)
 
1248
        self.assertEqual(1, len(new_name))
 
1249
        new_name = new_name.pop()
 
1250
        # The old collection hasn't noticed yet
 
1251
        self.assertEqual(names, packs.names())
 
1252
        self.assertTrue(packs.reload_pack_names())
 
1253
        self.assertEqual(new_names, packs.names())
 
1254
        # And the repository can access the new revision
 
1255
        self.assertEqual({rev4:(revs[-1],)}, r.get_parent_map([rev4]))
 
1256
        self.assertFalse(packs.reload_pack_names())
 
1257
 
 
1258
    def test_reload_pack_names_added_and_removed(self):
 
1259
        tree, r, packs, revs = self.make_packs_and_alt_repo()
 
1260
        names = packs.names()
 
1261
        # Now repack the whole thing
 
1262
        tree.branch.repository.pack()
 
1263
        new_names = tree.branch.repository._pack_collection.names()
 
1264
        # The other collection hasn't noticed yet
 
1265
        self.assertEqual(names, packs.names())
 
1266
        self.assertTrue(packs.reload_pack_names())
 
1267
        self.assertEqual(new_names, packs.names())
 
1268
        self.assertEqual({revs[-1]:(revs[-2],)}, r.get_parent_map([revs[-1]]))
 
1269
        self.assertFalse(packs.reload_pack_names())
 
1270
 
 
1271
    def test_reload_pack_names_preserves_pending(self):
 
1272
        # TODO: Update this to also test for pending-deleted names
 
1273
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1274
        # We will add one pack (via start_write_group + insert_record_stream),
 
1275
        # and remove another pack (via _remove_pack_from_memory)
 
1276
        orig_names = packs.names()
 
1277
        orig_at_load = packs._packs_at_load
 
1278
        to_remove_name = iter(orig_names).next()
 
1279
        r.start_write_group()
 
1280
        self.addCleanup(r.abort_write_group)
 
1281
        r.texts.insert_record_stream([versionedfile.FulltextContentFactory(
 
1282
            ('text', 'rev'), (), None, 'content\n')])
 
1283
        new_pack = packs._new_pack
 
1284
        self.assertTrue(new_pack.data_inserted())
 
1285
        new_pack.finish()
 
1286
        packs.allocate(new_pack)
 
1287
        packs._new_pack = None
 
1288
        removed_pack = packs.get_pack_by_name(to_remove_name)
 
1289
        packs._remove_pack_from_memory(removed_pack)
 
1290
        names = packs.names()
 
1291
        all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
 
1292
        new_names = set([x[0][0] for x in new_nodes])
 
1293
        self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
 
1294
        self.assertEqual(set(names) - set(orig_names), new_names)
 
1295
        self.assertEqual(set([new_pack.name]), new_names)
 
1296
        self.assertEqual([to_remove_name],
 
1297
                         sorted([x[0][0] for x in deleted_nodes]))
 
1298
        packs.reload_pack_names()
 
1299
        reloaded_names = packs.names()
 
1300
        self.assertEqual(orig_at_load, packs._packs_at_load)
 
1301
        self.assertEqual(names, reloaded_names)
 
1302
        all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
 
1303
        new_names = set([x[0][0] for x in new_nodes])
 
1304
        self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
 
1305
        self.assertEqual(set(names) - set(orig_names), new_names)
 
1306
        self.assertEqual(set([new_pack.name]), new_names)
 
1307
        self.assertEqual([to_remove_name],
 
1308
                         sorted([x[0][0] for x in deleted_nodes]))
 
1309
 
 
1310
    def test_autopack_obsoletes_new_pack(self):
 
1311
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1312
        packs._max_pack_count = lambda x: 1
 
1313
        packs.pack_distribution = lambda x: [10]
 
1314
        r.start_write_group()
 
1315
        r.revisions.insert_record_stream([versionedfile.FulltextContentFactory(
 
1316
            ('bogus-rev',), (), None, 'bogus-content\n')])
 
1317
        # This should trigger an autopack, which will combine everything into a
 
1318
        # single pack file.
 
1319
        new_names = r.commit_write_group()
 
1320
        names = packs.names()
 
1321
        self.assertEqual(1, len(names))
 
1322
        self.assertEqual([names[0] + '.pack'],
 
1323
                         packs._pack_transport.list_dir('.'))
 
1324
 
 
1325
    def test_autopack_reloads_and_stops(self):
 
1326
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1327
        # After we have determined what needs to be autopacked, trigger a
 
1328
        # full-pack via the other repo which will cause us to re-evaluate and
 
1329
        # decide we don't need to do anything
 
1330
        orig_execute = packs._execute_pack_operations
 
1331
        def _munged_execute_pack_ops(*args, **kwargs):
 
1332
            tree.branch.repository.pack()
 
1333
            return orig_execute(*args, **kwargs)
 
1334
        packs._execute_pack_operations = _munged_execute_pack_ops
 
1335
        packs._max_pack_count = lambda x: 1
 
1336
        packs.pack_distribution = lambda x: [10]
 
1337
        self.assertFalse(packs.autopack())
 
1338
        self.assertEqual(1, len(packs.names()))
 
1339
        self.assertEqual(tree.branch.repository._pack_collection.names(),
 
1340
                         packs.names())
 
1341
 
 
1342
    def test__save_pack_names(self):
 
1343
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1344
        names = packs.names()
 
1345
        pack = packs.get_pack_by_name(names[0])
 
1346
        packs._remove_pack_from_memory(pack)
 
1347
        packs._save_pack_names(obsolete_packs=[pack])
 
1348
        cur_packs = packs._pack_transport.list_dir('.')
 
1349
        self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
 
1350
        # obsolete_packs will also have stuff like .rix and .iix present.
 
1351
        obsolete_packs = packs.transport.list_dir('obsolete_packs')
 
1352
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
 
1353
        self.assertEqual([pack.name], sorted(obsolete_names))
 
1354
 
 
1355
    def test__save_pack_names_already_obsoleted(self):
 
1356
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1357
        names = packs.names()
 
1358
        pack = packs.get_pack_by_name(names[0])
 
1359
        packs._remove_pack_from_memory(pack)
 
1360
        # We are going to simulate a concurrent autopack by manually obsoleting
 
1361
        # the pack directly.
 
1362
        packs._obsolete_packs([pack])
 
1363
        packs._save_pack_names(clear_obsolete_packs=True,
 
1364
                               obsolete_packs=[pack])
 
1365
        cur_packs = packs._pack_transport.list_dir('.')
 
1366
        self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
 
1367
        # Note that while we set clear_obsolete_packs=True, it should not
 
1368
        # delete a pack file that we have also scheduled for obsoletion.
 
1369
        obsolete_packs = packs.transport.list_dir('obsolete_packs')
 
1370
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
 
1371
        self.assertEqual([pack.name], sorted(obsolete_names))
 
1372
 
 
1373
    def test_pack_no_obsolete_packs_directory(self):
 
1374
        """Bug #314314, don't fail if obsolete_packs directory does
 
1375
        not exist."""
 
1376
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
 
1377
        r.control_transport.rmdir('obsolete_packs')
 
1378
        packs._clear_obsolete_packs()
 
1379
 
914
1380
 
915
1381
class TestPack(TestCaseWithTransport):
916
1382
    """Tests for the Pack object."""
970
1436
        pack_transport = self.get_transport('pack')
971
1437
        index_transport = self.get_transport('index')
972
1438
        upload_transport.mkdir('.')
973
 
        pack = pack_repo.NewPack(upload_transport, index_transport,
974
 
            pack_transport)
975
 
        self.assertIsInstance(pack.revision_index, InMemoryGraphIndex)
976
 
        self.assertIsInstance(pack.inventory_index, InMemoryGraphIndex)
977
 
        self.assertIsInstance(pack._hash, type(md5.new()))
 
1439
        collection = pack_repo.RepositoryPackCollection(
 
1440
            repo=None,
 
1441
            transport=self.get_transport('.'),
 
1442
            index_transport=index_transport,
 
1443
            upload_transport=upload_transport,
 
1444
            pack_transport=pack_transport,
 
1445
            index_builder_class=BTreeBuilder,
 
1446
            index_class=BTreeGraphIndex,
 
1447
            use_chk_index=False)
 
1448
        pack = pack_repo.NewPack(collection)
 
1449
        self.addCleanup(pack.abort) # Make sure the write stream gets closed
 
1450
        self.assertIsInstance(pack.revision_index, BTreeBuilder)
 
1451
        self.assertIsInstance(pack.inventory_index, BTreeBuilder)
 
1452
        self.assertIsInstance(pack._hash, type(osutils.md5()))
978
1453
        self.assertTrue(pack.upload_transport is upload_transport)
979
1454
        self.assertTrue(pack.index_transport is index_transport)
980
1455
        self.assertTrue(pack.pack_transport is pack_transport)
987
1462
class TestPacker(TestCaseWithTransport):
988
1463
    """Tests for the packs repository Packer class."""
989
1464
 
990
 
    # To date, this class has been factored out and nothing new added to it;
991
 
    # thus there are not yet any tests.
992
 
 
993
 
 
994
 
class TestInterDifferingSerializer(TestCaseWithTransport):
995
 
 
996
 
    def test_progress_bar(self):
997
 
        tree = self.make_branch_and_tree('tree')
998
 
        tree.commit('rev1', rev_id='rev-1')
999
 
        tree.commit('rev2', rev_id='rev-2')
1000
 
        tree.commit('rev3', rev_id='rev-3')
1001
 
        repo = self.make_repository('repo')
1002
 
        inter_repo = repository.InterDifferingSerializer(
1003
 
            tree.branch.repository, repo)
1004
 
        pb = progress.InstrumentedProgress(to_file=StringIO())
1005
 
        pb.never_throttle = True
1006
 
        inter_repo.fetch('rev-1', pb)
1007
 
        self.assertEqual('Transferring revisions', pb.last_msg)
1008
 
        self.assertEqual(1, pb.last_cnt)
1009
 
        self.assertEqual(1, pb.last_total)
1010
 
        inter_repo.fetch('rev-3', pb)
1011
 
        self.assertEqual(2, pb.last_cnt)
1012
 
        self.assertEqual(2, pb.last_total)
 
1465
    def test_pack_optimizes_pack_order(self):
 
1466
        builder = self.make_branch_builder('.', format="1.9")
 
1467
        builder.start_series()
 
1468
        builder.build_snapshot('A', None, [
 
1469
            ('add', ('', 'root-id', 'directory', None)),
 
1470
            ('add', ('f', 'f-id', 'file', 'content\n'))])
 
1471
        builder.build_snapshot('B', ['A'],
 
1472
            [('modify', ('f-id', 'new-content\n'))])
 
1473
        builder.build_snapshot('C', ['B'],
 
1474
            [('modify', ('f-id', 'third-content\n'))])
 
1475
        builder.build_snapshot('D', ['C'],
 
1476
            [('modify', ('f-id', 'fourth-content\n'))])
 
1477
        b = builder.get_branch()
 
1478
        b.lock_read()
 
1479
        builder.finish_series()
 
1480
        self.addCleanup(b.unlock)
 
1481
        # At this point, we should have 4 pack files available
 
1482
        # Because of how they were built, they correspond to
 
1483
        # ['D', 'C', 'B', 'A']
 
1484
        packs = b.repository._pack_collection.packs
 
1485
        packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
 
1486
                                  packs, 'testing',
 
1487
                                  revision_ids=['B', 'C'])
 
1488
        # Now, when we are copying the B & C revisions, their pack files should
 
1489
        # be moved to the front of the stack
 
1490
        # The new ordering moves B & C to the front of the .packs attribute,
 
1491
        # and leaves the others in the original order.
 
1492
        new_packs = [packs[1], packs[2], packs[0], packs[3]]
 
1493
        new_pack = packer.pack()
 
1494
        self.assertEqual(new_packs, packer.packs)
 
1495
 
 
1496
 
 
1497
class TestOptimisingPacker(TestCaseWithTransport):
 
1498
    """Tests for the OptimisingPacker class."""
 
1499
 
 
1500
    def get_pack_collection(self):
 
1501
        repo = self.make_repository('.')
 
1502
        return repo._pack_collection
 
1503
 
 
1504
    def test_open_pack_will_optimise(self):
 
1505
        packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
 
1506
                                            [], '.test')
 
1507
        new_pack = packer.open_pack()
 
1508
        self.addCleanup(new_pack.abort) # ensure cleanup
 
1509
        self.assertIsInstance(new_pack, pack_repo.NewPack)
 
1510
        self.assertTrue(new_pack.revision_index._optimize_for_size)
 
1511
        self.assertTrue(new_pack.inventory_index._optimize_for_size)
 
1512
        self.assertTrue(new_pack.text_index._optimize_for_size)
 
1513
        self.assertTrue(new_pack.signature_index._optimize_for_size)
 
1514
 
 
1515
 
 
1516
class TestGCCHKPacker(TestCaseWithTransport):
 
1517
 
 
1518
    def make_abc_branch(self):
 
1519
        builder = self.make_branch_builder('source')
 
1520
        builder.start_series()
 
1521
        builder.build_snapshot('A', None, [
 
1522
            ('add', ('', 'root-id', 'directory', None)),
 
1523
            ('add', ('file', 'file-id', 'file', 'content\n')),
 
1524
            ])
 
1525
        builder.build_snapshot('B', ['A'], [
 
1526
            ('add', ('dir', 'dir-id', 'directory', None))])
 
1527
        builder.build_snapshot('C', ['B'], [
 
1528
            ('modify', ('file-id', 'new content\n'))])
 
1529
        builder.finish_series()
 
1530
        return builder.get_branch()
 
1531
 
 
1532
    def make_branch_with_disjoint_inventory_and_revision(self):
 
1533
        """a repo with separate packs for a revisions Revision and Inventory.
 
1534
 
 
1535
        There will be one pack file that holds the Revision content, and one
 
1536
        for the Inventory content.
 
1537
 
 
1538
        :return: (repository,
 
1539
                  pack_name_with_rev_A_Revision,
 
1540
                  pack_name_with_rev_A_Inventory,
 
1541
                  pack_name_with_rev_C_content)
 
1542
        """
 
1543
        b_source = self.make_abc_branch()
 
1544
        b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
 
1545
        b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
 
1546
        b_stacked.lock_write()
 
1547
        self.addCleanup(b_stacked.unlock)
 
1548
        b_stacked.fetch(b_source, 'B')
 
1549
        # Now re-open the stacked repo directly (no fallbacks) so that we can
 
1550
        # fill in the A rev.
 
1551
        repo_not_stacked = b_stacked.bzrdir.open_repository()
 
1552
        repo_not_stacked.lock_write()
 
1553
        self.addCleanup(repo_not_stacked.unlock)
 
1554
        # Now we should have a pack file with A's inventory, but not its
 
1555
        # Revision
 
1556
        self.assertEqual([('A',), ('B',)],
 
1557
                         sorted(repo_not_stacked.inventories.keys()))
 
1558
        self.assertEqual([('B',)],
 
1559
                         sorted(repo_not_stacked.revisions.keys()))
 
1560
        stacked_pack_names = repo_not_stacked._pack_collection.names()
 
1561
        # We have a couple names here, figure out which has A's inventory
 
1562
        for name in stacked_pack_names:
 
1563
            pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
 
1564
            keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
 
1565
            if ('A',) in keys:
 
1566
                inv_a_pack_name = name
 
1567
                break
 
1568
        else:
 
1569
            self.fail('Could not find pack containing A\'s inventory')
 
1570
        repo_not_stacked.fetch(b_source.repository, 'A')
 
1571
        self.assertEqual([('A',), ('B',)],
 
1572
                         sorted(repo_not_stacked.revisions.keys()))
 
1573
        new_pack_names = set(repo_not_stacked._pack_collection.names())
 
1574
        rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
 
1575
        self.assertEqual(1, len(rev_a_pack_names))
 
1576
        rev_a_pack_name = list(rev_a_pack_names)[0]
 
1577
        # Now fetch 'C', so we have a couple pack files to join
 
1578
        repo_not_stacked.fetch(b_source.repository, 'C')
 
1579
        rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
 
1580
        rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
 
1581
        self.assertEqual(1, len(rev_c_pack_names))
 
1582
        rev_c_pack_name = list(rev_c_pack_names)[0]
 
1583
        return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
 
1584
                rev_c_pack_name)
 
1585
 
 
1586
    def test_pack_with_distant_inventories(self):
 
1587
        # See https://bugs.launchpad.net/bzr/+bug/437003
 
1588
        # When repacking, it is possible to have an inventory in a different
 
1589
        # pack file than the associated revision. An autopack can then come
 
1590
        # along, and miss that inventory, and complain.
 
1591
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1592
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1593
        a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
 
1594
        c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
 
1595
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1596
                    [a_pack, c_pack], '.test-pack')
 
1597
        # This would raise ValueError in bug #437003, but should not raise an
 
1598
        # error once fixed.
 
1599
        packer.pack()
 
1600
 
 
1601
    def test_pack_with_missing_inventory(self):
 
1602
        # Similar to test_pack_with_missing_inventory, but this time, we force
 
1603
        # the A inventory to actually be gone from the repository.
 
1604
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
 
1605
         ) = self.make_branch_with_disjoint_inventory_and_revision()
 
1606
        inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
 
1607
        repo._pack_collection._remove_pack_from_memory(inv_a_pack)
 
1608
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
 
1609
            repo._pack_collection.all_packs(), '.test-pack')
 
1610
        e = self.assertRaises(ValueError, packer.pack)
 
1611
        packer.new_pack.abort()
 
1612
        self.assertContainsRe(str(e),
 
1613
            r"We are missing inventories for revisions: .*'A'")
 
1614
 
 
1615
 
 
1616
class TestCrossFormatPacks(TestCaseWithTransport):
 
1617
 
 
1618
    def log_pack(self, hint=None):
 
1619
        self.calls.append(('pack', hint))
 
1620
        self.orig_pack(hint=hint)
 
1621
        if self.expect_hint:
 
1622
            self.assertTrue(hint)
 
1623
 
 
1624
    def run_stream(self, src_fmt, target_fmt, expect_pack_called):
 
1625
        self.expect_hint = expect_pack_called
 
1626
        self.calls = []
 
1627
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
 
1628
        source_tree.lock_write()
 
1629
        self.addCleanup(source_tree.unlock)
 
1630
        tip = source_tree.commit('foo')
 
1631
        target = self.make_repository('target', format=target_fmt)
 
1632
        target.lock_write()
 
1633
        self.addCleanup(target.unlock)
 
1634
        source = source_tree.branch.repository._get_source(target._format)
 
1635
        self.orig_pack = target.pack
 
1636
        self.overrideAttr(target, "pack", self.log_pack)
 
1637
        search = target.search_missing_revision_ids(
 
1638
            source_tree.branch.repository, revision_ids=[tip])
 
1639
        stream = source.get_stream(search)
 
1640
        from_format = source_tree.branch.repository._format
 
1641
        sink = target._get_sink()
 
1642
        sink.insert_stream(stream, from_format, [])
 
1643
        if expect_pack_called:
 
1644
            self.assertLength(1, self.calls)
 
1645
        else:
 
1646
            self.assertLength(0, self.calls)
 
1647
 
 
1648
    def run_fetch(self, src_fmt, target_fmt, expect_pack_called):
 
1649
        self.expect_hint = expect_pack_called
 
1650
        self.calls = []
 
1651
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
 
1652
        source_tree.lock_write()
 
1653
        self.addCleanup(source_tree.unlock)
 
1654
        tip = source_tree.commit('foo')
 
1655
        target = self.make_repository('target', format=target_fmt)
 
1656
        target.lock_write()
 
1657
        self.addCleanup(target.unlock)
 
1658
        source = source_tree.branch.repository
 
1659
        self.orig_pack = target.pack
 
1660
        self.overrideAttr(target, "pack", self.log_pack)
 
1661
        target.fetch(source)
 
1662
        if expect_pack_called:
 
1663
            self.assertLength(1, self.calls)
 
1664
        else:
 
1665
            self.assertLength(0, self.calls)
 
1666
 
 
1667
    def test_sink_format_hint_no(self):
 
1668
        # When the target format says packing makes no difference, pack is not
 
1669
        # called.
 
1670
        self.run_stream('1.9', 'rich-root-pack', False)
 
1671
 
 
1672
    def test_sink_format_hint_yes(self):
 
1673
        # When the target format says packing makes a difference, pack is
 
1674
        # called.
 
1675
        self.run_stream('1.9', '2a', True)
 
1676
 
 
1677
    def test_sink_format_same_no(self):
 
1678
        # When the formats are the same, pack is not called.
 
1679
        self.run_stream('2a', '2a', False)
 
1680
 
 
1681
    def test_IDS_format_hint_no(self):
 
1682
        # When the target format says packing makes no difference, pack is not
 
1683
        # called.
 
1684
        self.run_fetch('1.9', 'rich-root-pack', False)
 
1685
 
 
1686
    def test_IDS_format_hint_yes(self):
 
1687
        # When the target format says packing makes a difference, pack is
 
1688
        # called.
 
1689
        self.run_fetch('1.9', '2a', True)
 
1690
 
 
1691
    def test_IDS_format_same_no(self):
 
1692
        # When the formats are the same, pack is not called.
 
1693
        self.run_fetch('2a', '2a', False)
 
1694
 
 
1695
 
 
1696
class Test_LazyListJoin(tests.TestCase):
 
1697
 
 
1698
    def test__repr__(self):
 
1699
        lazy = repository._LazyListJoin(['a'], ['b'])
 
1700
        self.assertEqual("bzrlib.repository._LazyListJoin((['a'], ['b']))",
 
1701
                         repr(lazy))
 
1702
 
 
1703
 
 
1704
class TestFeatures(tests.TestCaseWithTransport):
 
1705
 
 
1706
    def test_open_with_present_feature(self):
 
1707
        self.addCleanup(
 
1708
            repository.RepositoryFormatMetaDir.unregister_feature,
 
1709
            "makes-cheese-sandwich")
 
1710
        repository.RepositoryFormatMetaDir.register_feature(
 
1711
            "makes-cheese-sandwich")
 
1712
        repo = self.make_repository('.')
 
1713
        repo.lock_write()
 
1714
        repo._format.features["makes-cheese-sandwich"] = "required"
 
1715
        repo._format.check_support_status(False)
 
1716
        repo.unlock()
 
1717
 
 
1718
    def test_open_with_missing_required_feature(self):
 
1719
        repo = self.make_repository('.')
 
1720
        repo.lock_write()
 
1721
        repo._format.features["makes-cheese-sandwich"] = "required"
 
1722
        self.assertRaises(errors.MissingFeature,
 
1723
            repo._format.check_support_status, False)