/brz/remove-bazaar

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