/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4634.170.1 by John Arbash Meinel
Fix bug #437003. Autopacking should not fail for an
1
# Copyright (C) 2006-2011 Canonical Ltd
1685.1.63 by Martin Pool
Small Transport fixups
2
#
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1685.1.63 by Martin Pool
Small Transport fixups
7
#
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1685.1.63 by Martin Pool
Small Transport fixups
12
#
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
16
17
"""Tests for the Repository facility that are not interface tests.
18
3689.1.4 by John Arbash Meinel
Doc strings that reference repository_implementations
19
For interface tests see tests/per_repository/*.py.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
20
21
For concrete class tests see this file, and for storage formats tests
22
also see this file.
23
"""
24
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
25
from stat import S_ISDIR
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
26
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
27
import bzrlib
5651.3.1 by Jelmer Vernooij
Add RepositoryFormatRegistry.
28
from bzrlib.errors import (
29
    UnknownFormatError,
30
    UnsupportedFormatError,
31
    )
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
32
from bzrlib import (
5365.5.20 by John Arbash Meinel
Add some tests that check the leaf factory is correct.
33
    btree_index,
5651.3.2 by Jelmer Vernooij
Fix deprecation warnings in test suite.
34
    symbol_versioning,
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
35
    tests,
5609.9.1 by Martin
Blindly change all users of get_transport to address the function via the transport module
36
    transport,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
37
    vf_search,
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
38
    )
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
39
from bzrlib.btree_index import BTreeBuilder, BTreeGraphIndex
5121.2.2 by Jelmer Vernooij
Remove more unused imports in the tests.
40
from bzrlib.index import GraphIndex
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
41
from bzrlib.repository import RepositoryFormat
2670.3.5 by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead.
42
from bzrlib.tests import (
43
    TestCase,
44
    TestCaseWithTransport,
45
    )
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
46
from bzrlib import (
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
47
    bzrdir,
48
    errors,
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
49
    inventory,
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
50
    osutils,
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
51
    repository,
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
52
    revision as _mod_revision,
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
53
    upgrade,
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
54
    versionedfile,
5815.4.15 by Jelmer Vernooij
Fix some imports.
55
    vf_repository,
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
56
    workingtree,
57
    )
3735.42.5 by John Arbash Meinel
Change the tests so we now just use a direct test that _get_source is
58
from bzrlib.repofmt import (
59
    groupcompress_repo,
60
    knitrepo,
5757.2.2 by Jelmer Vernooij
Fix imports.
61
    knitpack_repo,
3735.42.5 by John Arbash Meinel
Change the tests so we now just use a direct test that _get_source is
62
    pack_repo,
63
    )
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
64
65
66
class TestDefaultFormat(TestCase):
67
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
68
    def test_get_set_default_format(self):
2204.5.3 by Aaron Bentley
zap old repository default handling
69
        old_default = bzrdir.format_registry.get('default')
70
        private_default = old_default().repository_format.__class__
5651.3.2 by Jelmer Vernooij
Fix deprecation warnings in test suite.
71
        old_format = repository.format_registry.get_default()
1910.2.33 by Aaron Bentley
Fix default format test
72
        self.assertTrue(isinstance(old_format, private_default))
2204.5.3 by Aaron Bentley
zap old repository default handling
73
        def make_sample_bzrdir():
74
            my_bzrdir = bzrdir.BzrDirMetaFormat1()
75
            my_bzrdir.repository_format = SampleRepositoryFormat()
76
            return my_bzrdir
77
        bzrdir.format_registry.remove('default')
78
        bzrdir.format_registry.register('sample', make_sample_bzrdir, '')
79
        bzrdir.format_registry.set_default('sample')
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
80
        # creating a repository should now create an instrumented dir.
81
        try:
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
82
            # the default branch format is used by the meta dir format
83
            # which is not the default bzrdir format at this point
1685.1.63 by Martin Pool
Small Transport fixups
84
            dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
85
            result = dir.create_repository()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
86
            self.assertEqual(result, 'A bzr repository dir')
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
87
        finally:
2204.5.3 by Aaron Bentley
zap old repository default handling
88
            bzrdir.format_registry.remove('default')
2363.5.14 by Aaron Bentley
Prevent repository.get_set_default_format from corrupting inventory
89
            bzrdir.format_registry.remove('sample')
2204.5.3 by Aaron Bentley
zap old repository default handling
90
            bzrdir.format_registry.register('default', old_default, '')
5651.3.2 by Jelmer Vernooij
Fix deprecation warnings in test suite.
91
        self.assertIsInstance(repository.format_registry.get_default(),
2204.5.3 by Aaron Bentley
zap old repository default handling
92
                              old_format.__class__)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
93
94
6349.2.6 by Jelmer Vernooij
Add test for RepositoryFormatMetaDir.from_string.
95
class SampleRepositoryFormat(repository.RepositoryFormatMetaDir):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
96
    """A sample format
97
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
98
    this format is initializable, unsupported to aid in testing the
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
99
    open and open(unsupported=True) routines.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
100
    """
101
6349.2.6 by Jelmer Vernooij
Add test for RepositoryFormatMetaDir.from_string.
102
    @classmethod
103
    def get_format_string(cls):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
104
        """See RepositoryFormat.get_format_string()."""
105
        return "Sample .bzr repository format."
106
1534.6.1 by Robert Collins
allow API creation of shared repositories
107
    def initialize(self, a_bzrdir, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
108
        """Initialize a repository in a BzrDir"""
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
109
        t = a_bzrdir.get_repository_transport(self)
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
110
        t.put_bytes('format', self.get_format_string())
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
111
        return 'A bzr repository dir'
112
113
    def is_supported(self):
114
        return False
115
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
116
    def open(self, a_bzrdir, _found=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
117
        return "opened repository."
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
118
119
5651.3.5 by Jelmer Vernooij
add tests for 'extra' repository formats.
120
class SampleExtraRepositoryFormat(repository.RepositoryFormat):
121
    """A sample format that can not be used in a metadir
122
123
    """
124
125
    def get_format_string(self):
126
        raise NotImplementedError
127
128
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
129
class TestRepositoryFormat(TestCaseWithTransport):
130
    """Tests for the Repository format detection used by the bzr meta dir facility.BzrBranchFormat facility."""
131
132
    def test_find_format(self):
133
        # is the right format object found for a repository?
134
        # create a branch with a few known format objects.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
135
        # this is not quite the same as
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
136
        self.build_tree(["foo/", "bar/"])
137
        def check_format(format, url):
138
            dir = format._matchingbzrdir.initialize(url)
139
            format.initialize(dir)
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
140
            t = transport.get_transport_from_path(url)
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
141
            found_format = repository.RepositoryFormatMetaDir.find_format(dir)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
142
            self.assertIsInstance(found_format, format.__class__)
5582.10.54 by Jelmer Vernooij
Use default format rather than RepositoryFormat7.
143
        check_format(repository.format_registry.get_default(), "bar")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
144
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
145
    def test_find_format_no_repository(self):
146
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
147
        self.assertRaises(errors.NoRepositoryPresent,
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
148
                          repository.RepositoryFormatMetaDir.find_format,
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
149
                          dir)
150
6349.2.6 by Jelmer Vernooij
Add test for RepositoryFormatMetaDir.from_string.
151
    def test_from_string(self):
152
        self.assertIsInstance(
153
            SampleRepositoryFormat.from_string(
154
                "Sample .bzr repository format."),
155
            SampleRepositoryFormat)
6213.1.54 by Jelmer Vernooij
Fix tests.
156
        self.assertRaises(AssertionError,
6349.2.6 by Jelmer Vernooij
Add test for RepositoryFormatMetaDir.from_string.
157
            SampleRepositoryFormat.from_string,
158
                "Different .bzr repository format.")
159
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
160
    def test_find_format_unknown_format(self):
161
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
162
        SampleRepositoryFormat().initialize(dir)
163
        self.assertRaises(UnknownFormatError,
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
164
                          repository.RepositoryFormatMetaDir.find_format,
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
165
                          dir)
166
6213.1.16 by Jelmer Vernooij
Feature support in repository.
167
    def test_find_format_with_features(self):
168
        tree = self.make_branch_and_tree('.', format='2a')
6213.1.58 by Jelmer Vernooij
Use update_feature_flags everywhere.
169
        tree.branch.repository.update_feature_flags({"name": "necessity"})
6213.1.28 by Jelmer Vernooij
Fix tests.
170
        found_format = repository.RepositoryFormatMetaDir.find_format(tree.bzrdir)
171
        self.assertIsInstance(found_format, repository.RepositoryFormatMetaDir)
6213.1.32 by Jelmer Vernooij
Fix check support status.
172
        self.assertEquals(found_format.features.get("name"), "necessity")
173
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
174
            True)
175
        self.addCleanup(repository.RepositoryFormatMetaDir.unregister_feature,
176
            "name")
177
        repository.RepositoryFormatMetaDir.register_feature("name")
178
        found_format.check_support_status(True)
6213.1.16 by Jelmer Vernooij
Feature support in repository.
179
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
180
    def test_register_unregister_format(self):
5651.3.1 by Jelmer Vernooij
Add RepositoryFormatRegistry.
181
        # Test deprecated format registration functions
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
182
        format = SampleRepositoryFormat()
183
        # make a control dir
184
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
185
        # make a repo
186
        format.initialize(dir)
187
        # register a format for it.
5651.3.2 by Jelmer Vernooij
Fix deprecation warnings in test suite.
188
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
189
            repository.RepositoryFormat.register_format, format)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
190
        # which repository.Open will refuse (not supported)
5651.3.1 by Jelmer Vernooij
Add RepositoryFormatRegistry.
191
        self.assertRaises(UnsupportedFormatError, repository.Repository.open,
192
            self.get_url())
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
193
        # but open(unsupported) will work
194
        self.assertEqual(format.open(dir), "opened repository.")
195
        # unregister the format
5651.3.2 by Jelmer Vernooij
Fix deprecation warnings in test suite.
196
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
197
            repository.RepositoryFormat.unregister_format, format)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
198
199
5651.3.1 by Jelmer Vernooij
Add RepositoryFormatRegistry.
200
class TestRepositoryFormatRegistry(TestCase):
201
202
    def setUp(self):
203
        super(TestRepositoryFormatRegistry, self).setUp()
204
        self.registry = repository.RepositoryFormatRegistry()
205
206
    def test_register_unregister_format(self):
207
        format = SampleRepositoryFormat()
208
        self.registry.register(format)
209
        self.assertEquals(format, self.registry.get("Sample .bzr repository format."))
210
        self.registry.remove(format)
211
        self.assertRaises(KeyError, self.registry.get, "Sample .bzr repository format.")
212
5651.3.2 by Jelmer Vernooij
Fix deprecation warnings in test suite.
213
    def test_get_all(self):
5651.3.1 by Jelmer Vernooij
Add RepositoryFormatRegistry.
214
        format = SampleRepositoryFormat()
5651.3.7 by Jelmer Vernooij
Fix tests.
215
        self.assertEquals([], self.registry._get_all())
5651.3.1 by Jelmer Vernooij
Add RepositoryFormatRegistry.
216
        self.registry.register(format)
5651.3.7 by Jelmer Vernooij
Fix tests.
217
        self.assertEquals([format], self.registry._get_all())
5651.3.5 by Jelmer Vernooij
add tests for 'extra' repository formats.
218
219
    def test_register_extra(self):
220
        format = SampleExtraRepositoryFormat()
5651.3.7 by Jelmer Vernooij
Fix tests.
221
        self.assertEquals([], self.registry._get_all())
5651.3.5 by Jelmer Vernooij
add tests for 'extra' repository formats.
222
        self.registry.register_extra(format)
5651.3.7 by Jelmer Vernooij
Fix tests.
223
        self.assertEquals([format], self.registry._get_all())
5651.3.5 by Jelmer Vernooij
add tests for 'extra' repository formats.
224
225
    def test_register_extra_lazy(self):
5651.3.7 by Jelmer Vernooij
Fix tests.
226
        self.assertEquals([], self.registry._get_all())
5651.3.5 by Jelmer Vernooij
add tests for 'extra' repository formats.
227
        self.registry.register_extra_lazy("bzrlib.tests.test_repository",
228
            "SampleExtraRepositoryFormat")
5651.3.7 by Jelmer Vernooij
Fix tests.
229
        formats = self.registry._get_all()
5651.3.5 by Jelmer Vernooij
add tests for 'extra' repository formats.
230
        self.assertEquals(1, len(formats))
231
        self.assertIsInstance(formats[0], SampleExtraRepositoryFormat)
5651.3.1 by Jelmer Vernooij
Add RepositoryFormatRegistry.
232
233
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
234
class TestFormatKnit1(TestCaseWithTransport):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
235
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
236
    def test_attribute__fetch_order(self):
237
        """Knits need topological data insertion."""
238
        repo = self.make_repository('.',
239
                format=bzrdir.format_registry.get('knit')())
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
240
        self.assertEqual('topological', repo._format._fetch_order)
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
241
242
    def test_attribute__fetch_uses_deltas(self):
243
        """Knits reuse deltas."""
244
        repo = self.make_repository('.',
245
                format=bzrdir.format_registry.get('knit')())
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
246
        self.assertEqual(True, repo._format._fetch_uses_deltas)
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
247
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
248
    def test_disk_layout(self):
249
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
250
        repo = knitrepo.RepositoryFormatKnit1().initialize(control)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
251
        # in case of side effects of locking.
252
        repo.lock_write()
253
        repo.unlock()
254
        # we want:
255
        # format 'Bazaar-NG Knit Repository Format 1'
1553.5.62 by Martin Pool
Add tests that MetaDir repositories use LockDirs
256
        # lock: is a directory
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
257
        # inventory.weave == empty_weave
258
        # empty revision-store directory
259
        # empty weaves directory
260
        t = control.get_repository_transport(None)
261
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
262
                             t.get('format').read())
1553.5.57 by Martin Pool
[merge] sync from bzr.dev
263
        # XXX: no locks left when unlocked at the moment
264
        # self.assertEqualDiff('', t.get('lock').read())
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
265
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
266
        self.check_knits(t)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
267
        # Check per-file knits.
268
        branch = control.create_branch()
269
        tree = control.create_workingtree()
270
        tree.add(['foo'], ['Nasty-IdC:'], ['file'])
271
        tree.put_file_bytes_non_atomic('Nasty-IdC:', '')
272
        tree.commit('1st post', rev_id='foo')
273
        self.assertHasKnit(t, 'knits/e8/%254easty-%2549d%2543%253a',
274
            '\nfoo fulltext 0 81  :')
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
275
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
276
    def assertHasKnit(self, t, knit_name, extra_content=''):
1654.1.3 by Robert Collins
Refactor repository knit tests slightly to remove duplication - add a assertHasKnit method.
277
        """Assert that knit_name exists on t."""
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
278
        self.assertEqualDiff('# bzr knit index 8\n' + extra_content,
1654.1.3 by Robert Collins
Refactor repository knit tests slightly to remove duplication - add a assertHasKnit method.
279
                             t.get(knit_name + '.kndx').read())
280
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
281
    def check_knits(self, t):
282
        """check knit content for a repository."""
1654.1.3 by Robert Collins
Refactor repository knit tests slightly to remove duplication - add a assertHasKnit method.
283
        self.assertHasKnit(t, 'inventory')
284
        self.assertHasKnit(t, 'revisions')
285
        self.assertHasKnit(t, 'signatures')
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
286
287
    def test_shared_disk_layout(self):
288
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
289
        repo = knitrepo.RepositoryFormatKnit1().initialize(control, shared=True)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
290
        # we want:
291
        # format 'Bazaar-NG Knit Repository Format 1'
1553.5.62 by Martin Pool
Add tests that MetaDir repositories use LockDirs
292
        # lock: is a directory
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
293
        # inventory.weave == empty_weave
294
        # empty revision-store directory
295
        # empty weaves directory
296
        # a 'shared-storage' marker file.
297
        t = control.get_repository_transport(None)
298
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
299
                             t.get('format').read())
1553.5.57 by Martin Pool
[merge] sync from bzr.dev
300
        # XXX: no locks left when unlocked at the moment
301
        # self.assertEqualDiff('', t.get('lock').read())
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
302
        self.assertEqualDiff('', t.get('shared-storage').read())
303
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
304
        self.check_knits(t)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
305
306
    def test_shared_no_tree_disk_layout(self):
307
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
308
        repo = knitrepo.RepositoryFormatKnit1().initialize(control, shared=True)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
309
        repo.set_make_working_trees(False)
310
        # we want:
311
        # format 'Bazaar-NG Knit Repository Format 1'
312
        # lock ''
313
        # inventory.weave == empty_weave
314
        # empty revision-store directory
315
        # empty weaves directory
316
        # a 'shared-storage' marker file.
317
        t = control.get_repository_transport(None)
318
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
319
                             t.get('format').read())
1553.5.57 by Martin Pool
[merge] sync from bzr.dev
320
        # XXX: no locks left when unlocked at the moment
321
        # self.assertEqualDiff('', t.get('lock').read())
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
322
        self.assertEqualDiff('', t.get('shared-storage').read())
323
        self.assertEqualDiff('', t.get('no-working-trees').read())
324
        repo.set_make_working_trees(True)
325
        self.assertFalse(t.has('no-working-trees'))
326
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
327
        self.check_knits(t)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
328
2917.2.1 by John Arbash Meinel
Fix bug #152360. The xml5 serializer should be using
329
    def test_deserialise_sets_root_revision(self):
330
        """We must have a inventory.root.revision
331
332
        Old versions of the XML5 serializer did not set the revision_id for
333
        the whole inventory. So we grab the one from the expected text. Which
334
        is valid when the api is not being abused.
335
        """
336
        repo = self.make_repository('.',
337
                format=bzrdir.format_registry.get('knit')())
338
        inv_xml = '<inventory format="5">\n</inventory>\n'
4988.3.3 by Jelmer Vernooij
rename Repository.deserialise_inventory to Repository._deserialise_inventory.
339
        inv = repo._deserialise_inventory('test-rev-id', inv_xml)
2917.2.1 by John Arbash Meinel
Fix bug #152360. The xml5 serializer should be using
340
        self.assertEqual('test-rev-id', inv.root.revision)
341
342
    def test_deserialise_uses_global_revision_id(self):
343
        """If it is set, then we re-use the global revision id"""
344
        repo = self.make_repository('.',
345
                format=bzrdir.format_registry.get('knit')())
346
        inv_xml = ('<inventory format="5" revision_id="other-rev-id">\n'
347
                   '</inventory>\n')
348
        # Arguably, the deserialise_inventory should detect a mismatch, and
349
        # raise an error, rather than silently using one revision_id over the
350
        # other.
4988.3.3 by Jelmer Vernooij
rename Repository.deserialise_inventory to Repository._deserialise_inventory.
351
        self.assertRaises(AssertionError, repo._deserialise_inventory,
3169.2.2 by Robert Collins
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.
352
            'test-rev-id', inv_xml)
4988.3.3 by Jelmer Vernooij
rename Repository.deserialise_inventory to Repository._deserialise_inventory.
353
        inv = repo._deserialise_inventory('other-rev-id', inv_xml)
2917.2.1 by John Arbash Meinel
Fix bug #152360. The xml5 serializer should be using
354
        self.assertEqual('other-rev-id', inv.root.revision)
355
3221.3.1 by Robert Collins
* Repository formats have a new supported-feature attribute
356
    def test_supports_external_lookups(self):
357
        repo = self.make_repository('.',
358
                format=bzrdir.format_registry.get('knit')())
359
        self.assertFalse(repo._format.supports_external_lookups)
360
2535.3.53 by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead.
361
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
362
class DummyRepository(object):
363
    """A dummy repository for testing."""
364
3452.2.11 by Andrew Bennetts
Merge thread.
365
    _format = None
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
366
    _serializer = None
367
368
    def supports_rich_root(self):
4606.4.1 by Robert Collins
Prepare test_repository's inter_repository tests for 2a.
369
        if self._format is not None:
370
            return self._format.rich_root_data
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
371
        return False
372
3709.5.10 by Andrew Bennetts
Fix test failure caused by missing attributes on DummyRepository.
373
    def get_graph(self):
374
        raise NotImplementedError
375
376
    def get_parent_map(self, revision_ids):
377
        raise NotImplementedError
378
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
379
380
class InterDummy(repository.InterRepository):
381
    """An inter-repository optimised code path for DummyRepository.
382
383
    This is for use during testing where we use DummyRepository as repositories
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
384
    so that none of the default regsitered inter-repository classes will
2818.4.2 by Robert Collins
Review feedback.
385
    MATCH.
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
386
    """
387
388
    @staticmethod
389
    def is_compatible(repo_source, repo_target):
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
390
        """InterDummy is compatible with DummyRepository."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
391
        return (isinstance(repo_source, DummyRepository) and
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
392
            isinstance(repo_target, DummyRepository))
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
393
394
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
395
class TestInterRepository(TestCaseWithTransport):
396
397
    def test_get_default_inter_repository(self):
398
        # test that the InterRepository.get(repo_a, repo_b) probes
399
        # for a inter_repo class where is_compatible(repo_a, repo_b) returns
400
        # true and returns a default inter_repo otherwise.
401
        # This also tests that the default registered optimised interrepository
402
        # classes do not barf inappropriately when a surprising repository type
403
        # is handed to them.
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
404
        dummy_a = DummyRepository()
5815.4.19 by Jelmer Vernooij
Fix test failures.
405
        dummy_a._format = RepositoryFormat()
406
        dummy_a._format.supports_full_versioned_files = True
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
407
        dummy_b = DummyRepository()
5815.4.19 by Jelmer Vernooij
Fix test failures.
408
        dummy_b._format = RepositoryFormat()
409
        dummy_b._format.supports_full_versioned_files = True
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
410
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
411
412
    def assertGetsDefaultInterRepository(self, repo_a, repo_b):
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
413
        """Asserts that InterRepository.get(repo_a, repo_b) -> the default.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
414
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
415
        The effective default is now InterSameDataRepository because there is
416
        no actual sane default in the presence of incompatible data models.
417
        """
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
418
        inter_repo = repository.InterRepository.get(repo_a, repo_b)
5815.4.19 by Jelmer Vernooij
Fix test failures.
419
        self.assertEqual(vf_repository.InterSameDataRepository,
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
420
                         inter_repo.__class__)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
421
        self.assertEqual(repo_a, inter_repo.source)
422
        self.assertEqual(repo_b, inter_repo.target)
423
424
    def test_register_inter_repository_class(self):
425
        # test that a optimised code path provider - a
426
        # InterRepository subclass can be registered and unregistered
427
        # and that it is correctly selected when given a repository
428
        # pair that it returns true on for the is_compatible static method
429
        # check
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
430
        dummy_a = DummyRepository()
4606.4.1 by Robert Collins
Prepare test_repository's inter_repository tests for 2a.
431
        dummy_a._format = RepositoryFormat()
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
432
        dummy_b = DummyRepository()
4606.4.1 by Robert Collins
Prepare test_repository's inter_repository tests for 2a.
433
        dummy_b._format = RepositoryFormat()
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
434
        repo = self.make_repository('.')
435
        # hack dummies to look like repo somewhat.
436
        dummy_a._serializer = repo._serializer
4606.4.1 by Robert Collins
Prepare test_repository's inter_repository tests for 2a.
437
        dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
438
        dummy_a._format.rich_root_data = repo._format.rich_root_data
5815.4.19 by Jelmer Vernooij
Fix test failures.
439
        dummy_a._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
440
        dummy_b._serializer = repo._serializer
4606.4.1 by Robert Collins
Prepare test_repository's inter_repository tests for 2a.
441
        dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
442
        dummy_b._format.rich_root_data = repo._format.rich_root_data
5815.4.19 by Jelmer Vernooij
Fix test failures.
443
        dummy_b._format.supports_full_versioned_files = repo._format.supports_full_versioned_files
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
444
        repository.InterRepository.register_optimiser(InterDummy)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
445
        try:
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
446
            # we should get the default for something InterDummy returns False
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
447
            # to
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
448
            self.assertFalse(InterDummy.is_compatible(dummy_a, repo))
449
            self.assertGetsDefaultInterRepository(dummy_a, repo)
450
            # and we should get an InterDummy for a pair it 'likes'
451
            self.assertTrue(InterDummy.is_compatible(dummy_a, dummy_b))
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
452
            inter_repo = repository.InterRepository.get(dummy_a, dummy_b)
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
453
            self.assertEqual(InterDummy, inter_repo.__class__)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
454
            self.assertEqual(dummy_a, inter_repo.source)
455
            self.assertEqual(dummy_b, inter_repo.target)
456
        finally:
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
457
            repository.InterRepository.unregister_optimiser(InterDummy)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
458
        # now we should get the default InterRepository object again.
459
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
460
2241.1.17 by Martin Pool
Restore old InterWeave tests
461
5671.4.2 by Jelmer Vernooij
Use stub formats to test CopyConverter.
462
class TestRepositoryFormat1(knitrepo.RepositoryFormatKnit1):
463
6213.1.16 by Jelmer Vernooij
Feature support in repository.
464
    @classmethod
465
    def get_format_string(cls):
5671.4.2 by Jelmer Vernooij
Use stub formats to test CopyConverter.
466
        return "Test Format 1"
467
468
469
class TestRepositoryFormat2(knitrepo.RepositoryFormatKnit1):
470
6213.1.16 by Jelmer Vernooij
Feature support in repository.
471
    @classmethod
472
    def get_format_string(cls):
5671.4.2 by Jelmer Vernooij
Use stub formats to test CopyConverter.
473
        return "Test Format 2"
474
475
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
476
class TestRepositoryConverter(TestCaseWithTransport):
477
478
    def test_convert_empty(self):
5671.4.2 by Jelmer Vernooij
Use stub formats to test CopyConverter.
479
        source_format = TestRepositoryFormat1()
480
        target_format = TestRepositoryFormat2()
481
        repository.format_registry.register(source_format)
482
        self.addCleanup(repository.format_registry.remove,
483
            source_format)
484
        repository.format_registry.register(target_format)
485
        self.addCleanup(repository.format_registry.remove,
486
            target_format)
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
487
        t = self.get_transport()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
488
        t.mkdir('repository')
489
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
5671.4.2 by Jelmer Vernooij
Use stub formats to test CopyConverter.
490
        repo = TestRepositoryFormat1().initialize(repo_dir)
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
491
        converter = repository.CopyConverter(target_format)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
492
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
493
        try:
494
            converter.convert(repo, pb)
495
        finally:
496
            pb.finished()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
497
        repo = repo_dir.open_repository()
498
        self.assertTrue(isinstance(target_format, repo._format.__class__))
1843.2.5 by Aaron Bentley
Add test of _unescape_xml
499
500
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
501
class TestRepositoryFormatKnit3(TestCaseWithTransport):
1910.2.13 by Aaron Bentley
Start work on converter
502
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
503
    def test_attribute__fetch_order(self):
504
        """Knits need topological data insertion."""
505
        format = bzrdir.BzrDirMetaFormat1()
506
        format.repository_format = knitrepo.RepositoryFormatKnit3()
507
        repo = self.make_repository('.', format=format)
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
508
        self.assertEqual('topological', repo._format._fetch_order)
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
509
510
    def test_attribute__fetch_uses_deltas(self):
511
        """Knits reuse deltas."""
512
        format = bzrdir.BzrDirMetaFormat1()
513
        format.repository_format = knitrepo.RepositoryFormatKnit3()
514
        repo = self.make_repository('.', format=format)
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
515
        self.assertEqual(True, repo._format._fetch_uses_deltas)
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
516
1910.2.13 by Aaron Bentley
Start work on converter
517
    def test_convert(self):
518
        """Ensure the upgrade adds weaves for roots"""
1910.2.35 by Aaron Bentley
Better fix for convesion test
519
        format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
520
        format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.35 by Aaron Bentley
Better fix for convesion test
521
        tree = self.make_branch_and_tree('.', format)
1910.2.13 by Aaron Bentley
Start work on converter
522
        tree.commit("Dull commit", rev_id="dull")
523
        revision_tree = tree.branch.repository.revision_tree('dull')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
524
        revision_tree.lock_read()
525
        try:
526
            self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
6445.2.5 by Jelmer Vernooij
Avoid inventories in more places.
527
                revision_tree.get_root_id())
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
528
        finally:
529
            revision_tree.unlock()
1910.2.13 by Aaron Bentley
Start work on converter
530
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
531
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.13 by Aaron Bentley
Start work on converter
532
        upgrade.Convert('.', format)
1910.2.27 by Aaron Bentley
Fixed conversion test
533
        tree = workingtree.WorkingTree.open('.')
1910.2.13 by Aaron Bentley
Start work on converter
534
        revision_tree = tree.branch.repository.revision_tree('dull')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
535
        revision_tree.lock_read()
536
        try:
6445.2.5 by Jelmer Vernooij
Avoid inventories in more places.
537
            revision_tree.get_file_lines(revision_tree.get_root_id())
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
538
        finally:
539
            revision_tree.unlock()
1910.2.27 by Aaron Bentley
Fixed conversion test
540
        tree.commit("Another dull commit", rev_id='dull2')
541
        revision_tree = tree.branch.repository.revision_tree('dull2')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
542
        revision_tree.lock_read()
543
        self.addCleanup(revision_tree.unlock)
6445.2.5 by Jelmer Vernooij
Avoid inventories in more places.
544
        self.assertEqual('dull',
545
                revision_tree.get_file_revision(revision_tree.get_root_id()))
2220.2.2 by Martin Pool
Add tag command and basic implementation
546
3221.3.1 by Robert Collins
* Repository formats have a new supported-feature attribute
547
    def test_supports_external_lookups(self):
548
        format = bzrdir.BzrDirMetaFormat1()
549
        format.repository_format = knitrepo.RepositoryFormatKnit3()
550
        repo = self.make_repository('.', format=format)
551
        self.assertFalse(repo._format.supports_external_lookups)
552
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
553
4667.1.1 by John Arbash Meinel
Drop the Test2a test times from 5+s down to 1.4s
554
class Test2a(tests.TestCaseWithMemoryTransport):
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
555
5365.5.20 by John Arbash Meinel
Add some tests that check the leaf factory is correct.
556
    def test_chk_bytes_uses_custom_btree_parser(self):
557
        mt = self.make_branch_and_memory_tree('test', format='2a')
558
        mt.lock_write()
559
        self.addCleanup(mt.unlock)
560
        mt.add([''], ['root-id'])
561
        mt.commit('first')
562
        index = mt.branch.repository.chk_bytes._index._graph_index._indices[0]
563
        self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
564
        # It should also work if we re-open the repo
565
        repo = mt.branch.repository.bzrdir.open_repository()
566
        repo.lock_read()
567
        self.addCleanup(repo.unlock)
568
        index = repo.chk_bytes._index._graph_index._indices[0]
569
        self.assertEqual(btree_index._gcchk_factory, index._leaf_factory)
570
4634.20.1 by Robert Collins
Fix bug 402652 by recompressing all texts that are streamed - slightly slower at fetch, substantially faster and more compact at read.
571
    def test_fetch_combines_groups(self):
572
        builder = self.make_branch_builder('source', format='2a')
573
        builder.start_series()
574
        builder.build_snapshot('1', None, [
575
            ('add', ('', 'root-id', 'directory', '')),
576
            ('add', ('file', 'file-id', 'file', 'content\n'))])
577
        builder.build_snapshot('2', ['1'], [
578
            ('modify', ('file-id', 'content-2\n'))])
579
        builder.finish_series()
580
        source = builder.get_branch()
581
        target = self.make_repository('target', format='2a')
582
        target.fetch(source.repository)
583
        target.lock_read()
4665.3.2 by John Arbash Meinel
An alternative implementation that passes both tests.
584
        self.addCleanup(target.unlock)
4634.20.1 by Robert Collins
Fix bug 402652 by recompressing all texts that are streamed - slightly slower at fetch, substantially faster and more compact at read.
585
        details = target.texts._index.get_build_details(
586
            [('file-id', '1',), ('file-id', '2',)])
587
        file_1_details = details[('file-id', '1')]
588
        file_2_details = details[('file-id', '2')]
589
        # The index, and what to read off disk, should be the same for both
590
        # versions of the file.
591
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
592
4634.23.1 by Robert Collins
Cherrypick from bzr.dev: Fix bug 402652: recompress badly packed groups during fetch. (John Arbash Meinel, Robert Collins)
593
    def test_fetch_combines_groups(self):
594
        builder = self.make_branch_builder('source', format='2a')
595
        builder.start_series()
596
        builder.build_snapshot('1', None, [
597
            ('add', ('', 'root-id', 'directory', '')),
598
            ('add', ('file', 'file-id', 'file', 'content\n'))])
599
        builder.build_snapshot('2', ['1'], [
600
            ('modify', ('file-id', 'content-2\n'))])
601
        builder.finish_series()
602
        source = builder.get_branch()
603
        target = self.make_repository('target', format='2a')
604
        target.fetch(source.repository)
605
        target.lock_read()
606
        self.addCleanup(target.unlock)
607
        details = target.texts._index.get_build_details(
608
            [('file-id', '1',), ('file-id', '2',)])
609
        file_1_details = details[('file-id', '1')]
610
        file_2_details = details[('file-id', '2')]
611
        # The index, and what to read off disk, should be the same for both
612
        # versions of the file.
613
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
614
615
    def test_fetch_combines_groups(self):
616
        builder = self.make_branch_builder('source', format='2a')
617
        builder.start_series()
618
        builder.build_snapshot('1', None, [
619
            ('add', ('', 'root-id', 'directory', '')),
620
            ('add', ('file', 'file-id', 'file', 'content\n'))])
621
        builder.build_snapshot('2', ['1'], [
622
            ('modify', ('file-id', 'content-2\n'))])
623
        builder.finish_series()
624
        source = builder.get_branch()
625
        target = self.make_repository('target', format='2a')
626
        target.fetch(source.repository)
627
        target.lock_read()
628
        self.addCleanup(target.unlock)
629
        details = target.texts._index.get_build_details(
630
            [('file-id', '1',), ('file-id', '2',)])
631
        file_1_details = details[('file-id', '1')]
632
        file_2_details = details[('file-id', '2')]
633
        # The index, and what to read off disk, should be the same for both
634
        # versions of the file.
635
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
636
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
637
    def test_format_pack_compresses_True(self):
638
        repo = self.make_repository('repo', format='2a')
639
        self.assertTrue(repo._format.pack_compresses)
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
640
641
    def test_inventories_use_chk_map_with_parent_base_dict(self):
4667.1.1 by John Arbash Meinel
Drop the Test2a test times from 5+s down to 1.4s
642
        tree = self.make_branch_and_memory_tree('repo', format="2a")
643
        tree.lock_write()
644
        tree.add([''], ['TREE_ROOT'])
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
645
        revid = tree.commit("foo")
4667.1.1 by John Arbash Meinel
Drop the Test2a test times from 5+s down to 1.4s
646
        tree.unlock()
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
647
        tree.lock_read()
648
        self.addCleanup(tree.unlock)
649
        inv = tree.branch.repository.get_inventory(revid)
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
650
        self.assertNotEqual(None, inv.parent_id_basename_to_file_id)
651
        inv.parent_id_basename_to_file_id._ensure_root()
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
652
        inv.id_to_entry._ensure_root()
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
653
        self.assertEqual(65536, inv.id_to_entry._root_node.maximum_size)
654
        self.assertEqual(65536,
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
655
            inv.parent_id_basename_to_file_id._root_node.maximum_size)
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
656
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
657
    def test_autopack_unchanged_chk_nodes(self):
658
        # at 20 unchanged commits, chk pages are packed that are split into
659
        # two groups such that the new pack being made doesn't have all its
660
        # pages in the source packs (though they are in the repository).
4667.1.1 by John Arbash Meinel
Drop the Test2a test times from 5+s down to 1.4s
661
        # Use a memory backed repository, we don't need to hit disk for this
662
        tree = self.make_branch_and_memory_tree('tree', format='2a')
663
        tree.lock_write()
664
        self.addCleanup(tree.unlock)
665
        tree.add([''], ['TREE_ROOT'])
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
666
        for pos in range(20):
667
            tree.commit(str(pos))
668
669
    def test_pack_with_hint(self):
4667.1.1 by John Arbash Meinel
Drop the Test2a test times from 5+s down to 1.4s
670
        tree = self.make_branch_and_memory_tree('tree', format='2a')
671
        tree.lock_write()
672
        self.addCleanup(tree.unlock)
673
        tree.add([''], ['TREE_ROOT'])
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
674
        # 1 commit to leave untouched
675
        tree.commit('1')
676
        to_keep = tree.branch.repository._pack_collection.names()
677
        # 2 to combine
678
        tree.commit('2')
679
        tree.commit('3')
680
        all = tree.branch.repository._pack_collection.names()
681
        combine = list(set(all) - set(to_keep))
682
        self.assertLength(3, all)
683
        self.assertLength(2, combine)
684
        tree.branch.repository.pack(hint=combine)
685
        final = tree.branch.repository._pack_collection.names()
686
        self.assertLength(2, final)
687
        self.assertFalse(combine[0] in final)
688
        self.assertFalse(combine[1] in final)
689
        self.assertSubset(to_keep, final)
690
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
691
    def test_stream_source_to_gc(self):
4462.2.1 by Robert Collins
Add new attribute to RepositoryFormat pack_compresses, hinting when pack can be useful.
692
        source = self.make_repository('source', format='2a')
693
        target = self.make_repository('target', format='2a')
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
694
        stream = source._get_source(target._format)
695
        self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
696
697
    def test_stream_source_to_non_gc(self):
4462.2.1 by Robert Collins
Add new attribute to RepositoryFormat pack_compresses, hinting when pack can be useful.
698
        source = self.make_repository('source', format='2a')
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
699
        target = self.make_repository('target', format='rich-root-pack')
700
        stream = source._get_source(target._format)
701
        # We don't want the child GroupCHKStreamSource
5815.4.15 by Jelmer Vernooij
Fix some imports.
702
        self.assertIs(type(stream), vf_repository.StreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
703
4360.4.9 by John Arbash Meinel
Merge bzr.dev, bringing in the gc stacking fixes.
704
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
705
        source_builder = self.make_branch_builder('source',
4462.2.1 by Robert Collins
Add new attribute to RepositoryFormat pack_compresses, hinting when pack can be useful.
706
                            format='2a')
4360.4.9 by John Arbash Meinel
Merge bzr.dev, bringing in the gc stacking fixes.
707
        # We have to build a fairly large tree, so that we are sure the chk
708
        # pages will have split into multiple pages.
709
        entries = [('add', ('', 'a-root-id', 'directory', None))]
710
        for i in 'abcdefghijklmnopqrstuvwxyz123456789':
711
            for j in 'abcdefghijklmnopqrstuvwxyz123456789':
712
                fname = i + j
713
                fid = fname + '-id'
714
                content = 'content for %s\n' % (fname,)
715
                entries.append(('add', (fname, fid, 'file', content)))
716
        source_builder.start_series()
717
        source_builder.build_snapshot('rev-1', None, entries)
718
        # Now change a few of them, so we get a few new pages for the second
719
        # revision
720
        source_builder.build_snapshot('rev-2', ['rev-1'], [
721
            ('modify', ('aa-id', 'new content for aa-id\n')),
722
            ('modify', ('cc-id', 'new content for cc-id\n')),
723
            ('modify', ('zz-id', 'new content for zz-id\n')),
724
            ])
725
        source_builder.finish_series()
726
        source_branch = source_builder.get_branch()
727
        source_branch.lock_read()
728
        self.addCleanup(source_branch.unlock)
4462.2.1 by Robert Collins
Add new attribute to RepositoryFormat pack_compresses, hinting when pack can be useful.
729
        target = self.make_repository('target', format='2a')
4360.4.9 by John Arbash Meinel
Merge bzr.dev, bringing in the gc stacking fixes.
730
        source = source_branch.repository._get_source(target._format)
731
        self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
732
733
        # On a regular pass, getting the inventories and chk pages for rev-2
734
        # would only get the newly created chk pages
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
735
        search = vf_search.SearchResult(set(['rev-2']), set(['rev-1']), 1,
4360.4.9 by John Arbash Meinel
Merge bzr.dev, bringing in the gc stacking fixes.
736
                                    set(['rev-2']))
737
        simple_chk_records = []
738
        for vf_name, substream in source.get_stream(search):
739
            if vf_name == 'chk_bytes':
740
                for record in substream:
741
                    simple_chk_records.append(record.key)
742
            else:
743
                for _ in substream:
744
                    continue
745
        # 3 pages, the root (InternalNode), + 2 pages which actually changed
746
        self.assertEqual([('sha1:91481f539e802c76542ea5e4c83ad416bf219f73',),
747
                          ('sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
748
                          ('sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
749
                          ('sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)],
750
                         simple_chk_records)
751
        # Now, when we do a similar call using 'get_stream_for_missing_keys'
752
        # we should get a much larger set of pages.
753
        missing = [('inventories', 'rev-2')]
754
        full_chk_records = []
755
        for vf_name, substream in source.get_stream_for_missing_keys(missing):
756
            if vf_name == 'inventories':
757
                for record in substream:
758
                    self.assertEqual(('rev-2',), record.key)
759
            elif vf_name == 'chk_bytes':
760
                for record in substream:
761
                    full_chk_records.append(record.key)
762
            else:
763
                self.fail('Should not be getting a stream of %s' % (vf_name,))
764
        # We have 257 records now. This is because we have 1 root page, and 256
765
        # leaf pages in a complete listing.
766
        self.assertEqual(257, len(full_chk_records))
767
        self.assertSubset(simple_chk_records, full_chk_records)
768
4465.2.7 by Aaron Bentley
Move test_inconsistency_fatal to test_repository
769
    def test_inconsistency_fatal(self):
770
        repo = self.make_repository('repo', format='2a')
771
        self.assertTrue(repo.revisions._index._inconsistency_fatal)
772
        self.assertFalse(repo.texts._index._inconsistency_fatal)
773
        self.assertFalse(repo.inventories._index._inconsistency_fatal)
774
        self.assertFalse(repo.signatures._index._inconsistency_fatal)
775
        self.assertFalse(repo.chk_bytes._index._inconsistency_fatal)
776
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
777
778
class TestKnitPackStreamSource(tests.TestCaseWithMemoryTransport):
779
780
    def test_source_to_exact_pack_092(self):
781
        source = self.make_repository('source', format='pack-0.92')
782
        target = self.make_repository('target', format='pack-0.92')
783
        stream_source = source._get_source(target._format)
5757.2.2 by Jelmer Vernooij
Fix imports.
784
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
785
786
    def test_source_to_exact_pack_rich_root_pack(self):
787
        source = self.make_repository('source', format='rich-root-pack')
788
        target = self.make_repository('target', format='rich-root-pack')
789
        stream_source = source._get_source(target._format)
5757.2.2 by Jelmer Vernooij
Fix imports.
790
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
791
792
    def test_source_to_exact_pack_19(self):
793
        source = self.make_repository('source', format='1.9')
794
        target = self.make_repository('target', format='1.9')
795
        stream_source = source._get_source(target._format)
5757.2.2 by Jelmer Vernooij
Fix imports.
796
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
797
798
    def test_source_to_exact_pack_19_rich_root(self):
799
        source = self.make_repository('source', format='1.9-rich-root')
800
        target = self.make_repository('target', format='1.9-rich-root')
801
        stream_source = source._get_source(target._format)
5757.2.2 by Jelmer Vernooij
Fix imports.
802
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
803
804
    def test_source_to_remote_exact_pack_19(self):
805
        trans = self.make_smart_server('target')
806
        trans.ensure_base()
807
        source = self.make_repository('source', format='1.9')
808
        target = self.make_repository('target', format='1.9')
809
        target = repository.Repository.open(trans.base)
810
        stream_source = source._get_source(target._format)
5757.2.2 by Jelmer Vernooij
Fix imports.
811
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
812
813
    def test_stream_source_to_non_exact(self):
814
        source = self.make_repository('source', format='pack-0.92')
815
        target = self.make_repository('target', format='1.9')
816
        stream = source._get_source(target._format)
5815.4.15 by Jelmer Vernooij
Fix some imports.
817
        self.assertIs(type(stream), vf_repository.StreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
818
819
    def test_stream_source_to_non_exact_rich_root(self):
820
        source = self.make_repository('source', format='1.9')
821
        target = self.make_repository('target', format='1.9-rich-root')
822
        stream = source._get_source(target._format)
5815.4.15 by Jelmer Vernooij
Fix some imports.
823
        self.assertIs(type(stream), vf_repository.StreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
824
825
    def test_source_to_remote_non_exact_pack_19(self):
826
        trans = self.make_smart_server('target')
827
        trans.ensure_base()
828
        source = self.make_repository('source', format='1.9')
829
        target = self.make_repository('target', format='1.6')
830
        target = repository.Repository.open(trans.base)
831
        stream_source = source._get_source(target._format)
5815.4.15 by Jelmer Vernooij
Fix some imports.
832
        self.assertIs(type(stream_source), vf_repository.StreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
833
834
    def test_stream_source_to_knit(self):
835
        source = self.make_repository('source', format='pack-0.92')
836
        target = self.make_repository('target', format='dirstate')
837
        stream = source._get_source(target._format)
5815.4.15 by Jelmer Vernooij
Fix some imports.
838
        self.assertIs(type(stream), vf_repository.StreamSource)
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
839
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
840
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
841
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
842
    """Tests for _find_parent_ids_of_revisions."""
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
843
844
    def setUp(self):
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
845
        super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
846
        self.builder = self.make_branch_builder('source')
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
847
        self.builder.start_series()
848
        self.builder.build_snapshot('initial', None,
849
            [('add', ('', 'tree-root', 'directory', None))])
850
        self.repo = self.builder.get_branch().repository
851
        self.addCleanup(self.builder.finish_series)
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
852
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
853
    def assertParentIds(self, expected_result, rev_set):
854
        self.assertEqual(sorted(expected_result),
855
            sorted(self.repo._find_parent_ids_of_revisions(rev_set)))
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
856
857
    def test_simple(self):
858
        self.builder.build_snapshot('revid1', None, [])
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
859
        self.builder.build_snapshot('revid2', ['revid1'], [])
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
860
        rev_set = ['revid2']
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
861
        self.assertParentIds(['revid1'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
862
863
    def test_not_first_parent(self):
864
        self.builder.build_snapshot('revid1', None, [])
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
865
        self.builder.build_snapshot('revid2', ['revid1'], [])
866
        self.builder.build_snapshot('revid3', ['revid2'], [])
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
867
        rev_set = ['revid3', 'revid2']
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
868
        self.assertParentIds(['revid1'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
869
870
    def test_not_null(self):
871
        rev_set = ['initial']
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
872
        self.assertParentIds([], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
873
874
    def test_not_null_set(self):
875
        self.builder.build_snapshot('revid1', None, [])
876
        rev_set = [_mod_revision.NULL_REVISION]
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
877
        self.assertParentIds([], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
878
879
    def test_ghost(self):
880
        self.builder.build_snapshot('revid1', None, [])
881
        rev_set = ['ghost', 'revid1']
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
882
        self.assertParentIds(['initial'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
883
884
    def test_ghost_parent(self):
885
        self.builder.build_snapshot('revid1', None, [])
886
        self.builder.build_snapshot('revid2', ['revid1', 'ghost'], [])
887
        rev_set = ['revid2', 'revid1']
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
888
        self.assertParentIds(['ghost', 'initial'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
889
890
    def test_righthand_parent(self):
891
        self.builder.build_snapshot('revid1', None, [])
892
        self.builder.build_snapshot('revid2a', ['revid1'], [])
893
        self.builder.build_snapshot('revid2b', ['revid1'], [])
894
        self.builder.build_snapshot('revid3', ['revid2a', 'revid2b'], [])
895
        rev_set = ['revid3', 'revid2a']
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
896
        self.assertParentIds(['revid1', 'revid2b'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
897
898
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
899
class TestWithBrokenRepo(TestCaseWithTransport):
2592.3.214 by Robert Collins
Merge bzr.dev.
900
    """These tests seem to be more appropriate as interface tests?"""
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
901
902
    def make_broken_repository(self):
903
        # XXX: This function is borrowed from Aaron's "Reconcile can fix bad
904
        # parent references" branch which is due to land in bzr.dev soon.  Once
905
        # it does, this duplication should be removed.
906
        repo = self.make_repository('broken-repo')
907
        cleanups = []
908
        try:
909
            repo.lock_write()
910
            cleanups.append(repo.unlock)
911
            repo.start_write_group()
912
            cleanups.append(repo.commit_write_group)
913
            # make rev1a: A well-formed revision, containing 'file1'
914
            inv = inventory.Inventory(revision_id='rev1a')
915
            inv.root.revision = 'rev1a'
916
            self.add_file(repo, inv, 'file1', 'rev1a', [])
4634.35.21 by Andrew Bennetts
Fix test_insert_from_broken_repo in test_repository.
917
            repo.texts.add_lines((inv.root.file_id, 'rev1a'), [], [])
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
918
            repo.add_inventory('rev1a', inv, [])
919
            revision = _mod_revision.Revision('rev1a',
920
                committer='jrandom@example.com', timestamp=0,
921
                inventory_sha1='', timezone=0, message='foo', parent_ids=[])
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
922
            repo.add_revision('rev1a', revision, inv)
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
923
924
            # make rev1b, which has no Revision, but has an Inventory, and
925
            # file1
926
            inv = inventory.Inventory(revision_id='rev1b')
927
            inv.root.revision = 'rev1b'
928
            self.add_file(repo, inv, 'file1', 'rev1b', [])
929
            repo.add_inventory('rev1b', inv, [])
930
931
            # make rev2, with file1 and file2
932
            # file2 is sane
933
            # file1 has 'rev1b' as an ancestor, even though this is not
934
            # mentioned by 'rev1a', making it an unreferenced ancestor
935
            inv = inventory.Inventory()
936
            self.add_file(repo, inv, 'file1', 'rev2', ['rev1a', 'rev1b'])
937
            self.add_file(repo, inv, 'file2', 'rev2', [])
938
            self.add_revision(repo, 'rev2', inv, ['rev1a'])
939
940
            # make ghost revision rev1c
941
            inv = inventory.Inventory()
942
            self.add_file(repo, inv, 'file2', 'rev1c', [])
943
944
            # make rev3 with file2
945
            # file2 refers to 'rev1c', which is a ghost in this repository, so
946
            # file2 cannot have rev1c as its ancestor.
947
            inv = inventory.Inventory()
948
            self.add_file(repo, inv, 'file2', 'rev3', ['rev1c'])
949
            self.add_revision(repo, 'rev3', inv, ['rev1c'])
950
            return repo
951
        finally:
952
            for cleanup in reversed(cleanups):
953
                cleanup()
954
955
    def add_revision(self, repo, revision_id, inv, parent_ids):
956
        inv.revision_id = revision_id
957
        inv.root.revision = revision_id
4634.35.21 by Andrew Bennetts
Fix test_insert_from_broken_repo in test_repository.
958
        repo.texts.add_lines((inv.root.file_id, revision_id), [], [])
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
959
        repo.add_inventory(revision_id, inv, parent_ids)
960
        revision = _mod_revision.Revision(revision_id,
961
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
962
            timezone=0, message='foo', parent_ids=parent_ids)
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
963
        repo.add_revision(revision_id, revision, inv)
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
964
965
    def add_file(self, repo, inv, filename, revision, parents):
966
        file_id = filename + '-id'
967
        entry = inventory.InventoryFile(file_id, filename, 'TREE_ROOT')
968
        entry.revision = revision
2535.4.10 by Andrew Bennetts
Fix one failing test, disable another.
969
        entry.text_size = 0
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
970
        inv.add(entry)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
971
        text_key = (file_id, revision)
972
        parent_keys = [(file_id, parent) for parent in parents]
973
        repo.texts.add_lines(text_key, parent_keys, ['line\n'])
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
974
975
    def test_insert_from_broken_repo(self):
976
        """Inserting a data stream from a broken repository won't silently
977
        corrupt the target repository.
978
        """
979
        broken_repo = self.make_broken_repository()
980
        empty_repo = self.make_repository('empty-repo')
4606.1.1 by Robert Collins
Change test_insert_from_broken_repo from a known failure to a working test.
981
        try:
982
            empty_repo.fetch(broken_repo)
983
        except (errors.RevisionNotPresent, errors.BzrCheckError):
984
            # Test successful: compression parent not being copied leads to
985
            # error.
986
            return
987
        empty_repo.lock_read()
988
        self.addCleanup(empty_repo.unlock)
989
        text = empty_repo.texts.get_record_stream(
990
            [('file2-id', 'rev3')], 'topological', True).next()
991
        self.assertEqual('line\n', text.get_bytes_as('fulltext'))
2592.3.214 by Robert Collins
Merge bzr.dev.
992
993
2592.3.84 by Robert Collins
Start of autopacking logic.
994
class TestRepositoryPackCollection(TestCaseWithTransport):
995
996
    def get_format(self):
3010.3.3 by Martin Pool
Merge trunk
997
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
2592.3.84 by Robert Collins
Start of autopacking logic.
998
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
999
    def get_packs(self):
1000
        format = self.get_format()
1001
        repo = self.make_repository('.', format=format)
1002
        return repo._pack_collection
1003
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1004
    def make_packs_and_alt_repo(self, write_lock=False):
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1005
        """Create a pack repo with 3 packs, and access it via a second repo."""
4617.4.1 by Robert Collins
Fix a pack specific test which didn't lock its format down.
1006
        tree = self.make_branch_and_tree('.', format=self.get_format())
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1007
        tree.lock_write()
1008
        self.addCleanup(tree.unlock)
1009
        rev1 = tree.commit('one')
1010
        rev2 = tree.commit('two')
1011
        rev3 = tree.commit('three')
1012
        r = repository.Repository.open('.')
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1013
        if write_lock:
1014
            r.lock_write()
1015
        else:
1016
            r.lock_read()
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1017
        self.addCleanup(r.unlock)
1018
        packs = r._pack_collection
1019
        packs.ensure_loaded()
1020
        return tree, r, packs, [rev1, rev2, rev3]
1021
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1022
    def test__clear_obsolete_packs(self):
1023
        packs = self.get_packs()
1024
        obsolete_pack_trans = packs.transport.clone('obsolete_packs')
1025
        obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
1026
        obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
1027
        obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
1028
        obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
1029
        obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
1030
        res = packs._clear_obsolete_packs()
1031
        self.assertEqual(['a-pack', 'another-pack'], sorted(res))
1032
        self.assertEqual([], obsolete_pack_trans.list_dir('.'))
1033
1034
    def test__clear_obsolete_packs_preserve(self):
1035
        packs = self.get_packs()
1036
        obsolete_pack_trans = packs.transport.clone('obsolete_packs')
1037
        obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
1038
        obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
1039
        obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
1040
        obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
1041
        obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
1042
        res = packs._clear_obsolete_packs(preserve=set(['a-pack']))
1043
        self.assertEqual(['a-pack', 'another-pack'], sorted(res))
1044
        self.assertEqual(['a-pack.iix', 'a-pack.pack', 'a-pack.rix'],
1045
                         sorted(obsolete_pack_trans.list_dir('.')))
1046
2592.3.84 by Robert Collins
Start of autopacking logic.
1047
    def test__max_pack_count(self):
2592.3.219 by Robert Collins
Review feedback.
1048
        """The maximum pack count is a function of the number of revisions."""
2592.3.84 by Robert Collins
Start of autopacking logic.
1049
        # no revisions - one pack, so that we can have a revision free repo
1050
        # without it blowing up
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1051
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1052
        self.assertEqual(1, packs._max_pack_count(0))
1053
        # after that the sum of the digits, - check the first 1-9
1054
        self.assertEqual(1, packs._max_pack_count(1))
1055
        self.assertEqual(2, packs._max_pack_count(2))
1056
        self.assertEqual(3, packs._max_pack_count(3))
1057
        self.assertEqual(4, packs._max_pack_count(4))
1058
        self.assertEqual(5, packs._max_pack_count(5))
1059
        self.assertEqual(6, packs._max_pack_count(6))
1060
        self.assertEqual(7, packs._max_pack_count(7))
1061
        self.assertEqual(8, packs._max_pack_count(8))
1062
        self.assertEqual(9, packs._max_pack_count(9))
1063
        # check the boundary cases with two digits for the next decade
1064
        self.assertEqual(1, packs._max_pack_count(10))
1065
        self.assertEqual(2, packs._max_pack_count(11))
1066
        self.assertEqual(10, packs._max_pack_count(19))
1067
        self.assertEqual(2, packs._max_pack_count(20))
1068
        self.assertEqual(3, packs._max_pack_count(21))
1069
        # check some arbitrary big numbers
1070
        self.assertEqual(25, packs._max_pack_count(112894))
1071
4928.1.1 by Martin Pool
Give RepositoryPackCollection a repr
1072
    def test_repr(self):
1073
        packs = self.get_packs()
1074
        self.assertContainsRe(repr(packs),
1075
            'RepositoryPackCollection(.*Repository(.*))')
1076
4634.127.2 by John Arbash Meinel
Change the _obsolete_packs code to handle files that are already gone.
1077
    def test__obsolete_packs(self):
1078
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1079
        names = packs.names()
1080
        pack = packs.get_pack_by_name(names[0])
1081
        # Schedule this one for removal
1082
        packs._remove_pack_from_memory(pack)
1083
        # Simulate a concurrent update by renaming the .pack file and one of
1084
        # the indices
1085
        packs.transport.rename('packs/%s.pack' % (names[0],),
1086
                               'obsolete_packs/%s.pack' % (names[0],))
1087
        packs.transport.rename('indices/%s.iix' % (names[0],),
1088
                               'obsolete_packs/%s.iix' % (names[0],))
1089
        # Now trigger the obsoletion, and ensure that all the remaining files
1090
        # are still renamed
1091
        packs._obsolete_packs([pack])
1092
        self.assertEqual([n + '.pack' for n in names[1:]],
1093
                         sorted(packs._pack_transport.list_dir('.')))
1094
        # names[0] should not be present in the index anymore
1095
        self.assertEqual(names[1:],
1096
            sorted(set([osutils.splitext(n)[0] for n in
1097
                        packs._index_transport.list_dir('.')])))
1098
6225.2.8 by Jelmer Vernooij
Fix creation of obsolete_packs if it is missing.
1099
    def test__obsolete_packs_missing_directory(self):
1100
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1101
        r.control_transport.rmdir('obsolete_packs')
1102
        names = packs.names()
1103
        pack = packs.get_pack_by_name(names[0])
1104
        # Schedule this one for removal
1105
        packs._remove_pack_from_memory(pack)
1106
        # Now trigger the obsoletion, and ensure that all the remaining files
1107
        # are still renamed
1108
        packs._obsolete_packs([pack])
1109
        self.assertEqual([n + '.pack' for n in names[1:]],
1110
                         sorted(packs._pack_transport.list_dir('.')))
1111
        # names[0] should not be present in the index anymore
1112
        self.assertEqual(names[1:],
1113
            sorted(set([osutils.splitext(n)[0] for n in
1114
                        packs._index_transport.list_dir('.')])))
1115
2592.3.84 by Robert Collins
Start of autopacking logic.
1116
    def test_pack_distribution_zero(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1117
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1118
        self.assertEqual([0], packs.pack_distribution(0))
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1119
1120
    def test_ensure_loaded_unlocked(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1121
        packs = self.get_packs()
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1122
        self.assertRaises(errors.ObjectNotLocked,
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1123
                          packs.ensure_loaded)
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1124
2592.3.84 by Robert Collins
Start of autopacking logic.
1125
    def test_pack_distribution_one_to_nine(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1126
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1127
        self.assertEqual([1],
1128
            packs.pack_distribution(1))
1129
        self.assertEqual([1, 1],
1130
            packs.pack_distribution(2))
1131
        self.assertEqual([1, 1, 1],
1132
            packs.pack_distribution(3))
1133
        self.assertEqual([1, 1, 1, 1],
1134
            packs.pack_distribution(4))
1135
        self.assertEqual([1, 1, 1, 1, 1],
1136
            packs.pack_distribution(5))
1137
        self.assertEqual([1, 1, 1, 1, 1, 1],
1138
            packs.pack_distribution(6))
1139
        self.assertEqual([1, 1, 1, 1, 1, 1, 1],
1140
            packs.pack_distribution(7))
1141
        self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1],
1142
            packs.pack_distribution(8))
1143
        self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1, 1],
1144
            packs.pack_distribution(9))
1145
1146
    def test_pack_distribution_stable_at_boundaries(self):
1147
        """When there are multi-rev packs the counts are stable."""
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1148
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1149
        # in 10s:
1150
        self.assertEqual([10], packs.pack_distribution(10))
1151
        self.assertEqual([10, 1], packs.pack_distribution(11))
1152
        self.assertEqual([10, 10], packs.pack_distribution(20))
1153
        self.assertEqual([10, 10, 1], packs.pack_distribution(21))
1154
        # 100s
1155
        self.assertEqual([100], packs.pack_distribution(100))
1156
        self.assertEqual([100, 1], packs.pack_distribution(101))
1157
        self.assertEqual([100, 10, 1], packs.pack_distribution(111))
1158
        self.assertEqual([100, 100], packs.pack_distribution(200))
1159
        self.assertEqual([100, 100, 1], packs.pack_distribution(201))
1160
        self.assertEqual([100, 100, 10, 1], packs.pack_distribution(211))
1161
2592.3.85 by Robert Collins
Finish autopack corner cases.
1162
    def test_plan_pack_operations_2009_revisions_skip_all_packs(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1163
        packs = self.get_packs()
2592.3.85 by Robert Collins
Finish autopack corner cases.
1164
        existing_packs = [(2000, "big"), (9, "medium")]
1165
        # rev count - 2009 -> 2x1000 + 9x1
1166
        pack_operations = packs.plan_autopack_combinations(
1167
            existing_packs, [1000, 1000, 1, 1, 1, 1, 1, 1, 1, 1, 1])
1168
        self.assertEqual([], pack_operations)
1169
1170
    def test_plan_pack_operations_2010_revisions_skip_all_packs(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1171
        packs = self.get_packs()
2592.3.85 by Robert Collins
Finish autopack corner cases.
1172
        existing_packs = [(2000, "big"), (9, "medium"), (1, "single")]
1173
        # rev count - 2010 -> 2x1000 + 1x10
1174
        pack_operations = packs.plan_autopack_combinations(
1175
            existing_packs, [1000, 1000, 10])
1176
        self.assertEqual([], pack_operations)
1177
1178
    def test_plan_pack_operations_2010_combines_smallest_two(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1179
        packs = self.get_packs()
2592.3.85 by Robert Collins
Finish autopack corner cases.
1180
        existing_packs = [(1999, "big"), (9, "medium"), (1, "single2"),
1181
            (1, "single1")]
1182
        # rev count - 2010 -> 2x1000 + 1x10 (3)
1183
        pack_operations = packs.plan_autopack_combinations(
1184
            existing_packs, [1000, 1000, 10])
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1185
        self.assertEqual([[2, ["single2", "single1"]]], pack_operations)
2592.3.85 by Robert Collins
Finish autopack corner cases.
1186
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1187
    def test_plan_pack_operations_creates_a_single_op(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1188
        packs = self.get_packs()
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1189
        existing_packs = [(50, 'a'), (40, 'b'), (30, 'c'), (10, 'd'),
1190
                          (10, 'e'), (6, 'f'), (4, 'g')]
1191
        # rev count 150 -> 1x100 and 5x10
1192
        # The two size 10 packs do not need to be touched. The 50, 40, 30 would
1193
        # be combined into a single 120 size pack, and the 6 & 4 would
1194
        # becombined into a size 10 pack. However, if we have to rewrite them,
1195
        # we save a pack file with no increased I/O by putting them into the
1196
        # same file.
1197
        distribution = packs.pack_distribution(150)
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1198
        pack_operations = packs.plan_autopack_combinations(existing_packs,
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1199
                                                           distribution)
1200
        self.assertEqual([[130, ['a', 'b', 'c', 'f', 'g']]], pack_operations)
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1201
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1202
    def test_all_packs_none(self):
1203
        format = self.get_format()
1204
        tree = self.make_branch_and_tree('.', format=format)
1205
        tree.lock_read()
1206
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1207
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1208
        packs.ensure_loaded()
1209
        self.assertEqual([], packs.all_packs())
1210
1211
    def test_all_packs_one(self):
1212
        format = self.get_format()
1213
        tree = self.make_branch_and_tree('.', format=format)
1214
        tree.commit('start')
1215
        tree.lock_read()
1216
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1217
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1218
        packs.ensure_loaded()
2592.3.176 by Robert Collins
Various pack refactorings.
1219
        self.assertEqual([
1220
            packs.get_pack_by_name(packs.names()[0])],
1221
            packs.all_packs())
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1222
1223
    def test_all_packs_two(self):
1224
        format = self.get_format()
1225
        tree = self.make_branch_and_tree('.', format=format)
1226
        tree.commit('start')
1227
        tree.commit('continue')
1228
        tree.lock_read()
1229
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1230
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1231
        packs.ensure_loaded()
1232
        self.assertEqual([
2592.3.176 by Robert Collins
Various pack refactorings.
1233
            packs.get_pack_by_name(packs.names()[0]),
1234
            packs.get_pack_by_name(packs.names()[1]),
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1235
            ], packs.all_packs())
1236
2592.3.176 by Robert Collins
Various pack refactorings.
1237
    def test_get_pack_by_name(self):
1238
        format = self.get_format()
1239
        tree = self.make_branch_and_tree('.', format=format)
1240
        tree.commit('start')
1241
        tree.lock_read()
1242
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1243
        packs = tree.branch.repository._pack_collection
4145.1.6 by Robert Collins
More test fallout, but all caught now.
1244
        packs.reset()
2592.3.176 by Robert Collins
Various pack refactorings.
1245
        packs.ensure_loaded()
1246
        name = packs.names()[0]
1247
        pack_1 = packs.get_pack_by_name(name)
1248
        # the pack should be correctly initialised
3517.4.5 by Martin Pool
Correct use of packs._names in test_get_pack_by_name
1249
        sizes = packs._names[name]
3221.12.4 by Robert Collins
Implement basic repository supporting external references.
1250
        rev_index = GraphIndex(packs._index_transport, name + '.rix', sizes[0])
1251
        inv_index = GraphIndex(packs._index_transport, name + '.iix', sizes[1])
1252
        txt_index = GraphIndex(packs._index_transport, name + '.tix', sizes[2])
1253
        sig_index = GraphIndex(packs._index_transport, name + '.six', sizes[3])
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
1254
        self.assertEqual(pack_repo.ExistingPack(packs._pack_transport,
2592.3.219 by Robert Collins
Review feedback.
1255
            name, rev_index, inv_index, txt_index, sig_index), pack_1)
2592.3.176 by Robert Collins
Various pack refactorings.
1256
        # and the same instance should be returned on successive calls.
1257
        self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1258
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1259
    def test_reload_pack_names_new_entry(self):
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1260
        tree, r, packs, revs = self.make_packs_and_alt_repo()
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1261
        names = packs.names()
1262
        # Add a new pack file into the repository
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1263
        rev4 = tree.commit('four')
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1264
        new_names = tree.branch.repository._pack_collection.names()
1265
        new_name = set(new_names).difference(names)
1266
        self.assertEqual(1, len(new_name))
1267
        new_name = new_name.pop()
1268
        # The old collection hasn't noticed yet
1269
        self.assertEqual(names, packs.names())
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1270
        self.assertTrue(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1271
        self.assertEqual(new_names, packs.names())
1272
        # And the repository can access the new revision
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1273
        self.assertEqual({rev4:(revs[-1],)}, r.get_parent_map([rev4]))
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1274
        self.assertFalse(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1275
1276
    def test_reload_pack_names_added_and_removed(self):
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1277
        tree, r, packs, revs = self.make_packs_and_alt_repo()
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1278
        names = packs.names()
1279
        # Now repack the whole thing
1280
        tree.branch.repository.pack()
1281
        new_names = tree.branch.repository._pack_collection.names()
1282
        # The other collection hasn't noticed yet
1283
        self.assertEqual(names, packs.names())
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1284
        self.assertTrue(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1285
        self.assertEqual(new_names, packs.names())
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1286
        self.assertEqual({revs[-1]:(revs[-2],)}, r.get_parent_map([revs[-1]]))
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1287
        self.assertFalse(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1288
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
1289
    def test_reload_pack_names_preserves_pending(self):
1290
        # TODO: Update this to also test for pending-deleted names
1291
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1292
        # We will add one pack (via start_write_group + insert_record_stream),
1293
        # and remove another pack (via _remove_pack_from_memory)
1294
        orig_names = packs.names()
1295
        orig_at_load = packs._packs_at_load
1296
        to_remove_name = iter(orig_names).next()
1297
        r.start_write_group()
1298
        self.addCleanup(r.abort_write_group)
1299
        r.texts.insert_record_stream([versionedfile.FulltextContentFactory(
1300
            ('text', 'rev'), (), None, 'content\n')])
1301
        new_pack = packs._new_pack
1302
        self.assertTrue(new_pack.data_inserted())
1303
        new_pack.finish()
1304
        packs.allocate(new_pack)
1305
        packs._new_pack = None
1306
        removed_pack = packs.get_pack_by_name(to_remove_name)
1307
        packs._remove_pack_from_memory(removed_pack)
1308
        names = packs.names()
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1309
        all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
1310
        new_names = set([x[0][0] for x in new_nodes])
1311
        self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1312
        self.assertEqual(set(names) - set(orig_names), new_names)
1313
        self.assertEqual(set([new_pack.name]), new_names)
1314
        self.assertEqual([to_remove_name],
1315
                         sorted([x[0][0] for x in deleted_nodes]))
1316
        packs.reload_pack_names()
1317
        reloaded_names = packs.names()
1318
        self.assertEqual(orig_at_load, packs._packs_at_load)
1319
        self.assertEqual(names, reloaded_names)
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1320
        all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
1321
        new_names = set([x[0][0] for x in new_nodes])
1322
        self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1323
        self.assertEqual(set(names) - set(orig_names), new_names)
1324
        self.assertEqual(set([new_pack.name]), new_names)
1325
        self.assertEqual([to_remove_name],
1326
                         sorted([x[0][0] for x in deleted_nodes]))
1327
4634.127.5 by John Arbash Meinel
Possible fix for making sure packs triggering autopacking get cleaned up.
1328
    def test_autopack_obsoletes_new_pack(self):
1329
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1330
        packs._max_pack_count = lambda x: 1
1331
        packs.pack_distribution = lambda x: [10]
1332
        r.start_write_group()
1333
        r.revisions.insert_record_stream([versionedfile.FulltextContentFactory(
1334
            ('bogus-rev',), (), None, 'bogus-content\n')])
1335
        # This should trigger an autopack, which will combine everything into a
1336
        # single pack file.
1337
        new_names = r.commit_write_group()
1338
        names = packs.names()
1339
        self.assertEqual(1, len(names))
1340
        self.assertEqual([names[0] + '.pack'],
1341
                         packs._pack_transport.list_dir('.'))
1342
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1343
    def test_autopack_reloads_and_stops(self):
1344
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1345
        # After we have determined what needs to be autopacked, trigger a
1346
        # full-pack via the other repo which will cause us to re-evaluate and
1347
        # decide we don't need to do anything
1348
        orig_execute = packs._execute_pack_operations
1349
        def _munged_execute_pack_ops(*args, **kwargs):
1350
            tree.branch.repository.pack()
1351
            return orig_execute(*args, **kwargs)
1352
        packs._execute_pack_operations = _munged_execute_pack_ops
1353
        packs._max_pack_count = lambda x: 1
1354
        packs.pack_distribution = lambda x: [10]
1355
        self.assertFalse(packs.autopack())
1356
        self.assertEqual(1, len(packs.names()))
1357
        self.assertEqual(tree.branch.repository._pack_collection.names(),
1358
                         packs.names())
1359
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1360
    def test__save_pack_names(self):
1361
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1362
        names = packs.names()
1363
        pack = packs.get_pack_by_name(names[0])
1364
        packs._remove_pack_from_memory(pack)
1365
        packs._save_pack_names(obsolete_packs=[pack])
1366
        cur_packs = packs._pack_transport.list_dir('.')
1367
        self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1368
        # obsolete_packs will also have stuff like .rix and .iix present.
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__save_pack_names_already_obsoleted(self):
1374
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1375
        names = packs.names()
1376
        pack = packs.get_pack_by_name(names[0])
1377
        packs._remove_pack_from_memory(pack)
1378
        # We are going to simulate a concurrent autopack by manually obsoleting
1379
        # the pack directly.
1380
        packs._obsolete_packs([pack])
1381
        packs._save_pack_names(clear_obsolete_packs=True,
1382
                               obsolete_packs=[pack])
1383
        cur_packs = packs._pack_transport.list_dir('.')
1384
        self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1385
        # Note that while we set clear_obsolete_packs=True, it should not
1386
        # delete a pack file that we have also scheduled for obsoletion.
1387
        obsolete_packs = packs.transport.list_dir('obsolete_packs')
1388
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1389
        self.assertEqual([pack.name], sorted(obsolete_names))
1390
6225.2.6 by Jelmer Vernooij
Move pack clear test to test_repository.
1391
    def test_pack_no_obsolete_packs_directory(self):
1392
        """Bug #314314, don't fail if obsolete_packs directory does
1393
        not exist."""
1394
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1395
        r.control_transport.rmdir('obsolete_packs')
1396
        packs._clear_obsolete_packs()
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1397
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1398
1399
class TestPack(TestCaseWithTransport):
1400
    """Tests for the Pack object."""
1401
1402
    def assertCurrentlyEqual(self, left, right):
1403
        self.assertTrue(left == right)
1404
        self.assertTrue(right == left)
1405
        self.assertFalse(left != right)
1406
        self.assertFalse(right != left)
1407
1408
    def assertCurrentlyNotEqual(self, left, right):
1409
        self.assertFalse(left == right)
1410
        self.assertFalse(right == left)
1411
        self.assertTrue(left != right)
1412
        self.assertTrue(right != left)
1413
1414
    def test___eq____ne__(self):
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
1415
        left = pack_repo.ExistingPack('', '', '', '', '', '')
1416
        right = pack_repo.ExistingPack('', '', '', '', '', '')
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1417
        self.assertCurrentlyEqual(left, right)
1418
        # change all attributes and ensure equality changes as we do.
1419
        left.revision_index = 'a'
1420
        self.assertCurrentlyNotEqual(left, right)
1421
        right.revision_index = 'a'
1422
        self.assertCurrentlyEqual(left, right)
1423
        left.inventory_index = 'a'
1424
        self.assertCurrentlyNotEqual(left, right)
1425
        right.inventory_index = 'a'
1426
        self.assertCurrentlyEqual(left, right)
1427
        left.text_index = 'a'
1428
        self.assertCurrentlyNotEqual(left, right)
1429
        right.text_index = 'a'
1430
        self.assertCurrentlyEqual(left, right)
1431
        left.signature_index = 'a'
1432
        self.assertCurrentlyNotEqual(left, right)
1433
        right.signature_index = 'a'
1434
        self.assertCurrentlyEqual(left, right)
1435
        left.name = 'a'
1436
        self.assertCurrentlyNotEqual(left, right)
1437
        right.name = 'a'
1438
        self.assertCurrentlyEqual(left, right)
1439
        left.transport = 'a'
1440
        self.assertCurrentlyNotEqual(left, right)
1441
        right.transport = 'a'
1442
        self.assertCurrentlyEqual(left, right)
2592.3.179 by Robert Collins
Generate the revision_index_map for packing during the core operation, from the pack objects.
1443
1444
    def test_file_name(self):
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
1445
        pack = pack_repo.ExistingPack('', 'a_name', '', '', '', '')
2592.3.179 by Robert Collins
Generate the revision_index_map for packing during the core operation, from the pack objects.
1446
        self.assertEqual('a_name.pack', pack.file_name())
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1447
1448
1449
class TestNewPack(TestCaseWithTransport):
1450
    """Tests for pack_repo.NewPack."""
1451
2592.3.193 by Robert Collins
Move hash tracking of new packs into NewPack.
1452
    def test_new_instance_attributes(self):
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1453
        upload_transport = self.get_transport('upload')
1454
        pack_transport = self.get_transport('pack')
1455
        index_transport = self.get_transport('index')
1456
        upload_transport.mkdir('.')
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1457
        collection = pack_repo.RepositoryPackCollection(
1458
            repo=None,
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
1459
            transport=self.get_transport('.'),
1460
            index_transport=index_transport,
1461
            upload_transport=upload_transport,
1462
            pack_transport=pack_transport,
1463
            index_builder_class=BTreeBuilder,
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1464
            index_class=BTreeGraphIndex,
1465
            use_chk_index=False)
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
1466
        pack = pack_repo.NewPack(collection)
4857.2.1 by John Arbash Meinel
2 test_repository tests weren't adding cleanups when opening files.
1467
        self.addCleanup(pack.abort) # Make sure the write stream gets closed
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1468
        self.assertIsInstance(pack.revision_index, BTreeBuilder)
1469
        self.assertIsInstance(pack.inventory_index, BTreeBuilder)
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
1470
        self.assertIsInstance(pack._hash, type(osutils.md5()))
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1471
        self.assertTrue(pack.upload_transport is upload_transport)
1472
        self.assertTrue(pack.index_transport is index_transport)
1473
        self.assertTrue(pack.pack_transport is pack_transport)
1474
        self.assertEqual(None, pack.index_sizes)
1475
        self.assertEqual(20, len(pack.random_name))
1476
        self.assertIsInstance(pack.random_name, str)
1477
        self.assertIsInstance(pack.start_time, float)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1478
1479
1480
class TestPacker(TestCaseWithTransport):
1481
    """Tests for the packs repository Packer class."""
2951.1.10 by Robert Collins
Peer review feedback with Ian.
1482
3824.2.4 by John Arbash Meinel
Add a test that ensures the pack ordering changes as part of calling .pack()
1483
    def test_pack_optimizes_pack_order(self):
4617.8.1 by Robert Collins
Lock down another test assuming the default was a PackRepository.
1484
        builder = self.make_branch_builder('.', format="1.9")
3824.2.4 by John Arbash Meinel
Add a test that ensures the pack ordering changes as part of calling .pack()
1485
        builder.start_series()
1486
        builder.build_snapshot('A', None, [
1487
            ('add', ('', 'root-id', 'directory', None)),
1488
            ('add', ('f', 'f-id', 'file', 'content\n'))])
1489
        builder.build_snapshot('B', ['A'],
1490
            [('modify', ('f-id', 'new-content\n'))])
1491
        builder.build_snapshot('C', ['B'],
1492
            [('modify', ('f-id', 'third-content\n'))])
1493
        builder.build_snapshot('D', ['C'],
1494
            [('modify', ('f-id', 'fourth-content\n'))])
1495
        b = builder.get_branch()
1496
        b.lock_read()
1497
        builder.finish_series()
1498
        self.addCleanup(b.unlock)
1499
        # At this point, we should have 4 pack files available
1500
        # Because of how they were built, they correspond to
1501
        # ['D', 'C', 'B', 'A']
1502
        packs = b.repository._pack_collection.packs
5757.7.5 by Jelmer Vernooij
Fix imports in tests.
1503
        packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
3824.2.4 by John Arbash Meinel
Add a test that ensures the pack ordering changes as part of calling .pack()
1504
                                  packs, 'testing',
1505
                                  revision_ids=['B', 'C'])
1506
        # Now, when we are copying the B & C revisions, their pack files should
1507
        # be moved to the front of the stack
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1508
        # The new ordering moves B & C to the front of the .packs attribute,
1509
        # and leaves the others in the original order.
3824.2.4 by John Arbash Meinel
Add a test that ensures the pack ordering changes as part of calling .pack()
1510
        new_packs = [packs[1], packs[2], packs[0], packs[3]]
1511
        new_pack = packer.pack()
1512
        self.assertEqual(new_packs, packer.packs)
3146.6.1 by Aaron Bentley
InterDifferingSerializer shows a progress bar
1513
1514
3777.5.4 by John Arbash Meinel
OptimisingPacker now sets the optimize flags for the indexes being built.
1515
class TestOptimisingPacker(TestCaseWithTransport):
1516
    """Tests for the OptimisingPacker class."""
1517
1518
    def get_pack_collection(self):
1519
        repo = self.make_repository('.')
1520
        return repo._pack_collection
1521
1522
    def test_open_pack_will_optimise(self):
5757.7.3 by Jelmer Vernooij
Move more knitpack-specific functionality out of Packer.
1523
        packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
3777.5.4 by John Arbash Meinel
OptimisingPacker now sets the optimize flags for the indexes being built.
1524
                                            [], '.test')
1525
        new_pack = packer.open_pack()
4857.2.1 by John Arbash Meinel
2 test_repository tests weren't adding cleanups when opening files.
1526
        self.addCleanup(new_pack.abort) # ensure cleanup
3777.5.4 by John Arbash Meinel
OptimisingPacker now sets the optimize flags for the indexes being built.
1527
        self.assertIsInstance(new_pack, pack_repo.NewPack)
1528
        self.assertTrue(new_pack.revision_index._optimize_for_size)
1529
        self.assertTrue(new_pack.inventory_index._optimize_for_size)
1530
        self.assertTrue(new_pack.text_index._optimize_for_size)
1531
        self.assertTrue(new_pack.signature_index._optimize_for_size)
4462.2.6 by Robert Collins
Cause StreamSink to partially pack repositories after cross format fetches when beneficial.
1532
1533
4634.170.1 by John Arbash Meinel
Fix bug #437003. Autopacking should not fail for an
1534
class TestGCCHKPacker(TestCaseWithTransport):
1535
1536
    def make_abc_branch(self):
1537
        builder = self.make_branch_builder('source')
1538
        builder.start_series()
1539
        builder.build_snapshot('A', None, [
1540
            ('add', ('', 'root-id', 'directory', None)),
1541
            ('add', ('file', 'file-id', 'file', 'content\n')),
1542
            ])
1543
        builder.build_snapshot('B', ['A'], [
1544
            ('add', ('dir', 'dir-id', 'directory', None))])
1545
        builder.build_snapshot('C', ['B'], [
1546
            ('modify', ('file-id', 'new content\n'))])
1547
        builder.finish_series()
1548
        return builder.get_branch()
1549
1550
    def make_branch_with_disjoint_inventory_and_revision(self):
1551
        """a repo with separate packs for a revisions Revision and Inventory.
1552
1553
        There will be one pack file that holds the Revision content, and one
1554
        for the Inventory content.
1555
1556
        :return: (repository,
1557
                  pack_name_with_rev_A_Revision,
1558
                  pack_name_with_rev_A_Inventory,
1559
                  pack_name_with_rev_C_content)
1560
        """
1561
        b_source = self.make_abc_branch()
1562
        b_base = b_source.bzrdir.sprout('base', revision_id='A').open_branch()
1563
        b_stacked = b_base.bzrdir.sprout('stacked', stacked=True).open_branch()
1564
        b_stacked.lock_write()
1565
        self.addCleanup(b_stacked.unlock)
1566
        b_stacked.fetch(b_source, 'B')
1567
        # Now re-open the stacked repo directly (no fallbacks) so that we can
1568
        # fill in the A rev.
1569
        repo_not_stacked = b_stacked.bzrdir.open_repository()
1570
        repo_not_stacked.lock_write()
1571
        self.addCleanup(repo_not_stacked.unlock)
1572
        # Now we should have a pack file with A's inventory, but not its
1573
        # Revision
1574
        self.assertEqual([('A',), ('B',)],
1575
                         sorted(repo_not_stacked.inventories.keys()))
1576
        self.assertEqual([('B',)],
1577
                         sorted(repo_not_stacked.revisions.keys()))
1578
        stacked_pack_names = repo_not_stacked._pack_collection.names()
1579
        # We have a couple names here, figure out which has A's inventory
1580
        for name in stacked_pack_names:
1581
            pack = repo_not_stacked._pack_collection.get_pack_by_name(name)
1582
            keys = [n[1] for n in pack.inventory_index.iter_all_entries()]
1583
            if ('A',) in keys:
1584
                inv_a_pack_name = name
1585
                break
1586
        else:
1587
            self.fail('Could not find pack containing A\'s inventory')
1588
        repo_not_stacked.fetch(b_source.repository, 'A')
1589
        self.assertEqual([('A',), ('B',)],
1590
                         sorted(repo_not_stacked.revisions.keys()))
1591
        new_pack_names = set(repo_not_stacked._pack_collection.names())
1592
        rev_a_pack_names = new_pack_names.difference(stacked_pack_names)
1593
        self.assertEqual(1, len(rev_a_pack_names))
1594
        rev_a_pack_name = list(rev_a_pack_names)[0]
1595
        # Now fetch 'C', so we have a couple pack files to join
1596
        repo_not_stacked.fetch(b_source.repository, 'C')
1597
        rev_c_pack_names = set(repo_not_stacked._pack_collection.names())
1598
        rev_c_pack_names = rev_c_pack_names.difference(new_pack_names)
1599
        self.assertEqual(1, len(rev_c_pack_names))
1600
        rev_c_pack_name = list(rev_c_pack_names)[0]
1601
        return (repo_not_stacked, rev_a_pack_name, inv_a_pack_name,
1602
                rev_c_pack_name)
1603
1604
    def test_pack_with_distant_inventories(self):
1605
        # See https://bugs.launchpad.net/bzr/+bug/437003
1606
        # When repacking, it is possible to have an inventory in a different
1607
        # pack file than the associated revision. An autopack can then come
1608
        # along, and miss that inventory, and complain.
1609
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
1610
         ) = self.make_branch_with_disjoint_inventory_and_revision()
1611
        a_pack = repo._pack_collection.get_pack_by_name(rev_a_pack_name)
1612
        c_pack = repo._pack_collection.get_pack_by_name(rev_c_pack_name)
1613
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
1614
                    [a_pack, c_pack], '.test-pack')
1615
        # This would raise ValueError in bug #437003, but should not raise an
1616
        # error once fixed.
1617
        packer.pack()
1618
1619
    def test_pack_with_missing_inventory(self):
1620
        # Similar to test_pack_with_missing_inventory, but this time, we force
1621
        # the A inventory to actually be gone from the repository.
1622
        (repo, rev_a_pack_name, inv_a_pack_name, rev_c_pack_name
1623
         ) = self.make_branch_with_disjoint_inventory_and_revision()
1624
        inv_a_pack = repo._pack_collection.get_pack_by_name(inv_a_pack_name)
1625
        repo._pack_collection._remove_pack_from_memory(inv_a_pack)
1626
        packer = groupcompress_repo.GCCHKPacker(repo._pack_collection,
1627
            repo._pack_collection.all_packs(), '.test-pack')
1628
        e = self.assertRaises(ValueError, packer.pack)
1629
        packer.new_pack.abort()
4634.170.2 by John Arbash Meinel
Loosen the match a bit. Newer versions have StaticTuple.
1630
        self.assertContainsRe(str(e),
1631
            r"We are missing inventories for revisions: .*'A'")
4634.170.1 by John Arbash Meinel
Fix bug #437003. Autopacking should not fail for an
1632
1633
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1634
class TestCrossFormatPacks(TestCaseWithTransport):
1635
1636
    def log_pack(self, hint=None):
1637
        self.calls.append(('pack', hint))
1638
        self.orig_pack(hint=hint)
1639
        if self.expect_hint:
1640
            self.assertTrue(hint)
1641
1642
    def run_stream(self, src_fmt, target_fmt, expect_pack_called):
1643
        self.expect_hint = expect_pack_called
1644
        self.calls = []
1645
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
1646
        source_tree.lock_write()
1647
        self.addCleanup(source_tree.unlock)
1648
        tip = source_tree.commit('foo')
1649
        target = self.make_repository('target', format=target_fmt)
1650
        target.lock_write()
1651
        self.addCleanup(target.unlock)
1652
        source = source_tree.branch.repository._get_source(target._format)
1653
        self.orig_pack = target.pack
5340.15.1 by John Arbash Meinel
supersede exc-info branch
1654
        self.overrideAttr(target, "pack", self.log_pack)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1655
        search = target.search_missing_revision_ids(
5539.2.11 by Andrew Bennetts
Fix deprecation warning from test suite.
1656
            source_tree.branch.repository, revision_ids=[tip])
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1657
        stream = source.get_stream(search)
1658
        from_format = source_tree.branch.repository._format
1659
        sink = target._get_sink()
1660
        sink.insert_stream(stream, from_format, [])
1661
        if expect_pack_called:
1662
            self.assertLength(1, self.calls)
1663
        else:
1664
            self.assertLength(0, self.calls)
1665
1666
    def run_fetch(self, src_fmt, target_fmt, expect_pack_called):
1667
        self.expect_hint = expect_pack_called
1668
        self.calls = []
1669
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
1670
        source_tree.lock_write()
1671
        self.addCleanup(source_tree.unlock)
1672
        tip = source_tree.commit('foo')
1673
        target = self.make_repository('target', format=target_fmt)
1674
        target.lock_write()
1675
        self.addCleanup(target.unlock)
1676
        source = source_tree.branch.repository
1677
        self.orig_pack = target.pack
5340.15.1 by John Arbash Meinel
supersede exc-info branch
1678
        self.overrideAttr(target, "pack", self.log_pack)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1679
        target.fetch(source)
1680
        if expect_pack_called:
1681
            self.assertLength(1, self.calls)
1682
        else:
1683
            self.assertLength(0, self.calls)
1684
1685
    def test_sink_format_hint_no(self):
1686
        # When the target format says packing makes no difference, pack is not
1687
        # called.
1688
        self.run_stream('1.9', 'rich-root-pack', False)
1689
1690
    def test_sink_format_hint_yes(self):
1691
        # When the target format says packing makes a difference, pack is
1692
        # called.
1693
        self.run_stream('1.9', '2a', True)
1694
1695
    def test_sink_format_same_no(self):
1696
        # When the formats are the same, pack is not called.
1697
        self.run_stream('2a', '2a', False)
1698
1699
    def test_IDS_format_hint_no(self):
1700
        # When the target format says packing makes no difference, pack is not
1701
        # called.
1702
        self.run_fetch('1.9', 'rich-root-pack', False)
1703
1704
    def test_IDS_format_hint_yes(self):
1705
        # When the target format says packing makes a difference, pack is
1706
        # called.
1707
        self.run_fetch('1.9', '2a', True)
1708
1709
    def test_IDS_format_same_no(self):
1710
        # When the formats are the same, pack is not called.
1711
        self.run_fetch('2a', '2a', False)
6015.20.1 by John Arbash Meinel
Add a __repr__ to _LazyListJoin to make it easier to debug.
1712
1713
1714
class Test_LazyListJoin(tests.TestCase):
1715
1716
    def test__repr__(self):
1717
        lazy = repository._LazyListJoin(['a'], ['b'])
1718
        self.assertEqual("bzrlib.repository._LazyListJoin((['a'], ['b']))",
1719
                         repr(lazy))
6213.1.21 by Jelmer Vernooij
Add feature support for repository.
1720
1721
1722
class TestFeatures(tests.TestCaseWithTransport):
1723
1724
    def test_open_with_present_feature(self):
1725
        self.addCleanup(
6213.1.28 by Jelmer Vernooij
Fix tests.
1726
            repository.RepositoryFormatMetaDir.unregister_feature,
6213.1.21 by Jelmer Vernooij
Add feature support for repository.
1727
            "makes-cheese-sandwich")
6213.1.28 by Jelmer Vernooij
Fix tests.
1728
        repository.RepositoryFormatMetaDir.register_feature(
6213.1.21 by Jelmer Vernooij
Add feature support for repository.
1729
            "makes-cheese-sandwich")
1730
        repo = self.make_repository('.')
1731
        repo.lock_write()
6213.1.32 by Jelmer Vernooij
Fix check support status.
1732
        repo._format.features["makes-cheese-sandwich"] = "required"
6213.1.21 by Jelmer Vernooij
Add feature support for repository.
1733
        repo._format.check_support_status(False)
1734
        repo.unlock()
1735
1736
    def test_open_with_missing_required_feature(self):
1737
        repo = self.make_repository('.')
1738
        repo.lock_write()
6213.1.32 by Jelmer Vernooij
Fix check support status.
1739
        repo._format.features["makes-cheese-sandwich"] = "required"
6213.1.21 by Jelmer Vernooij
Add feature support for repository.
1740
        self.assertRaises(errors.MissingFeature,
1741
            repo._format.check_support_status, False)