/brz/remove-bazaar

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