/brz/remove-bazaar

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