/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):
489
        return False
490
3709.5.10 by Andrew Bennetts
Fix test failure caused by missing attributes on DummyRepository.
491
    def get_graph(self):
492
        raise NotImplementedError
493
494
    def get_parent_map(self, revision_ids):
495
        raise NotImplementedError
496
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
497
498
class InterDummy(repository.InterRepository):
499
    """An inter-repository optimised code path for DummyRepository.
500
501
    This is for use during testing where we use DummyRepository as repositories
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
502
    so that none of the default regsitered inter-repository classes will
2818.4.2 by Robert Collins
Review feedback.
503
    MATCH.
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
504
    """
505
506
    @staticmethod
507
    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.
508
        """InterDummy is compatible with DummyRepository."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
509
        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.
510
            isinstance(repo_target, DummyRepository))
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
511
512
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
513
class TestInterRepository(TestCaseWithTransport):
514
515
    def test_get_default_inter_repository(self):
516
        # test that the InterRepository.get(repo_a, repo_b) probes
517
        # for a inter_repo class where is_compatible(repo_a, repo_b) returns
518
        # true and returns a default inter_repo otherwise.
519
        # This also tests that the default registered optimised interrepository
520
        # classes do not barf inappropriately when a surprising repository type
521
        # 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.
522
        dummy_a = DummyRepository()
523
        dummy_b = DummyRepository()
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
524
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
525
526
    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.
527
        """Asserts that InterRepository.get(repo_a, repo_b) -> the default.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
528
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
529
        The effective default is now InterSameDataRepository because there is
530
        no actual sane default in the presence of incompatible data models.
531
        """
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
532
        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.
533
        self.assertEqual(repository.InterSameDataRepository,
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
534
                         inter_repo.__class__)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
535
        self.assertEqual(repo_a, inter_repo.source)
536
        self.assertEqual(repo_b, inter_repo.target)
537
538
    def test_register_inter_repository_class(self):
539
        # test that a optimised code path provider - a
540
        # InterRepository subclass can be registered and unregistered
541
        # and that it is correctly selected when given a repository
542
        # pair that it returns true on for the is_compatible static method
543
        # check
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
544
        dummy_a = DummyRepository()
545
        dummy_b = DummyRepository()
546
        repo = self.make_repository('.')
547
        # hack dummies to look like repo somewhat.
548
        dummy_a._serializer = repo._serializer
549
        dummy_b._serializer = repo._serializer
550
        repository.InterRepository.register_optimiser(InterDummy)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
551
        try:
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
552
            # we should get the default for something InterDummy returns False
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
553
            # to
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
554
            self.assertFalse(InterDummy.is_compatible(dummy_a, repo))
555
            self.assertGetsDefaultInterRepository(dummy_a, repo)
556
            # and we should get an InterDummy for a pair it 'likes'
557
            self.assertTrue(InterDummy.is_compatible(dummy_a, dummy_b))
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
558
            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.
559
            self.assertEqual(InterDummy, inter_repo.__class__)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
560
            self.assertEqual(dummy_a, inter_repo.source)
561
            self.assertEqual(dummy_b, inter_repo.target)
562
        finally:
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
563
            repository.InterRepository.unregister_optimiser(InterDummy)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
564
        # now we should get the default InterRepository object again.
565
        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.
566
2241.1.17 by Martin Pool
Restore old InterWeave tests
567
568
class TestInterWeaveRepo(TestCaseWithTransport):
569
570
    def test_is_compatible_and_registered(self):
571
        # InterWeaveRepo is compatible when either side
572
        # is a format 5/6/7 branch
2241.1.20 by mbp at sourcefrog
update tests for new locations of weave repos
573
        from bzrlib.repofmt import knitrepo, weaverepo
574
        formats = [weaverepo.RepositoryFormat5(),
575
                   weaverepo.RepositoryFormat6(),
576
                   weaverepo.RepositoryFormat7()]
577
        incompatible_formats = [weaverepo.RepositoryFormat4(),
578
                                knitrepo.RepositoryFormatKnit1(),
2241.1.17 by Martin Pool
Restore old InterWeave tests
579
                                ]
580
        repo_a = self.make_repository('a')
581
        repo_b = self.make_repository('b')
582
        is_compatible = repository.InterWeaveRepo.is_compatible
583
        for source in incompatible_formats:
584
            # force incompatible left then right
585
            repo_a._format = source
586
            repo_b._format = formats[0]
587
            self.assertFalse(is_compatible(repo_a, repo_b))
588
            self.assertFalse(is_compatible(repo_b, repo_a))
589
        for source in formats:
590
            repo_a._format = source
591
            for target in formats:
592
                repo_b._format = target
593
                self.assertTrue(is_compatible(repo_a, repo_b))
594
        self.assertEqual(repository.InterWeaveRepo,
595
                         repository.InterRepository.get(repo_a,
596
                                                        repo_b).__class__)
597
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.
598
599
class TestRepositoryConverter(TestCaseWithTransport):
600
601
    def test_convert_empty(self):
602
        t = get_transport(self.get_url('.'))
603
        t.mkdir('repository')
604
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
605
        repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
606
        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.
607
        converter = repository.CopyConverter(target_format)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
608
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
609
        try:
610
            converter.convert(repo, pb)
611
        finally:
612
            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.
613
        repo = repo_dir.open_repository()
614
        self.assertTrue(isinstance(target_format, repo._format.__class__))
1843.2.5 by Aaron Bentley
Add test of _unescape_xml
615
616
617
class TestMisc(TestCase):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
618
1843.2.5 by Aaron Bentley
Add test of _unescape_xml
619
    def test_unescape_xml(self):
620
        """We get some kind of error when malformed entities are passed"""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
621
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;')
1910.2.13 by Aaron Bentley
Start work on converter
622
623
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
624
class TestRepositoryFormatKnit3(TestCaseWithTransport):
1910.2.13 by Aaron Bentley
Start work on converter
625
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
626
    def test_attribute__fetch_order(self):
627
        """Knits need topological data insertion."""
628
        format = bzrdir.BzrDirMetaFormat1()
629
        format.repository_format = knitrepo.RepositoryFormatKnit3()
630
        repo = self.make_repository('.', format=format)
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
631
        self.assertEqual('topological', repo._format._fetch_order)
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
632
633
    def test_attribute__fetch_uses_deltas(self):
634
        """Knits reuse deltas."""
635
        format = bzrdir.BzrDirMetaFormat1()
636
        format.repository_format = knitrepo.RepositoryFormatKnit3()
637
        repo = self.make_repository('.', format=format)
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
638
        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
639
1910.2.13 by Aaron Bentley
Start work on converter
640
    def test_convert(self):
641
        """Ensure the upgrade adds weaves for roots"""
1910.2.35 by Aaron Bentley
Better fix for convesion test
642
        format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
643
        format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.35 by Aaron Bentley
Better fix for convesion test
644
        tree = self.make_branch_and_tree('.', format)
1910.2.13 by Aaron Bentley
Start work on converter
645
        tree.commit("Dull commit", rev_id="dull")
646
        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.
647
        revision_tree.lock_read()
648
        try:
649
            self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
650
                revision_tree.inventory.root.file_id)
651
        finally:
652
            revision_tree.unlock()
1910.2.13 by Aaron Bentley
Start work on converter
653
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
654
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.13 by Aaron Bentley
Start work on converter
655
        upgrade.Convert('.', format)
1910.2.27 by Aaron Bentley
Fixed conversion test
656
        tree = workingtree.WorkingTree.open('.')
1910.2.13 by Aaron Bentley
Start work on converter
657
        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.
658
        revision_tree.lock_read()
659
        try:
660
            revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
661
        finally:
662
            revision_tree.unlock()
1910.2.27 by Aaron Bentley
Fixed conversion test
663
        tree.commit("Another dull commit", rev_id='dull2')
664
        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.
665
        revision_tree.lock_read()
666
        self.addCleanup(revision_tree.unlock)
1910.2.27 by Aaron Bentley
Fixed conversion test
667
        self.assertEqual('dull', revision_tree.inventory.root.revision)
2220.2.2 by Martin Pool
Add tag command and basic implementation
668
3221.3.1 by Robert Collins
* Repository formats have a new supported-feature attribute
669
    def test_supports_external_lookups(self):
670
        format = bzrdir.BzrDirMetaFormat1()
671
        format.repository_format = knitrepo.RepositoryFormatKnit3()
672
        repo = self.make_repository('.', format=format)
673
        self.assertFalse(repo._format.supports_external_lookups)
674
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
675
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
676
class Test2a(TestCaseWithTransport):
677
678
    def test_format_pack_compresses_True(self):
679
        repo = self.make_repository('repo', format='2a')
680
        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.
681
682
    def test_inventories_use_chk_map_with_parent_base_dict(self):
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
683
        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.
684
        revid = tree.commit("foo")
685
        tree.lock_read()
686
        self.addCleanup(tree.unlock)
687
        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.
688
        self.assertNotEqual(None, inv.parent_id_basename_to_file_id)
689
        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.
690
        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)
691
        self.assertEqual(65536, inv.id_to_entry._root_node.maximum_size)
692
        self.assertEqual(65536,
3735.2.41 by Robert Collins
Make the parent_id_basename index be updated during CHKInventory.apply_delta.
693
            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.
694
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
695
    def test_autopack_unchanged_chk_nodes(self):
696
        # at 20 unchanged commits, chk pages are packed that are split into
697
        # two groups such that the new pack being made doesn't have all its
698
        # pages in the source packs (though they are in the repository).
699
        tree = self.make_branch_and_tree('tree', format='2a')
700
        for pos in range(20):
701
            tree.commit(str(pos))
702
703
    def test_pack_with_hint(self):
704
        tree = self.make_branch_and_tree('tree', format='2a')
705
        # 1 commit to leave untouched
706
        tree.commit('1')
707
        to_keep = tree.branch.repository._pack_collection.names()
708
        # 2 to combine
709
        tree.commit('2')
710
        tree.commit('3')
711
        all = tree.branch.repository._pack_collection.names()
712
        combine = list(set(all) - set(to_keep))
713
        self.assertLength(3, all)
714
        self.assertLength(2, combine)
715
        tree.branch.repository.pack(hint=combine)
716
        final = tree.branch.repository._pack_collection.names()
717
        self.assertLength(2, final)
718
        self.assertFalse(combine[0] in final)
719
        self.assertFalse(combine[1] in final)
720
        self.assertSubset(to_keep, final)
721
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
722
    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.
723
        source = self.make_repository('source', format='2a')
724
        target = self.make_repository('target', format='2a')
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
725
        stream = source._get_source(target._format)
726
        self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
727
728
    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.
729
        source = self.make_repository('source', format='2a')
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
730
        target = self.make_repository('target', format='rich-root-pack')
731
        stream = source._get_source(target._format)
732
        # We don't want the child GroupCHKStreamSource
733
        self.assertIs(type(stream), repository.StreamSource)
734
4360.4.9 by John Arbash Meinel
Merge bzr.dev, bringing in the gc stacking fixes.
735
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
736
        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.
737
                            format='2a')
4360.4.9 by John Arbash Meinel
Merge bzr.dev, bringing in the gc stacking fixes.
738
        # We have to build a fairly large tree, so that we are sure the chk
739
        # pages will have split into multiple pages.
740
        entries = [('add', ('', 'a-root-id', 'directory', None))]
741
        for i in 'abcdefghijklmnopqrstuvwxyz123456789':
742
            for j in 'abcdefghijklmnopqrstuvwxyz123456789':
743
                fname = i + j
744
                fid = fname + '-id'
745
                content = 'content for %s\n' % (fname,)
746
                entries.append(('add', (fname, fid, 'file', content)))
747
        source_builder.start_series()
748
        source_builder.build_snapshot('rev-1', None, entries)
749
        # Now change a few of them, so we get a few new pages for the second
750
        # revision
751
        source_builder.build_snapshot('rev-2', ['rev-1'], [
752
            ('modify', ('aa-id', 'new content for aa-id\n')),
753
            ('modify', ('cc-id', 'new content for cc-id\n')),
754
            ('modify', ('zz-id', 'new content for zz-id\n')),
755
            ])
756
        source_builder.finish_series()
757
        source_branch = source_builder.get_branch()
758
        source_branch.lock_read()
759
        self.addCleanup(source_branch.unlock)
4462.2.1 by Robert Collins
Add new attribute to RepositoryFormat pack_compresses, hinting when pack can be useful.
760
        target = self.make_repository('target', format='2a')
4360.4.9 by John Arbash Meinel
Merge bzr.dev, bringing in the gc stacking fixes.
761
        source = source_branch.repository._get_source(target._format)
762
        self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
763
764
        # On a regular pass, getting the inventories and chk pages for rev-2
765
        # would only get the newly created chk pages
766
        search = graph.SearchResult(set(['rev-2']), set(['rev-1']), 1,
767
                                    set(['rev-2']))
768
        simple_chk_records = []
769
        for vf_name, substream in source.get_stream(search):
770
            if vf_name == 'chk_bytes':
771
                for record in substream:
772
                    simple_chk_records.append(record.key)
773
            else:
774
                for _ in substream:
775
                    continue
776
        # 3 pages, the root (InternalNode), + 2 pages which actually changed
777
        self.assertEqual([('sha1:91481f539e802c76542ea5e4c83ad416bf219f73',),
778
                          ('sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
779
                          ('sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
780
                          ('sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)],
781
                         simple_chk_records)
782
        # Now, when we do a similar call using 'get_stream_for_missing_keys'
783
        # we should get a much larger set of pages.
784
        missing = [('inventories', 'rev-2')]
785
        full_chk_records = []
786
        for vf_name, substream in source.get_stream_for_missing_keys(missing):
787
            if vf_name == 'inventories':
788
                for record in substream:
789
                    self.assertEqual(('rev-2',), record.key)
790
            elif vf_name == 'chk_bytes':
791
                for record in substream:
792
                    full_chk_records.append(record.key)
793
            else:
794
                self.fail('Should not be getting a stream of %s' % (vf_name,))
795
        # We have 257 records now. This is because we have 1 root page, and 256
796
        # leaf pages in a complete listing.
797
        self.assertEqual(257, len(full_chk_records))
798
        self.assertSubset(simple_chk_records, full_chk_records)
799
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
800
801
class TestKnitPackStreamSource(tests.TestCaseWithMemoryTransport):
802
803
    def test_source_to_exact_pack_092(self):
804
        source = self.make_repository('source', format='pack-0.92')
805
        target = self.make_repository('target', format='pack-0.92')
806
        stream_source = source._get_source(target._format)
807
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
808
809
    def test_source_to_exact_pack_rich_root_pack(self):
810
        source = self.make_repository('source', format='rich-root-pack')
811
        target = self.make_repository('target', format='rich-root-pack')
812
        stream_source = source._get_source(target._format)
813
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
814
815
    def test_source_to_exact_pack_19(self):
816
        source = self.make_repository('source', format='1.9')
817
        target = self.make_repository('target', format='1.9')
818
        stream_source = source._get_source(target._format)
819
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
820
821
    def test_source_to_exact_pack_19_rich_root(self):
822
        source = self.make_repository('source', format='1.9-rich-root')
823
        target = self.make_repository('target', format='1.9-rich-root')
824
        stream_source = source._get_source(target._format)
825
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
826
827
    def test_source_to_remote_exact_pack_19(self):
828
        trans = self.make_smart_server('target')
829
        trans.ensure_base()
830
        source = self.make_repository('source', format='1.9')
831
        target = self.make_repository('target', format='1.9')
832
        target = repository.Repository.open(trans.base)
833
        stream_source = source._get_source(target._format)
834
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
835
836
    def test_stream_source_to_non_exact(self):
837
        source = self.make_repository('source', format='pack-0.92')
838
        target = self.make_repository('target', format='1.9')
839
        stream = source._get_source(target._format)
840
        self.assertIs(type(stream), repository.StreamSource)
841
842
    def test_stream_source_to_non_exact_rich_root(self):
843
        source = self.make_repository('source', format='1.9')
844
        target = self.make_repository('target', format='1.9-rich-root')
845
        stream = source._get_source(target._format)
846
        self.assertIs(type(stream), repository.StreamSource)
847
848
    def test_source_to_remote_non_exact_pack_19(self):
849
        trans = self.make_smart_server('target')
850
        trans.ensure_base()
851
        source = self.make_repository('source', format='1.9')
852
        target = self.make_repository('target', format='1.6')
853
        target = repository.Repository.open(trans.base)
854
        stream_source = source._get_source(target._format)
855
        self.assertIs(type(stream_source), repository.StreamSource)
856
857
    def test_stream_source_to_knit(self):
858
        source = self.make_repository('source', format='pack-0.92')
859
        target = self.make_repository('target', format='dirstate')
860
        stream = source._get_source(target._format)
861
        self.assertIs(type(stream), repository.StreamSource)
862
3735.2.40 by Robert Collins
Add development4 which has a parent_id to basename index on CHKInventory objects.
863
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
864
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
865
    """Tests for _find_parent_ids_of_revisions."""
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
866
867
    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.
868
        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)
869
        self.builder = self.make_branch_builder('source',
870
            format='development6-rich-root')
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
871
        self.builder.start_series()
872
        self.builder.build_snapshot('initial', None,
873
            [('add', ('', 'tree-root', 'directory', None))])
874
        self.repo = self.builder.get_branch().repository
875
        self.addCleanup(self.builder.finish_series)
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
876
4343.3.32 by John Arbash Meinel
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
877
    def assertParentIds(self, expected_result, rev_set):
878
        self.assertEqual(sorted(expected_result),
879
            sorted(self.repo._find_parent_ids_of_revisions(rev_set)))
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
880
881
    def test_simple(self):
882
        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.
883
        self.builder.build_snapshot('revid2', ['revid1'], [])
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
884
        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.
885
        self.assertParentIds(['revid1'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
886
887
    def test_not_first_parent(self):
888
        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.
889
        self.builder.build_snapshot('revid2', ['revid1'], [])
890
        self.builder.build_snapshot('revid3', ['revid2'], [])
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
891
        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.
892
        self.assertParentIds(['revid1'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
893
894
    def test_not_null(self):
895
        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.
896
        self.assertParentIds([], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
897
898
    def test_not_null_set(self):
899
        self.builder.build_snapshot('revid1', None, [])
900
        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.
901
        self.assertParentIds([], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
902
903
    def test_ghost(self):
904
        self.builder.build_snapshot('revid1', None, [])
905
        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.
906
        self.assertParentIds(['initial'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
907
908
    def test_ghost_parent(self):
909
        self.builder.build_snapshot('revid1', None, [])
910
        self.builder.build_snapshot('revid2', ['revid1', 'ghost'], [])
911
        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.
912
        self.assertParentIds(['ghost', 'initial'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
913
914
    def test_righthand_parent(self):
915
        self.builder.build_snapshot('revid1', None, [])
916
        self.builder.build_snapshot('revid2a', ['revid1'], [])
917
        self.builder.build_snapshot('revid2b', ['revid1'], [])
918
        self.builder.build_snapshot('revid3', ['revid2a', 'revid2b'], [])
919
        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.
920
        self.assertParentIds(['revid1', 'revid2b'], rev_set)
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
921
922
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
923
class TestWithBrokenRepo(TestCaseWithTransport):
2592.3.214 by Robert Collins
Merge bzr.dev.
924
    """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.
925
926
    def make_broken_repository(self):
927
        # XXX: This function is borrowed from Aaron's "Reconcile can fix bad
928
        # parent references" branch which is due to land in bzr.dev soon.  Once
929
        # it does, this duplication should be removed.
930
        repo = self.make_repository('broken-repo')
931
        cleanups = []
932
        try:
933
            repo.lock_write()
934
            cleanups.append(repo.unlock)
935
            repo.start_write_group()
936
            cleanups.append(repo.commit_write_group)
937
            # make rev1a: A well-formed revision, containing 'file1'
938
            inv = inventory.Inventory(revision_id='rev1a')
939
            inv.root.revision = 'rev1a'
940
            self.add_file(repo, inv, 'file1', 'rev1a', [])
941
            repo.add_inventory('rev1a', inv, [])
942
            revision = _mod_revision.Revision('rev1a',
943
                committer='jrandom@example.com', timestamp=0,
944
                inventory_sha1='', timezone=0, message='foo', parent_ids=[])
945
            repo.add_revision('rev1a',revision, inv)
946
947
            # make rev1b, which has no Revision, but has an Inventory, and
948
            # file1
949
            inv = inventory.Inventory(revision_id='rev1b')
950
            inv.root.revision = 'rev1b'
951
            self.add_file(repo, inv, 'file1', 'rev1b', [])
952
            repo.add_inventory('rev1b', inv, [])
953
954
            # make rev2, with file1 and file2
955
            # file2 is sane
956
            # file1 has 'rev1b' as an ancestor, even though this is not
957
            # mentioned by 'rev1a', making it an unreferenced ancestor
958
            inv = inventory.Inventory()
959
            self.add_file(repo, inv, 'file1', 'rev2', ['rev1a', 'rev1b'])
960
            self.add_file(repo, inv, 'file2', 'rev2', [])
961
            self.add_revision(repo, 'rev2', inv, ['rev1a'])
962
963
            # make ghost revision rev1c
964
            inv = inventory.Inventory()
965
            self.add_file(repo, inv, 'file2', 'rev1c', [])
966
967
            # make rev3 with file2
968
            # file2 refers to 'rev1c', which is a ghost in this repository, so
969
            # file2 cannot have rev1c as its ancestor.
970
            inv = inventory.Inventory()
971
            self.add_file(repo, inv, 'file2', 'rev3', ['rev1c'])
972
            self.add_revision(repo, 'rev3', inv, ['rev1c'])
973
            return repo
974
        finally:
975
            for cleanup in reversed(cleanups):
976
                cleanup()
977
978
    def add_revision(self, repo, revision_id, inv, parent_ids):
979
        inv.revision_id = revision_id
980
        inv.root.revision = revision_id
981
        repo.add_inventory(revision_id, inv, parent_ids)
982
        revision = _mod_revision.Revision(revision_id,
983
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
984
            timezone=0, message='foo', parent_ids=parent_ids)
985
        repo.add_revision(revision_id,revision, inv)
986
987
    def add_file(self, repo, inv, filename, revision, parents):
988
        file_id = filename + '-id'
989
        entry = inventory.InventoryFile(file_id, filename, 'TREE_ROOT')
990
        entry.revision = revision
2535.4.10 by Andrew Bennetts
Fix one failing test, disable another.
991
        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.
992
        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.
993
        text_key = (file_id, revision)
994
        parent_keys = [(file_id, parent) for parent in parents]
995
        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.
996
997
    def test_insert_from_broken_repo(self):
998
        """Inserting a data stream from a broken repository won't silently
999
        corrupt the target repository.
1000
        """
1001
        broken_repo = self.make_broken_repository()
1002
        empty_repo = self.make_repository('empty-repo')
4360.4.17 by John Arbash Meinel
Change insert_from_broken_repo into an expectedFailure.
1003
        # See bug https://bugs.launchpad.net/bzr/+bug/389141 for information
1004
        # about why this was turned into expectFailure
1005
        self.expectFailure('new Stream fetch fills in missing compression'
1006
           ' parents (bug #389141)',
1007
           self.assertRaises, (errors.RevisionNotPresent, errors.BzrCheckError),
1008
                              empty_repo.fetch, broken_repo)
3830.3.25 by John Arbash Meinel
We changed the error that is raised when fetching from a broken repo.
1009
        self.assertRaises((errors.RevisionNotPresent, errors.BzrCheckError),
1010
                          empty_repo.fetch, broken_repo)
2592.3.214 by Robert Collins
Merge bzr.dev.
1011
1012
2592.3.84 by Robert Collins
Start of autopacking logic.
1013
class TestRepositoryPackCollection(TestCaseWithTransport):
1014
1015
    def get_format(self):
3010.3.3 by Martin Pool
Merge trunk
1016
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
2592.3.84 by Robert Collins
Start of autopacking logic.
1017
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1018
    def get_packs(self):
1019
        format = self.get_format()
1020
        repo = self.make_repository('.', format=format)
1021
        return repo._pack_collection
1022
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1023
    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
1024
        """Create a pack repo with 3 packs, and access it via a second repo."""
1025
        tree = self.make_branch_and_tree('.')
1026
        tree.lock_write()
1027
        self.addCleanup(tree.unlock)
1028
        rev1 = tree.commit('one')
1029
        rev2 = tree.commit('two')
1030
        rev3 = tree.commit('three')
1031
        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.
1032
        if write_lock:
1033
            r.lock_write()
1034
        else:
1035
            r.lock_read()
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1036
        self.addCleanup(r.unlock)
1037
        packs = r._pack_collection
1038
        packs.ensure_loaded()
1039
        return tree, r, packs, [rev1, rev2, rev3]
1040
2592.3.84 by Robert Collins
Start of autopacking logic.
1041
    def test__max_pack_count(self):
2592.3.219 by Robert Collins
Review feedback.
1042
        """The maximum pack count is a function of the number of revisions."""
2592.3.84 by Robert Collins
Start of autopacking logic.
1043
        # no revisions - one pack, so that we can have a revision free repo
1044
        # without it blowing up
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1045
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1046
        self.assertEqual(1, packs._max_pack_count(0))
1047
        # after that the sum of the digits, - check the first 1-9
1048
        self.assertEqual(1, packs._max_pack_count(1))
1049
        self.assertEqual(2, packs._max_pack_count(2))
1050
        self.assertEqual(3, packs._max_pack_count(3))
1051
        self.assertEqual(4, packs._max_pack_count(4))
1052
        self.assertEqual(5, packs._max_pack_count(5))
1053
        self.assertEqual(6, packs._max_pack_count(6))
1054
        self.assertEqual(7, packs._max_pack_count(7))
1055
        self.assertEqual(8, packs._max_pack_count(8))
1056
        self.assertEqual(9, packs._max_pack_count(9))
1057
        # check the boundary cases with two digits for the next decade
1058
        self.assertEqual(1, packs._max_pack_count(10))
1059
        self.assertEqual(2, packs._max_pack_count(11))
1060
        self.assertEqual(10, packs._max_pack_count(19))
1061
        self.assertEqual(2, packs._max_pack_count(20))
1062
        self.assertEqual(3, packs._max_pack_count(21))
1063
        # check some arbitrary big numbers
1064
        self.assertEqual(25, packs._max_pack_count(112894))
1065
1066
    def test_pack_distribution_zero(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1067
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1068
        self.assertEqual([0], packs.pack_distribution(0))
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1069
1070
    def test_ensure_loaded_unlocked(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1071
        packs = self.get_packs()
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1072
        self.assertRaises(errors.ObjectNotLocked,
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1073
                          packs.ensure_loaded)
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1074
2592.3.84 by Robert Collins
Start of autopacking logic.
1075
    def test_pack_distribution_one_to_nine(self):
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1076
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1077
        self.assertEqual([1],
1078
            packs.pack_distribution(1))
1079
        self.assertEqual([1, 1],
1080
            packs.pack_distribution(2))
1081
        self.assertEqual([1, 1, 1],
1082
            packs.pack_distribution(3))
1083
        self.assertEqual([1, 1, 1, 1],
1084
            packs.pack_distribution(4))
1085
        self.assertEqual([1, 1, 1, 1, 1],
1086
            packs.pack_distribution(5))
1087
        self.assertEqual([1, 1, 1, 1, 1, 1],
1088
            packs.pack_distribution(6))
1089
        self.assertEqual([1, 1, 1, 1, 1, 1, 1],
1090
            packs.pack_distribution(7))
1091
        self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1],
1092
            packs.pack_distribution(8))
1093
        self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1, 1],
1094
            packs.pack_distribution(9))
1095
1096
    def test_pack_distribution_stable_at_boundaries(self):
1097
        """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,
1098
        packs = self.get_packs()
2592.3.84 by Robert Collins
Start of autopacking logic.
1099
        # in 10s:
1100
        self.assertEqual([10], packs.pack_distribution(10))
1101
        self.assertEqual([10, 1], packs.pack_distribution(11))
1102
        self.assertEqual([10, 10], packs.pack_distribution(20))
1103
        self.assertEqual([10, 10, 1], packs.pack_distribution(21))
1104
        # 100s
1105
        self.assertEqual([100], packs.pack_distribution(100))
1106
        self.assertEqual([100, 1], packs.pack_distribution(101))
1107
        self.assertEqual([100, 10, 1], packs.pack_distribution(111))
1108
        self.assertEqual([100, 100], packs.pack_distribution(200))
1109
        self.assertEqual([100, 100, 1], packs.pack_distribution(201))
1110
        self.assertEqual([100, 100, 10, 1], packs.pack_distribution(211))
1111
2592.3.85 by Robert Collins
Finish autopack corner cases.
1112
    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,
1113
        packs = self.get_packs()
2592.3.85 by Robert Collins
Finish autopack corner cases.
1114
        existing_packs = [(2000, "big"), (9, "medium")]
1115
        # rev count - 2009 -> 2x1000 + 9x1
1116
        pack_operations = packs.plan_autopack_combinations(
1117
            existing_packs, [1000, 1000, 1, 1, 1, 1, 1, 1, 1, 1, 1])
1118
        self.assertEqual([], pack_operations)
1119
1120
    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,
1121
        packs = self.get_packs()
2592.3.85 by Robert Collins
Finish autopack corner cases.
1122
        existing_packs = [(2000, "big"), (9, "medium"), (1, "single")]
1123
        # rev count - 2010 -> 2x1000 + 1x10
1124
        pack_operations = packs.plan_autopack_combinations(
1125
            existing_packs, [1000, 1000, 10])
1126
        self.assertEqual([], pack_operations)
1127
1128
    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,
1129
        packs = self.get_packs()
2592.3.85 by Robert Collins
Finish autopack corner cases.
1130
        existing_packs = [(1999, "big"), (9, "medium"), (1, "single2"),
1131
            (1, "single1")]
1132
        # rev count - 2010 -> 2x1000 + 1x10 (3)
1133
        pack_operations = packs.plan_autopack_combinations(
1134
            existing_packs, [1000, 1000, 10])
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1135
        self.assertEqual([[2, ["single2", "single1"]]], pack_operations)
2592.3.85 by Robert Collins
Finish autopack corner cases.
1136
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1137
    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,
1138
        packs = self.get_packs()
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1139
        existing_packs = [(50, 'a'), (40, 'b'), (30, 'c'), (10, 'd'),
1140
                          (10, 'e'), (6, 'f'), (4, 'g')]
1141
        # rev count 150 -> 1x100 and 5x10
1142
        # The two size 10 packs do not need to be touched. The 50, 40, 30 would
1143
        # be combined into a single 120 size pack, and the 6 & 4 would
1144
        # becombined into a size 10 pack. However, if we have to rewrite them,
1145
        # we save a pack file with no increased I/O by putting them into the
1146
        # same file.
1147
        distribution = packs.pack_distribution(150)
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1148
        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.
1149
                                                           distribution)
1150
        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,
1151
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1152
    def test_all_packs_none(self):
1153
        format = self.get_format()
1154
        tree = self.make_branch_and_tree('.', format=format)
1155
        tree.lock_read()
1156
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1157
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1158
        packs.ensure_loaded()
1159
        self.assertEqual([], packs.all_packs())
1160
1161
    def test_all_packs_one(self):
1162
        format = self.get_format()
1163
        tree = self.make_branch_and_tree('.', format=format)
1164
        tree.commit('start')
1165
        tree.lock_read()
1166
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1167
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1168
        packs.ensure_loaded()
2592.3.176 by Robert Collins
Various pack refactorings.
1169
        self.assertEqual([
1170
            packs.get_pack_by_name(packs.names()[0])],
1171
            packs.all_packs())
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1172
1173
    def test_all_packs_two(self):
1174
        format = self.get_format()
1175
        tree = self.make_branch_and_tree('.', format=format)
1176
        tree.commit('start')
1177
        tree.commit('continue')
1178
        tree.lock_read()
1179
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1180
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1181
        packs.ensure_loaded()
1182
        self.assertEqual([
2592.3.176 by Robert Collins
Various pack refactorings.
1183
            packs.get_pack_by_name(packs.names()[0]),
1184
            packs.get_pack_by_name(packs.names()[1]),
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1185
            ], packs.all_packs())
1186
2592.3.176 by Robert Collins
Various pack refactorings.
1187
    def test_get_pack_by_name(self):
1188
        format = self.get_format()
1189
        tree = self.make_branch_and_tree('.', format=format)
1190
        tree.commit('start')
1191
        tree.lock_read()
1192
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1193
        packs = tree.branch.repository._pack_collection
4145.1.6 by Robert Collins
More test fallout, but all caught now.
1194
        packs.reset()
2592.3.176 by Robert Collins
Various pack refactorings.
1195
        packs.ensure_loaded()
1196
        name = packs.names()[0]
1197
        pack_1 = packs.get_pack_by_name(name)
1198
        # the pack should be correctly initialised
3517.4.5 by Martin Pool
Correct use of packs._names in test_get_pack_by_name
1199
        sizes = packs._names[name]
3221.12.4 by Robert Collins
Implement basic repository supporting external references.
1200
        rev_index = GraphIndex(packs._index_transport, name + '.rix', sizes[0])
1201
        inv_index = GraphIndex(packs._index_transport, name + '.iix', sizes[1])
1202
        txt_index = GraphIndex(packs._index_transport, name + '.tix', sizes[2])
1203
        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.
1204
        self.assertEqual(pack_repo.ExistingPack(packs._pack_transport,
2592.3.219 by Robert Collins
Review feedback.
1205
            name, rev_index, inv_index, txt_index, sig_index), pack_1)
2592.3.176 by Robert Collins
Various pack refactorings.
1206
        # and the same instance should be returned on successive calls.
1207
        self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1208
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1209
    def test_reload_pack_names_new_entry(self):
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1210
        tree, r, packs, revs = self.make_packs_and_alt_repo()
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1211
        names = packs.names()
1212
        # Add a new pack file into the repository
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1213
        rev4 = tree.commit('four')
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1214
        new_names = tree.branch.repository._pack_collection.names()
1215
        new_name = set(new_names).difference(names)
1216
        self.assertEqual(1, len(new_name))
1217
        new_name = new_name.pop()
1218
        # The old collection hasn't noticed yet
1219
        self.assertEqual(names, packs.names())
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1220
        self.assertTrue(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1221
        self.assertEqual(new_names, packs.names())
1222
        # And the repository can access the new revision
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1223
        self.assertEqual({rev4:(revs[-1],)}, r.get_parent_map([rev4]))
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1224
        self.assertFalse(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1225
1226
    def test_reload_pack_names_added_and_removed(self):
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1227
        tree, r, packs, revs = self.make_packs_and_alt_repo()
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1228
        names = packs.names()
1229
        # Now repack the whole thing
1230
        tree.branch.repository.pack()
1231
        new_names = tree.branch.repository._pack_collection.names()
1232
        # The other collection hasn't noticed yet
1233
        self.assertEqual(names, packs.names())
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1234
        self.assertTrue(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1235
        self.assertEqual(new_names, packs.names())
3789.2.19 by John Arbash Meinel
Refactor to make the tests a bit simpler
1236
        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().
1237
        self.assertFalse(packs.reload_pack_names())
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1238
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1239
    def test_autopack_reloads_and_stops(self):
1240
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1241
        # After we have determined what needs to be autopacked, trigger a
1242
        # full-pack via the other repo which will cause us to re-evaluate and
1243
        # decide we don't need to do anything
1244
        orig_execute = packs._execute_pack_operations
1245
        def _munged_execute_pack_ops(*args, **kwargs):
1246
            tree.branch.repository.pack()
1247
            return orig_execute(*args, **kwargs)
1248
        packs._execute_pack_operations = _munged_execute_pack_ops
1249
        packs._max_pack_count = lambda x: 1
1250
        packs.pack_distribution = lambda x: [10]
1251
        self.assertFalse(packs.autopack())
1252
        self.assertEqual(1, len(packs.names()))
1253
        self.assertEqual(tree.branch.repository._pack_collection.names(),
1254
                         packs.names())
1255
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1256
1257
class TestPack(TestCaseWithTransport):
1258
    """Tests for the Pack object."""
1259
1260
    def assertCurrentlyEqual(self, left, right):
1261
        self.assertTrue(left == right)
1262
        self.assertTrue(right == left)
1263
        self.assertFalse(left != right)
1264
        self.assertFalse(right != left)
1265
1266
    def assertCurrentlyNotEqual(self, left, right):
1267
        self.assertFalse(left == right)
1268
        self.assertFalse(right == left)
1269
        self.assertTrue(left != right)
1270
        self.assertTrue(right != left)
1271
1272
    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.
1273
        left = pack_repo.ExistingPack('', '', '', '', '', '')
1274
        right = pack_repo.ExistingPack('', '', '', '', '', '')
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1275
        self.assertCurrentlyEqual(left, right)
1276
        # change all attributes and ensure equality changes as we do.
1277
        left.revision_index = 'a'
1278
        self.assertCurrentlyNotEqual(left, right)
1279
        right.revision_index = 'a'
1280
        self.assertCurrentlyEqual(left, right)
1281
        left.inventory_index = 'a'
1282
        self.assertCurrentlyNotEqual(left, right)
1283
        right.inventory_index = 'a'
1284
        self.assertCurrentlyEqual(left, right)
1285
        left.text_index = 'a'
1286
        self.assertCurrentlyNotEqual(left, right)
1287
        right.text_index = 'a'
1288
        self.assertCurrentlyEqual(left, right)
1289
        left.signature_index = 'a'
1290
        self.assertCurrentlyNotEqual(left, right)
1291
        right.signature_index = 'a'
1292
        self.assertCurrentlyEqual(left, right)
1293
        left.name = 'a'
1294
        self.assertCurrentlyNotEqual(left, right)
1295
        right.name = 'a'
1296
        self.assertCurrentlyEqual(left, right)
1297
        left.transport = 'a'
1298
        self.assertCurrentlyNotEqual(left, right)
1299
        right.transport = 'a'
1300
        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.
1301
1302
    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.
1303
        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.
1304
        self.assertEqual('a_name.pack', pack.file_name())
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1305
1306
1307
class TestNewPack(TestCaseWithTransport):
1308
    """Tests for pack_repo.NewPack."""
1309
2592.3.193 by Robert Collins
Move hash tracking of new packs into NewPack.
1310
    def test_new_instance_attributes(self):
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1311
        upload_transport = self.get_transport('upload')
1312
        pack_transport = self.get_transport('pack')
1313
        index_transport = self.get_transport('index')
1314
        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)
1315
        collection = pack_repo.RepositoryPackCollection(
1316
            repo=None,
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
1317
            transport=self.get_transport('.'),
1318
            index_transport=index_transport,
1319
            upload_transport=upload_transport,
1320
            pack_transport=pack_transport,
1321
            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)
1322
            index_class=BTreeGraphIndex,
1323
            use_chk_index=False)
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
1324
        pack = pack_repo.NewPack(collection)
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1325
        self.assertIsInstance(pack.revision_index, BTreeBuilder)
1326
        self.assertIsInstance(pack.inventory_index, BTreeBuilder)
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
1327
        self.assertIsInstance(pack._hash, type(osutils.md5()))
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1328
        self.assertTrue(pack.upload_transport is upload_transport)
1329
        self.assertTrue(pack.index_transport is index_transport)
1330
        self.assertTrue(pack.pack_transport is pack_transport)
1331
        self.assertEqual(None, pack.index_sizes)
1332
        self.assertEqual(20, len(pack.random_name))
1333
        self.assertIsInstance(pack.random_name, str)
1334
        self.assertIsInstance(pack.start_time, float)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1335
1336
1337
class TestPacker(TestCaseWithTransport):
1338
    """Tests for the packs repository Packer class."""
2951.1.10 by Robert Collins
Peer review feedback with Ian.
1339
3824.2.4 by John Arbash Meinel
Add a test that ensures the pack ordering changes as part of calling .pack()
1340
    def test_pack_optimizes_pack_order(self):
1341
        builder = self.make_branch_builder('.')
1342
        builder.start_series()
1343
        builder.build_snapshot('A', None, [
1344
            ('add', ('', 'root-id', 'directory', None)),
1345
            ('add', ('f', 'f-id', 'file', 'content\n'))])
1346
        builder.build_snapshot('B', ['A'],
1347
            [('modify', ('f-id', 'new-content\n'))])
1348
        builder.build_snapshot('C', ['B'],
1349
            [('modify', ('f-id', 'third-content\n'))])
1350
        builder.build_snapshot('D', ['C'],
1351
            [('modify', ('f-id', 'fourth-content\n'))])
1352
        b = builder.get_branch()
1353
        b.lock_read()
1354
        builder.finish_series()
1355
        self.addCleanup(b.unlock)
1356
        # At this point, we should have 4 pack files available
1357
        # Because of how they were built, they correspond to
1358
        # ['D', 'C', 'B', 'A']
1359
        packs = b.repository._pack_collection.packs
1360
        packer = pack_repo.Packer(b.repository._pack_collection,
1361
                                  packs, 'testing',
1362
                                  revision_ids=['B', 'C'])
1363
        # Now, when we are copying the B & C revisions, their pack files should
1364
        # be moved to the front of the stack
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1365
        # The new ordering moves B & C to the front of the .packs attribute,
1366
        # 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()
1367
        new_packs = [packs[1], packs[2], packs[0], packs[3]]
1368
        new_pack = packer.pack()
1369
        self.assertEqual(new_packs, packer.packs)
3146.6.1 by Aaron Bentley
InterDifferingSerializer shows a progress bar
1370
1371
3777.5.4 by John Arbash Meinel
OptimisingPacker now sets the optimize flags for the indexes being built.
1372
class TestOptimisingPacker(TestCaseWithTransport):
1373
    """Tests for the OptimisingPacker class."""
1374
1375
    def get_pack_collection(self):
1376
        repo = self.make_repository('.')
1377
        return repo._pack_collection
1378
1379
    def test_open_pack_will_optimise(self):
1380
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
1381
                                            [], '.test')
1382
        new_pack = packer.open_pack()
1383
        self.assertIsInstance(new_pack, pack_repo.NewPack)
1384
        self.assertTrue(new_pack.revision_index._optimize_for_size)
1385
        self.assertTrue(new_pack.inventory_index._optimize_for_size)
1386
        self.assertTrue(new_pack.text_index._optimize_for_size)
1387
        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.
1388
1389
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1390
class TestCrossFormatPacks(TestCaseWithTransport):
1391
1392
    def log_pack(self, hint=None):
1393
        self.calls.append(('pack', hint))
1394
        self.orig_pack(hint=hint)
1395
        if self.expect_hint:
1396
            self.assertTrue(hint)
1397
1398
    def run_stream(self, src_fmt, target_fmt, expect_pack_called):
1399
        self.expect_hint = expect_pack_called
1400
        self.calls = []
1401
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
1402
        source_tree.lock_write()
1403
        self.addCleanup(source_tree.unlock)
1404
        tip = source_tree.commit('foo')
1405
        target = self.make_repository('target', format=target_fmt)
1406
        target.lock_write()
1407
        self.addCleanup(target.unlock)
1408
        source = source_tree.branch.repository._get_source(target._format)
1409
        self.orig_pack = target.pack
1410
        target.pack = self.log_pack
1411
        search = target.search_missing_revision_ids(
1412
            source_tree.branch.repository, tip)
1413
        stream = source.get_stream(search)
1414
        from_format = source_tree.branch.repository._format
1415
        sink = target._get_sink()
1416
        sink.insert_stream(stream, from_format, [])
1417
        if expect_pack_called:
1418
            self.assertLength(1, self.calls)
1419
        else:
1420
            self.assertLength(0, self.calls)
1421
1422
    def run_fetch(self, src_fmt, target_fmt, expect_pack_called):
1423
        self.expect_hint = expect_pack_called
1424
        self.calls = []
1425
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
1426
        source_tree.lock_write()
1427
        self.addCleanup(source_tree.unlock)
1428
        tip = source_tree.commit('foo')
1429
        target = self.make_repository('target', format=target_fmt)
1430
        target.lock_write()
1431
        self.addCleanup(target.unlock)
1432
        source = source_tree.branch.repository
1433
        self.orig_pack = target.pack
1434
        target.pack = self.log_pack
1435
        target.fetch(source)
1436
        if expect_pack_called:
1437
            self.assertLength(1, self.calls)
1438
        else:
1439
            self.assertLength(0, self.calls)
1440
1441
    def test_sink_format_hint_no(self):
1442
        # When the target format says packing makes no difference, pack is not
1443
        # called.
1444
        self.run_stream('1.9', 'rich-root-pack', False)
1445
1446
    def test_sink_format_hint_yes(self):
1447
        # When the target format says packing makes a difference, pack is
1448
        # called.
1449
        self.run_stream('1.9', '2a', True)
1450
1451
    def test_sink_format_same_no(self):
1452
        # When the formats are the same, pack is not called.
1453
        self.run_stream('2a', '2a', False)
1454
1455
    def test_IDS_format_hint_no(self):
1456
        # When the target format says packing makes no difference, pack is not
1457
        # called.
1458
        self.run_fetch('1.9', 'rich-root-pack', False)
1459
1460
    def test_IDS_format_hint_yes(self):
1461
        # When the target format says packing makes a difference, pack is
1462
        # called.
1463
        self.run_fetch('1.9', '2a', True)
1464
1465
    def test_IDS_format_same_no(self):
1466
        # When the formats are the same, pack is not called.
1467
        self.run_fetch('2a', '2a', False)