/brz/remove-bazaar

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