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