/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2220.2.2 by Martin Pool
Add tag command and basic implementation
1
# Copyright (C) 2006, 2007 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests for the Repository facility that are not interface tests.
18
19
For interface tests see tests/repository_implementations/*.py.
20
21
For concrete class tests see this file, and for storage formats tests
22
also see this file.
23
"""
24
2592.3.193 by Robert Collins
Move hash tracking of new packs into NewPack.
25
import md5
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
26
from stat import S_ISDIR
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
27
from StringIO import StringIO
28
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
29
import bzrlib
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
30
from bzrlib.errors import (NotBranchError,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
31
                           NoSuchFile,
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
32
                           UnknownFormatError,
33
                           UnsupportedFormatError,
34
                           )
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
35
from bzrlib.index import GraphIndex, InMemoryGraphIndex
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
36
from bzrlib.repository import RepositoryFormat
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
37
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.
38
from bzrlib.tests import (
39
    TestCase,
40
    TestCaseWithTransport,
41
    test_knit,
42
    )
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
43
from bzrlib.transport import get_transport
44
from bzrlib.transport.memory import MemoryServer
2535.3.53 by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead.
45
from bzrlib.util import bencode
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
46
from bzrlib import (
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
47
    bzrdir,
48
    errors,
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
49
    inventory,
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
50
    repository,
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
51
    revision as _mod_revision,
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
52
    symbol_versioning,
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
53
    upgrade,
54
    workingtree,
55
    )
2592.3.173 by Robert Collins
Basic implementation of all_packs.
56
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
57
58
59
class TestDefaultFormat(TestCase):
60
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
61
    def test_get_set_default_format(self):
2204.5.3 by Aaron Bentley
zap old repository default handling
62
        old_default = bzrdir.format_registry.get('default')
63
        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.
64
        old_format = repository.RepositoryFormat.get_default_format()
1910.2.33 by Aaron Bentley
Fix default format test
65
        self.assertTrue(isinstance(old_format, private_default))
2204.5.3 by Aaron Bentley
zap old repository default handling
66
        def make_sample_bzrdir():
67
            my_bzrdir = bzrdir.BzrDirMetaFormat1()
68
            my_bzrdir.repository_format = SampleRepositoryFormat()
69
            return my_bzrdir
70
        bzrdir.format_registry.remove('default')
71
        bzrdir.format_registry.register('sample', make_sample_bzrdir, '')
72
        bzrdir.format_registry.set_default('sample')
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
73
        # creating a repository should now create an instrumented dir.
74
        try:
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
75
            # the default branch format is used by the meta dir format
76
            # which is not the default bzrdir format at this point
1685.1.63 by Martin Pool
Small Transport fixups
77
            dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
78
            result = dir.create_repository()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
79
            self.assertEqual(result, 'A bzr repository dir')
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
80
        finally:
2204.5.3 by Aaron Bentley
zap old repository default handling
81
            bzrdir.format_registry.remove('default')
2363.5.14 by Aaron Bentley
Prevent repository.get_set_default_format from corrupting inventory
82
            bzrdir.format_registry.remove('sample')
2204.5.3 by Aaron Bentley
zap old repository default handling
83
            bzrdir.format_registry.register('default', old_default, '')
84
        self.assertIsInstance(repository.RepositoryFormat.get_default_format(),
85
                              old_format.__class__)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
86
87
88
class SampleRepositoryFormat(repository.RepositoryFormat):
89
    """A sample format
90
91
    this format is initializable, unsupported to aid in testing the 
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
92
    open and open(unsupported=True) routines.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
93
    """
94
95
    def get_format_string(self):
96
        """See RepositoryFormat.get_format_string()."""
97
        return "Sample .bzr repository format."
98
1534.6.1 by Robert Collins
allow API creation of shared repositories
99
    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.
100
        """Initialize a repository in a BzrDir"""
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
101
        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.
102
        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.
103
        return 'A bzr repository dir'
104
105
    def is_supported(self):
106
        return False
107
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
108
    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.
109
        return "opened repository."
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
110
111
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
112
class TestRepositoryFormat(TestCaseWithTransport):
113
    """Tests for the Repository format detection used by the bzr meta dir facility.BzrBranchFormat facility."""
114
115
    def test_find_format(self):
116
        # is the right format object found for a repository?
117
        # create a branch with a few known format objects.
118
        # this is not quite the same as 
119
        self.build_tree(["foo/", "bar/"])
120
        def check_format(format, url):
121
            dir = format._matchingbzrdir.initialize(url)
122
            format.initialize(dir)
123
            t = get_transport(url)
124
            found_format = repository.RepositoryFormat.find_format(dir)
125
            self.failUnless(isinstance(found_format, format.__class__))
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
126
        check_format(weaverepo.RepositoryFormat7(), "bar")
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
127
        
128
    def test_find_format_no_repository(self):
129
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
130
        self.assertRaises(errors.NoRepositoryPresent,
131
                          repository.RepositoryFormat.find_format,
132
                          dir)
133
134
    def test_find_format_unknown_format(self):
135
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
136
        SampleRepositoryFormat().initialize(dir)
137
        self.assertRaises(UnknownFormatError,
138
                          repository.RepositoryFormat.find_format,
139
                          dir)
140
141
    def test_register_unregister_format(self):
142
        format = SampleRepositoryFormat()
143
        # make a control dir
144
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
145
        # make a repo
146
        format.initialize(dir)
147
        # register a format for it.
148
        repository.RepositoryFormat.register_format(format)
149
        # which repository.Open will refuse (not supported)
150
        self.assertRaises(UnsupportedFormatError, repository.Repository.open, self.get_url())
151
        # but open(unsupported) will work
152
        self.assertEqual(format.open(dir), "opened repository.")
153
        # unregister the format
154
        repository.RepositoryFormat.unregister_format(format)
155
156
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
157
class TestFormat6(TestCaseWithTransport):
158
159
    def test_no_ancestry_weave(self):
160
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
161
        repo = weaverepo.RepositoryFormat6().initialize(control)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
162
        # We no longer need to create the ancestry.weave file
163
        # since it is *never* used.
164
        self.assertRaises(NoSuchFile,
165
                          control.transport.get,
166
                          'ancestry.weave')
167
2818.4.2 by Robert Collins
Review feedback.
168
    def test_exposed_versioned_files_are_marked_dirty(self):
169
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
170
        repo = weaverepo.RepositoryFormat6().initialize(control)
171
        repo.lock_write()
172
        inv = repo.get_inventory_weave()
173
        repo.unlock()
174
        self.assertRaises(errors.OutSideTransaction,
175
            inv.add_lines, 'foo', [], [])
176
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
177
178
class TestFormat7(TestCaseWithTransport):
179
    
180
    def test_disk_layout(self):
181
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
182
        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.
183
        # in case of side effects of locking.
184
        repo.lock_write()
185
        repo.unlock()
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
186
        # we want:
187
        # format 'Bazaar-NG Repository format 7'
188
        # lock ''
189
        # inventory.weave == empty_weave
190
        # empty revision-store directory
191
        # empty weaves directory
192
        t = control.get_repository_transport(None)
193
        self.assertEqualDiff('Bazaar-NG Repository format 7',
194
                             t.get('format').read())
195
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
196
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
197
        self.assertEqualDiff('# bzr weave file v5\n'
198
                             'w\n'
199
                             'W\n',
200
                             t.get('inventory.weave').read())
1534.6.1 by Robert Collins
allow API creation of shared repositories
201
202
    def test_shared_disk_layout(self):
203
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
204
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
1534.6.1 by Robert Collins
allow API creation of shared repositories
205
        # we want:
206
        # format 'Bazaar-NG Repository format 7'
207
        # inventory.weave == empty_weave
208
        # empty revision-store directory
209
        # empty weaves directory
210
        # a 'shared-storage' marker file.
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
211
        # lock is not present when unlocked
1534.6.1 by Robert Collins
allow API creation of shared repositories
212
        t = control.get_repository_transport(None)
213
        self.assertEqualDiff('Bazaar-NG Repository format 7',
214
                             t.get('format').read())
215
        self.assertEqualDiff('', t.get('shared-storage').read())
216
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
217
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
218
        self.assertEqualDiff('# bzr weave file v5\n'
219
                             'w\n'
220
                             'W\n',
221
                             t.get('inventory.weave').read())
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
222
        self.assertFalse(t.has('branch-lock'))
223
1553.5.56 by Martin Pool
Format 7 repo now uses LockDir!
224
    def test_creates_lockdir(self):
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
225
        """Make sure it appears to be controlled by a LockDir existence"""
226
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
227
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
228
        t = control.get_repository_transport(None)
1553.5.58 by Martin Pool
Change LockDirs to format "lock-name/held/info"
229
        # TODO: Should check there is a 'lock' toplevel directory, 
230
        # regardless of contents
231
        self.assertFalse(t.has('lock/held/info'))
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
232
        repo.lock_write()
1658.1.4 by Martin Pool
Quieten warning from TestFormat7.test_creates_lockdir about failing to unlock
233
        try:
234
            self.assertTrue(t.has('lock/held/info'))
235
        finally:
236
            # unlock so we don't get a warning about failing to do so
237
            repo.unlock()
1553.5.56 by Martin Pool
Format 7 repo now uses LockDir!
238
239
    def test_uses_lockdir(self):
240
        """repo format 7 actually locks on lockdir"""
241
        base_url = self.get_url()
242
        control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
243
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
1553.5.56 by Martin Pool
Format 7 repo now uses LockDir!
244
        t = control.get_repository_transport(None)
245
        repo.lock_write()
246
        repo.unlock()
247
        del repo
248
        # make sure the same lock is created by opening it
249
        repo = repository.Repository.open(base_url)
250
        repo.lock_write()
1553.5.58 by Martin Pool
Change LockDirs to format "lock-name/held/info"
251
        self.assertTrue(t.has('lock/held/info'))
1553.5.56 by Martin Pool
Format 7 repo now uses LockDir!
252
        repo.unlock()
1553.5.58 by Martin Pool
Change LockDirs to format "lock-name/held/info"
253
        self.assertFalse(t.has('lock/held/info'))
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
254
255
    def test_shared_no_tree_disk_layout(self):
256
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
257
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
258
        repo.set_make_working_trees(False)
259
        # we want:
260
        # format 'Bazaar-NG Repository format 7'
261
        # lock ''
262
        # inventory.weave == empty_weave
263
        # empty revision-store directory
264
        # empty weaves directory
265
        # a 'shared-storage' marker file.
266
        t = control.get_repository_transport(None)
267
        self.assertEqualDiff('Bazaar-NG Repository format 7',
268
                             t.get('format').read())
1553.5.56 by Martin Pool
Format 7 repo now uses LockDir!
269
        ## self.assertEqualDiff('', t.get('lock').read())
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
270
        self.assertEqualDiff('', t.get('shared-storage').read())
271
        self.assertEqualDiff('', t.get('no-working-trees').read())
272
        repo.set_make_working_trees(True)
273
        self.assertFalse(t.has('no-working-trees'))
274
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
275
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
276
        self.assertEqualDiff('# bzr weave file v5\n'
277
                             'w\n'
278
                             'W\n',
279
                             t.get('inventory.weave').read())
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
280
2818.4.2 by Robert Collins
Review feedback.
281
    def test_exposed_versioned_files_are_marked_dirty(self):
282
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
283
        repo = weaverepo.RepositoryFormat7().initialize(control)
284
        repo.lock_write()
285
        inv = repo.get_inventory_weave()
286
        repo.unlock()
287
        self.assertRaises(errors.OutSideTransaction,
288
            inv.add_lines, 'foo', [], [])
289
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
290
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
291
class TestFormatKnit1(TestCaseWithTransport):
292
    
293
    def test_disk_layout(self):
294
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
295
        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
296
        # in case of side effects of locking.
297
        repo.lock_write()
298
        repo.unlock()
299
        # we want:
300
        # format 'Bazaar-NG Knit Repository Format 1'
1553.5.62 by Martin Pool
Add tests that MetaDir repositories use LockDirs
301
        # 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
302
        # inventory.weave == empty_weave
303
        # empty revision-store directory
304
        # empty weaves directory
305
        t = control.get_repository_transport(None)
306
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
307
                             t.get('format').read())
1553.5.57 by Martin Pool
[merge] sync from bzr.dev
308
        # XXX: no locks left when unlocked at the moment
309
        # 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
310
        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.
311
        self.check_knits(t)
312
1654.1.3 by Robert Collins
Refactor repository knit tests slightly to remove duplication - add a assertHasKnit method.
313
    def assertHasKnit(self, t, knit_name):
314
        """Assert that knit_name exists on t."""
1666.1.7 by Robert Collins
Update repository format check to read knit correct header
315
        self.assertEqualDiff('# bzr knit index 8\n',
1654.1.3 by Robert Collins
Refactor repository knit tests slightly to remove duplication - add a assertHasKnit method.
316
                             t.get(knit_name + '.kndx').read())
317
        # no default content
318
        self.assertTrue(t.has(knit_name + '.knit'))
319
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
320
    def check_knits(self, t):
321
        """check knit content for a repository."""
1654.1.3 by Robert Collins
Refactor repository knit tests slightly to remove duplication - add a assertHasKnit method.
322
        self.assertHasKnit(t, 'inventory')
323
        self.assertHasKnit(t, 'revisions')
324
        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
325
326
    def test_shared_disk_layout(self):
327
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
328
        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
329
        # we want:
330
        # format 'Bazaar-NG Knit Repository Format 1'
1553.5.62 by Martin Pool
Add tests that MetaDir repositories use LockDirs
331
        # 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
332
        # inventory.weave == empty_weave
333
        # empty revision-store directory
334
        # empty weaves directory
335
        # a 'shared-storage' marker file.
336
        t = control.get_repository_transport(None)
337
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
338
                             t.get('format').read())
1553.5.57 by Martin Pool
[merge] sync from bzr.dev
339
        # XXX: no locks left when unlocked at the moment
340
        # 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
341
        self.assertEqualDiff('', t.get('shared-storage').read())
342
        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.
343
        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
344
345
    def test_shared_no_tree_disk_layout(self):
346
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
347
        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
348
        repo.set_make_working_trees(False)
349
        # we want:
350
        # format 'Bazaar-NG Knit Repository Format 1'
351
        # lock ''
352
        # inventory.weave == empty_weave
353
        # empty revision-store directory
354
        # empty weaves directory
355
        # a 'shared-storage' marker file.
356
        t = control.get_repository_transport(None)
357
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
358
                             t.get('format').read())
1553.5.57 by Martin Pool
[merge] sync from bzr.dev
359
        # XXX: no locks left when unlocked at the moment
360
        # 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
361
        self.assertEqualDiff('', t.get('shared-storage').read())
362
        self.assertEqualDiff('', t.get('no-working-trees').read())
363
        repo.set_make_working_trees(True)
364
        self.assertFalse(t.has('no-working-trees'))
365
        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.
366
        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
367
2818.4.2 by Robert Collins
Review feedback.
368
    def test_exposed_versioned_files_are_marked_dirty(self):
369
        format = bzrdir.BzrDirMetaFormat1()
370
        format.repository_format = knitrepo.RepositoryFormatKnit1()
371
        repo = self.make_repository('.', format=format)
372
        repo.lock_write()
373
        inv = repo.get_inventory_weave()
374
        repo.unlock()
375
        self.assertRaises(errors.OutSideTransaction,
376
            inv.add_lines, 'foo', [], [])
377
2917.2.1 by John Arbash Meinel
Fix bug #152360. The xml5 serializer should be using
378
    def test_deserialise_sets_root_revision(self):
379
        """We must have a inventory.root.revision
380
381
        Old versions of the XML5 serializer did not set the revision_id for
382
        the whole inventory. So we grab the one from the expected text. Which
383
        is valid when the api is not being abused.
384
        """
385
        repo = self.make_repository('.',
386
                format=bzrdir.format_registry.get('knit')())
387
        inv_xml = '<inventory format="5">\n</inventory>\n'
388
        inv = repo.deserialise_inventory('test-rev-id', inv_xml)
389
        self.assertEqual('test-rev-id', inv.root.revision)
390
391
    def test_deserialise_uses_global_revision_id(self):
392
        """If it is set, then we re-use the global revision id"""
393
        repo = self.make_repository('.',
394
                format=bzrdir.format_registry.get('knit')())
395
        inv_xml = ('<inventory format="5" revision_id="other-rev-id">\n'
396
                   '</inventory>\n')
397
        # Arguably, the deserialise_inventory should detect a mismatch, and
398
        # raise an error, rather than silently using one revision_id over the
399
        # other.
400
        inv = repo.deserialise_inventory('test-rev-id', inv_xml)
401
        self.assertEqual('other-rev-id', inv.root.revision)
402
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
403
2535.3.53 by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead.
404
class KnitRepositoryStreamTests(test_knit.KnitTests):
405
    """Tests for knitrepo._get_stream_as_bytes."""
406
407
    def test_get_stream_as_bytes(self):
408
        # Make a simple knit
409
        k1 = self.make_test_knit()
410
        k1.add_lines('text-a', [], test_knit.split_lines(test_knit.TEXT_1))
411
        
412
        # Serialise it, check the output.
413
        bytes = knitrepo._get_stream_as_bytes(k1, ['text-a'])
414
        data = bencode.bdecode(bytes)
415
        format, record = data
416
        self.assertEqual('knit-plain', format)
417
        self.assertEqual(['text-a', ['fulltext'], []], record[:3])
418
        self.assertRecordContentEqual(k1, 'text-a', record[3])
419
420
    def test_get_stream_as_bytes_all(self):
421
        """Get a serialised data stream for all the records in a knit.
422
423
        Much like test_get_stream_all, except for get_stream_as_bytes.
424
        """
425
        k1 = self.make_test_knit()
426
        # Insert the same data as BasicKnitTests.test_knit_join, as they seem
427
        # to cover a range of cases (no parents, one parent, multiple parents).
428
        test_data = [
429
            ('text-a', [], test_knit.TEXT_1),
430
            ('text-b', ['text-a'], test_knit.TEXT_1),
431
            ('text-c', [], test_knit.TEXT_1),
432
            ('text-d', ['text-c'], test_knit.TEXT_1),
433
            ('text-m', ['text-b', 'text-d'], test_knit.TEXT_1),
434
           ]
435
        expected_data_list = [
436
            # version, options, parents
437
            ('text-a', ['fulltext'], []),
438
            ('text-b', ['line-delta'], ['text-a']),
439
            ('text-c', ['fulltext'], []),
440
            ('text-d', ['line-delta'], ['text-c']),
441
            ('text-m', ['line-delta'], ['text-b', 'text-d']),
442
            ]
443
        for version_id, parents, lines in test_data:
444
            k1.add_lines(version_id, parents, test_knit.split_lines(lines))
445
446
        bytes = knitrepo._get_stream_as_bytes(
447
            k1, ['text-a', 'text-b', 'text-c', 'text-d', 'text-m'])
448
449
        data = bencode.bdecode(bytes)
450
        format = data.pop(0)
451
        self.assertEqual('knit-plain', format)
452
453
        for expected, actual in zip(expected_data_list, data):
454
            expected_version = expected[0]
455
            expected_options = expected[1]
456
            expected_parents = expected[2]
457
            version, options, parents, bytes = actual
458
            self.assertEqual(expected_version, version)
459
            self.assertEqual(expected_options, options)
460
            self.assertEqual(expected_parents, parents)
461
            self.assertRecordContentEqual(k1, version, bytes)
462
463
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
464
class DummyRepository(object):
465
    """A dummy repository for testing."""
466
467
    _serializer = None
468
469
    def supports_rich_root(self):
470
        return False
471
472
473
class InterDummy(repository.InterRepository):
474
    """An inter-repository optimised code path for DummyRepository.
475
476
    This is for use during testing where we use DummyRepository as repositories
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
477
    so that none of the default regsitered inter-repository classes will
2818.4.2 by Robert Collins
Review feedback.
478
    MATCH.
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
479
    """
480
481
    @staticmethod
482
    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.
483
        """InterDummy is compatible with DummyRepository."""
484
        return (isinstance(repo_source, DummyRepository) and 
485
            isinstance(repo_target, DummyRepository))
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
486
487
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
488
class TestInterRepository(TestCaseWithTransport):
489
490
    def test_get_default_inter_repository(self):
491
        # test that the InterRepository.get(repo_a, repo_b) probes
492
        # for a inter_repo class where is_compatible(repo_a, repo_b) returns
493
        # true and returns a default inter_repo otherwise.
494
        # This also tests that the default registered optimised interrepository
495
        # classes do not barf inappropriately when a surprising repository type
496
        # 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.
497
        dummy_a = DummyRepository()
498
        dummy_b = DummyRepository()
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
499
        self.assertGetsDefaultInterRepository(dummy_a, dummy_b)
500
501
    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.
502
        """Asserts that InterRepository.get(repo_a, repo_b) -> the default.
503
        
504
        The effective default is now InterSameDataRepository because there is
505
        no actual sane default in the presence of incompatible data models.
506
        """
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
507
        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.
508
        self.assertEqual(repository.InterSameDataRepository,
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
509
                         inter_repo.__class__)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
510
        self.assertEqual(repo_a, inter_repo.source)
511
        self.assertEqual(repo_b, inter_repo.target)
512
513
    def test_register_inter_repository_class(self):
514
        # test that a optimised code path provider - a
515
        # InterRepository subclass can be registered and unregistered
516
        # and that it is correctly selected when given a repository
517
        # pair that it returns true on for the is_compatible static method
518
        # check
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
519
        dummy_a = DummyRepository()
520
        dummy_b = DummyRepository()
521
        repo = self.make_repository('.')
522
        # hack dummies to look like repo somewhat.
523
        dummy_a._serializer = repo._serializer
524
        dummy_b._serializer = repo._serializer
525
        repository.InterRepository.register_optimiser(InterDummy)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
526
        try:
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
527
            # we should get the default for something InterDummy returns False
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
528
            # to
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
529
            self.assertFalse(InterDummy.is_compatible(dummy_a, repo))
530
            self.assertGetsDefaultInterRepository(dummy_a, repo)
531
            # and we should get an InterDummy for a pair it 'likes'
532
            self.assertTrue(InterDummy.is_compatible(dummy_a, dummy_b))
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
533
            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.
534
            self.assertEqual(InterDummy, inter_repo.__class__)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
535
            self.assertEqual(dummy_a, inter_repo.source)
536
            self.assertEqual(dummy_b, inter_repo.target)
537
        finally:
2305.2.3 by Andrew Bennetts
Bring across test_repository improvements from the hpss branch to fix the last test failures.
538
            repository.InterRepository.unregister_optimiser(InterDummy)
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
539
        # now we should get the default InterRepository object again.
540
        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.
541
2241.1.17 by Martin Pool
Restore old InterWeave tests
542
543
class TestInterWeaveRepo(TestCaseWithTransport):
544
545
    def test_is_compatible_and_registered(self):
546
        # InterWeaveRepo is compatible when either side
547
        # is a format 5/6/7 branch
2241.1.20 by mbp at sourcefrog
update tests for new locations of weave repos
548
        from bzrlib.repofmt import knitrepo, weaverepo
549
        formats = [weaverepo.RepositoryFormat5(),
550
                   weaverepo.RepositoryFormat6(),
551
                   weaverepo.RepositoryFormat7()]
552
        incompatible_formats = [weaverepo.RepositoryFormat4(),
553
                                knitrepo.RepositoryFormatKnit1(),
2241.1.17 by Martin Pool
Restore old InterWeave tests
554
                                ]
555
        repo_a = self.make_repository('a')
556
        repo_b = self.make_repository('b')
557
        is_compatible = repository.InterWeaveRepo.is_compatible
558
        for source in incompatible_formats:
559
            # force incompatible left then right
560
            repo_a._format = source
561
            repo_b._format = formats[0]
562
            self.assertFalse(is_compatible(repo_a, repo_b))
563
            self.assertFalse(is_compatible(repo_b, repo_a))
564
        for source in formats:
565
            repo_a._format = source
566
            for target in formats:
567
                repo_b._format = target
568
                self.assertTrue(is_compatible(repo_a, repo_b))
569
        self.assertEqual(repository.InterWeaveRepo,
570
                         repository.InterRepository.get(repo_a,
571
                                                        repo_b).__class__)
572
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.
573
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
574
class TestInterRemoteToOther(TestCaseWithTransport):
575
576
    def make_remote_repository(self, path, backing_format=None):
577
        """Make a RemoteRepository object backed by a real repository that will
578
        be created at the given path."""
579
        self.make_repository(path, format=backing_format)
580
        smart_server = server.SmartTCPServer_for_testing()
581
        smart_server.setUp()
582
        remote_transport = get_transport(smart_server.get_url()).clone(path)
583
        self.addCleanup(smart_server.tearDown)
584
        remote_bzrdir = bzrdir.BzrDir.open_from_transport(remote_transport)
585
        remote_repo = remote_bzrdir.open_repository()
586
        return remote_repo
587
588
    def test_is_compatible_same_format(self):
589
        """InterRemoteToOther is compatible with a remote repository and a
590
        second repository that have the same format."""
591
        local_repo = self.make_repository('local')
592
        remote_repo = self.make_remote_repository('remote')
2535.3.62 by Andrew Bennetts
Cosmetic changes.
593
        is_compatible = repository.InterRemoteToOther.is_compatible
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
594
        self.assertTrue(
2535.3.62 by Andrew Bennetts
Cosmetic changes.
595
            is_compatible(remote_repo, local_repo),
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
596
            "InterRemoteToOther(%r, %r) is false" % (remote_repo, local_repo))
597
          
598
    def test_is_incompatible_different_format(self):
599
        local_repo = self.make_repository('local', 'dirstate')
600
        remote_repo = self.make_remote_repository('a', 'dirstate-with-subtree')
2535.3.62 by Andrew Bennetts
Cosmetic changes.
601
        is_compatible = repository.InterRemoteToOther.is_compatible
2535.3.65 by Andrew Bennetts
Correct test failure caused by typo.
602
        self.assertFalse(
2535.3.62 by Andrew Bennetts
Cosmetic changes.
603
            is_compatible(remote_repo, local_repo),
2535.3.65 by Andrew Bennetts
Correct test failure caused by typo.
604
            "InterRemoteToOther(%r, %r) is true" % (local_repo, remote_repo))
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
605
606
    def test_is_incompatible_different_format_both_remote(self):
2535.3.66 by Andrew Bennetts
Tidy a couple more long lines.
607
        remote_repo_a = self.make_remote_repository(
608
            'a', 'dirstate-with-subtree')
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
609
        remote_repo_b = self.make_remote_repository('b', 'dirstate')
2535.3.62 by Andrew Bennetts
Cosmetic changes.
610
        is_compatible = repository.InterRemoteToOther.is_compatible
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
611
        self.assertFalse(
2535.3.62 by Andrew Bennetts
Cosmetic changes.
612
            is_compatible(remote_repo_a, remote_repo_b),
2535.3.66 by Andrew Bennetts
Tidy a couple more long lines.
613
            "InterRemoteToOther(%r, %r) is true"
614
            % (remote_repo_a, remote_repo_b))
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
615
616
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.
617
class TestRepositoryConverter(TestCaseWithTransport):
618
619
    def test_convert_empty(self):
620
        t = get_transport(self.get_url('.'))
621
        t.mkdir('repository')
622
        repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
623
        repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
624
        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.
625
        converter = repository.CopyConverter(target_format)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
626
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
627
        try:
628
            converter.convert(repo, pb)
629
        finally:
630
            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.
631
        repo = repo_dir.open_repository()
632
        self.assertTrue(isinstance(target_format, repo._format.__class__))
1843.2.5 by Aaron Bentley
Add test of _unescape_xml
633
634
635
class TestMisc(TestCase):
636
    
637
    def test_unescape_xml(self):
638
        """We get some kind of error when malformed entities are passed"""
639
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;') 
1910.2.13 by Aaron Bentley
Start work on converter
640
641
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
642
class TestRepositoryFormatKnit3(TestCaseWithTransport):
1910.2.13 by Aaron Bentley
Start work on converter
643
644
    def test_convert(self):
645
        """Ensure the upgrade adds weaves for roots"""
1910.2.35 by Aaron Bentley
Better fix for convesion test
646
        format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
647
        format.repository_format = knitrepo.RepositoryFormatKnit1()
1910.2.35 by Aaron Bentley
Better fix for convesion test
648
        tree = self.make_branch_and_tree('.', format)
1910.2.13 by Aaron Bentley
Start work on converter
649
        tree.commit("Dull commit", rev_id="dull")
650
        revision_tree = tree.branch.repository.revision_tree('dull')
651
        self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
652
            revision_tree.inventory.root.file_id)
653
        format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
654
        format.repository_format = knitrepo.RepositoryFormatKnit3()
1910.2.13 by Aaron Bentley
Start work on converter
655
        upgrade.Convert('.', format)
1910.2.27 by Aaron Bentley
Fixed conversion test
656
        tree = workingtree.WorkingTree.open('.')
1910.2.13 by Aaron Bentley
Start work on converter
657
        revision_tree = tree.branch.repository.revision_tree('dull')
658
        revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
1910.2.27 by Aaron Bentley
Fixed conversion test
659
        tree.commit("Another dull commit", rev_id='dull2')
660
        revision_tree = tree.branch.repository.revision_tree('dull2')
661
        self.assertEqual('dull', revision_tree.inventory.root.revision)
2220.2.2 by Martin Pool
Add tag command and basic implementation
662
2818.4.2 by Robert Collins
Review feedback.
663
    def test_exposed_versioned_files_are_marked_dirty(self):
664
        format = bzrdir.BzrDirMetaFormat1()
665
        format.repository_format = knitrepo.RepositoryFormatKnit3()
666
        repo = self.make_repository('.', format=format)
667
        repo.lock_write()
668
        inv = repo.get_inventory_weave()
669
        repo.unlock()
670
        self.assertRaises(errors.OutSideTransaction,
671
            inv.add_lines, 'foo', [], [])
2535.3.70 by Andrew Bennetts
Merge from bzr.dev.
672
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
673
674
class TestWithBrokenRepo(TestCaseWithTransport):
2592.3.214 by Robert Collins
Merge bzr.dev.
675
    """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.
676
677
    def make_broken_repository(self):
678
        # XXX: This function is borrowed from Aaron's "Reconcile can fix bad
679
        # parent references" branch which is due to land in bzr.dev soon.  Once
680
        # it does, this duplication should be removed.
681
        repo = self.make_repository('broken-repo')
682
        cleanups = []
683
        try:
684
            repo.lock_write()
685
            cleanups.append(repo.unlock)
686
            repo.start_write_group()
687
            cleanups.append(repo.commit_write_group)
688
            # make rev1a: A well-formed revision, containing 'file1'
689
            inv = inventory.Inventory(revision_id='rev1a')
690
            inv.root.revision = 'rev1a'
691
            self.add_file(repo, inv, 'file1', 'rev1a', [])
692
            repo.add_inventory('rev1a', inv, [])
693
            revision = _mod_revision.Revision('rev1a',
694
                committer='jrandom@example.com', timestamp=0,
695
                inventory_sha1='', timezone=0, message='foo', parent_ids=[])
696
            repo.add_revision('rev1a',revision, inv)
697
698
            # make rev1b, which has no Revision, but has an Inventory, and
699
            # file1
700
            inv = inventory.Inventory(revision_id='rev1b')
701
            inv.root.revision = 'rev1b'
702
            self.add_file(repo, inv, 'file1', 'rev1b', [])
703
            repo.add_inventory('rev1b', inv, [])
704
705
            # make rev2, with file1 and file2
706
            # file2 is sane
707
            # file1 has 'rev1b' as an ancestor, even though this is not
708
            # mentioned by 'rev1a', making it an unreferenced ancestor
709
            inv = inventory.Inventory()
710
            self.add_file(repo, inv, 'file1', 'rev2', ['rev1a', 'rev1b'])
711
            self.add_file(repo, inv, 'file2', 'rev2', [])
712
            self.add_revision(repo, 'rev2', inv, ['rev1a'])
713
714
            # make ghost revision rev1c
715
            inv = inventory.Inventory()
716
            self.add_file(repo, inv, 'file2', 'rev1c', [])
717
718
            # make rev3 with file2
719
            # file2 refers to 'rev1c', which is a ghost in this repository, so
720
            # file2 cannot have rev1c as its ancestor.
721
            inv = inventory.Inventory()
722
            self.add_file(repo, inv, 'file2', 'rev3', ['rev1c'])
723
            self.add_revision(repo, 'rev3', inv, ['rev1c'])
724
            return repo
725
        finally:
726
            for cleanup in reversed(cleanups):
727
                cleanup()
728
729
    def add_revision(self, repo, revision_id, inv, parent_ids):
730
        inv.revision_id = revision_id
731
        inv.root.revision = revision_id
732
        repo.add_inventory(revision_id, inv, parent_ids)
733
        revision = _mod_revision.Revision(revision_id,
734
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
735
            timezone=0, message='foo', parent_ids=parent_ids)
736
        repo.add_revision(revision_id,revision, inv)
737
738
    def add_file(self, repo, inv, filename, revision, parents):
739
        file_id = filename + '-id'
740
        entry = inventory.InventoryFile(file_id, filename, 'TREE_ROOT')
741
        entry.revision = revision
2535.3.70 by Andrew Bennetts
Merge from bzr.dev.
742
        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.
743
        inv.add(entry)
744
        vf = repo.weave_store.get_weave_or_empty(file_id,
745
                                                 repo.get_transaction())
746
        vf.add_lines(revision, parents, ['line\n'])
747
748
    def test_insert_from_broken_repo(self):
749
        """Inserting a data stream from a broken repository won't silently
750
        corrupt the target repository.
751
        """
752
        broken_repo = self.make_broken_repository()
753
        empty_repo = self.make_repository('empty-repo')
754
        stream = broken_repo.get_data_stream(['rev1a', 'rev2', 'rev3'])
2592.3.214 by Robert Collins
Merge bzr.dev.
755
        empty_repo.lock_write()
756
        self.addCleanup(empty_repo.unlock)
757
        empty_repo.start_write_group()
758
        try:
759
            self.assertRaises(
760
                errors.KnitCorrupt, empty_repo.insert_data_stream, stream)
761
        finally:
762
            empty_repo.abort_write_group()
763
764
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
765
class TestKnitPackNoSubtrees(TestCaseWithTransport):
2592.3.24 by Robert Collins
Knit1 disk layout specified.
766
767
    def get_format(self):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
768
        return bzrdir.format_registry.make_bzrdir('knitpack-experimental')
2592.3.24 by Robert Collins
Knit1 disk layout specified.
769
770
    def test_disk_layout(self):
771
        format = self.get_format()
2592.3.36 by Robert Collins
Change the revision index name to NAME.rix.
772
        repo = self.make_repository('.', format=format)
2592.3.24 by Robert Collins
Knit1 disk layout specified.
773
        # in case of side effects of locking.
774
        repo.lock_write()
775
        repo.unlock()
776
        t = repo.bzrdir.get_repository_transport(None)
777
        self.check_format(t)
778
        # XXX: no locks left when unlocked at the moment
779
        # self.assertEqualDiff('', t.get('lock').read())
780
        self.check_databases(t)
781
782
    def check_format(self, t):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
783
        self.assertEqualDiff(
2939.2.7 by Ian Clatworthy
fix strings used in on-disk unit tests
784
            "Bazaar pack repository format 1 (needs bzr 0.92)\n",
2592.3.24 by Robert Collins
Knit1 disk layout specified.
785
                             t.get('format').read())
786
787
    def assertHasKndx(self, t, knit_name):
788
        """Assert that knit_name exists on t."""
789
        self.assertEqualDiff('# bzr knit index 8\n',
790
                             t.get(knit_name + '.kndx').read())
791
792
    def assertHasNoKndx(self, t, knit_name):
793
        """Assert that knit_name has no index on t."""
794
        self.assertFalse(t.has(knit_name + '.kndx'))
795
2592.3.81 by Robert Collins
Merge FileName allocation change, leading to hash based pack file names.
796
    def assertHasNoKnit(self, t, knit_name):
2592.3.24 by Robert Collins
Knit1 disk layout specified.
797
        """Assert that knit_name exists on t."""
798
        # no default content
2592.3.81 by Robert Collins
Merge FileName allocation change, leading to hash based pack file names.
799
        self.assertFalse(t.has(knit_name + '.knit'))
2592.3.24 by Robert Collins
Knit1 disk layout specified.
800
801
    def check_databases(self, t):
802
        """check knit content for a repository."""
2592.3.81 by Robert Collins
Merge FileName allocation change, leading to hash based pack file names.
803
        # check conversion worked
2592.3.61 by Robert Collins
Remove inventory.kndx.
804
        self.assertHasNoKndx(t, 'inventory')
2592.3.81 by Robert Collins
Merge FileName allocation change, leading to hash based pack file names.
805
        self.assertHasNoKnit(t, 'inventory')
2592.3.24 by Robert Collins
Knit1 disk layout specified.
806
        self.assertHasNoKndx(t, 'revisions')
2592.3.81 by Robert Collins
Merge FileName allocation change, leading to hash based pack file names.
807
        self.assertHasNoKnit(t, 'revisions')
2592.3.39 by Robert Collins
Fugly version to remove signatures.kndx
808
        self.assertHasNoKndx(t, 'signatures')
2592.3.81 by Robert Collins
Merge FileName allocation change, leading to hash based pack file names.
809
        self.assertHasNoKnit(t, 'signatures')
810
        self.assertFalse(t.has('knits'))
2592.3.24 by Robert Collins
Knit1 disk layout specified.
811
        # revision-indexes file-container directory
2592.3.83 by Robert Collins
Merge bzr.dev, dropping FileNames for a trivial GraphIndex layer.
812
        self.assertEqual([],
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
813
            list(GraphIndex(t, 'pack-names', None).iter_all_entries()))
2592.3.81 by Robert Collins
Merge FileName allocation change, leading to hash based pack file names.
814
        self.assertTrue(S_ISDIR(t.stat('packs').st_mode))
815
        self.assertTrue(S_ISDIR(t.stat('upload').st_mode))
2592.3.219 by Robert Collins
Review feedback.
816
        self.assertTrue(S_ISDIR(t.stat('indices').st_mode))
817
        self.assertTrue(S_ISDIR(t.stat('obsolete_packs').st_mode))
2592.3.24 by Robert Collins
Knit1 disk layout specified.
818
819
    def test_shared_disk_layout(self):
820
        format = self.get_format()
2592.3.36 by Robert Collins
Change the revision index name to NAME.rix.
821
        repo = self.make_repository('.', shared=True, format=format)
2592.3.24 by Robert Collins
Knit1 disk layout specified.
822
        # we want:
823
        t = repo.bzrdir.get_repository_transport(None)
824
        self.check_format(t)
825
        # XXX: no locks left when unlocked at the moment
826
        # self.assertEqualDiff('', t.get('lock').read())
2592.3.219 by Robert Collins
Review feedback.
827
        # We should have a 'shared-storage' marker file.
2592.3.24 by Robert Collins
Knit1 disk layout specified.
828
        self.assertEqualDiff('', t.get('shared-storage').read())
829
        self.check_databases(t)
830
831
    def test_shared_no_tree_disk_layout(self):
832
        format = self.get_format()
2592.3.36 by Robert Collins
Change the revision index name to NAME.rix.
833
        repo = self.make_repository('.', shared=True, format=format)
2592.3.24 by Robert Collins
Knit1 disk layout specified.
834
        repo.set_make_working_trees(False)
835
        # we want:
836
        t = repo.bzrdir.get_repository_transport(None)
837
        self.check_format(t)
838
        # XXX: no locks left when unlocked at the moment
839
        # self.assertEqualDiff('', t.get('lock').read())
2592.3.219 by Robert Collins
Review feedback.
840
        # We should have a 'shared-storage' marker file.
2592.3.24 by Robert Collins
Knit1 disk layout specified.
841
        self.assertEqualDiff('', t.get('shared-storage').read())
2592.3.219 by Robert Collins
Review feedback.
842
        # We should have a marker for the no-working-trees flag.
2592.3.24 by Robert Collins
Knit1 disk layout specified.
843
        self.assertEqualDiff('', t.get('no-working-trees').read())
2592.3.219 by Robert Collins
Review feedback.
844
        # The marker should go when we toggle the setting.
2592.3.24 by Robert Collins
Knit1 disk layout specified.
845
        repo.set_make_working_trees(True)
846
        self.assertFalse(t.has('no-working-trees'))
847
        self.check_databases(t)
2592.3.25 by Robert Collins
experimental-subtrees layout defined.
848
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
849
    def test_adding_revision_creates_pack_indices(self):
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
850
        format = self.get_format()
851
        tree = self.make_branch_and_tree('.', format=format)
852
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
853
        self.assertEqual([],
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
854
            list(GraphIndex(trans, 'pack-names', None).iter_all_entries()))
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
855
        tree.commit('foobarbaz')
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
856
        index = GraphIndex(trans, 'pack-names', None)
2592.3.219 by Robert Collins
Review feedback.
857
        index_nodes = list(index.iter_all_entries())
858
        self.assertEqual(1, len(index_nodes))
859
        node = index_nodes[0]
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
860
        name = node[1][0]
861
        # the pack sizes should be listed in the index
862
        pack_value = node[2]
863
        sizes = [int(digits) for digits in pack_value.split(' ')]
864
        for size, suffix in zip(sizes, ['.rix', '.iix', '.tix', '.six']):
865
            stat = trans.stat('indices/%s%s' % (name, suffix))
866
            self.assertEqual(size, stat.st_size)
2592.3.60 by Robert Collins
Nuke per-fileid indices for a single unified index.
867
2592.3.52 by Robert Collins
Stop allocating new names unless new data has been inserted.
868
    def test_pulling_nothing_leads_to_no_new_names(self):
869
        format = self.get_format()
870
        tree1 = self.make_branch_and_tree('1', format=format)
871
        tree2 = self.make_branch_and_tree('2', format=format)
872
        tree1.branch.repository.fetch(tree2.branch.repository)
873
        trans = tree1.branch.repository.bzrdir.get_repository_transport(None)
2592.3.83 by Robert Collins
Merge bzr.dev, dropping FileNames for a trivial GraphIndex layer.
874
        self.assertEqual([],
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
875
            list(GraphIndex(trans, 'pack-names', None).iter_all_entries()))
2592.3.39 by Robert Collins
Fugly version to remove signatures.kndx
876
2592.3.84 by Robert Collins
Start of autopacking logic.
877
    def test_commit_across_pack_shape_boundary_autopacks(self):
878
        format = self.get_format()
879
        tree = self.make_branch_and_tree('.', format=format)
880
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
881
        # This test could be a little cheaper by replacing the packs
882
        # attribute on the repository to allow a different pack distribution
2592.3.219 by Robert Collins
Review feedback.
883
        # and max packs policy - so we are checking the policy is honoured
2592.3.84 by Robert Collins
Start of autopacking logic.
884
        # in the test. But for now 11 commits is not a big deal in a single
885
        # test.
886
        for x in range(9):
887
            tree.commit('commit %s' % x)
888
        # there should be 9 packs:
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
889
        index = GraphIndex(trans, 'pack-names', None)
2592.3.84 by Robert Collins
Start of autopacking logic.
890
        self.assertEqual(9, len(list(index.iter_all_entries())))
2948.1.1 by Robert Collins
* Obsolete packs are now cleaned up by pack and autopack operations.
891
        # insert some files in obsolete_packs which should be removed by pack.
892
        trans.put_bytes('obsolete_packs/foo', '123')
893
        trans.put_bytes('obsolete_packs/bar', '321')
2592.3.84 by Robert Collins
Start of autopacking logic.
894
        # committing one more should coalesce to 1 of 10.
895
        tree.commit('commit triggering pack')
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
896
        index = GraphIndex(trans, 'pack-names', None)
2592.3.84 by Robert Collins
Start of autopacking logic.
897
        self.assertEqual(1, len(list(index.iter_all_entries())))
898
        # packing should not damage data
899
        tree = tree.bzrdir.open_workingtree()
900
        check_result = tree.branch.repository.check(
901
            [tree.branch.last_revision()])
2948.1.1 by Robert Collins
* Obsolete packs are now cleaned up by pack and autopack operations.
902
        # We should have 50 (10x5) files in the obsolete_packs directory.
903
        obsolete_files = list(trans.list_dir('obsolete_packs'))
904
        self.assertFalse('foo' in obsolete_files)
905
        self.assertFalse('bar' in obsolete_files)
906
        self.assertEqual(50, len(obsolete_files))
2592.3.84 by Robert Collins
Start of autopacking logic.
907
        # XXX: Todo check packs obsoleted correctly - old packs and indices
908
        # in the obsolete_packs directory.
909
        large_pack_name = list(index.iter_all_entries())[0][1][0]
910
        # finally, committing again should not touch the large pack.
911
        tree.commit('commit not triggering pack')
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
912
        index = GraphIndex(trans, 'pack-names', None)
2592.3.84 by Robert Collins
Start of autopacking logic.
913
        self.assertEqual(2, len(list(index.iter_all_entries())))
914
        pack_names = [node[1][0] for node in index.iter_all_entries()]
915
        self.assertTrue(large_pack_name in pack_names)
916
2592.3.86 by Robert Collins
Implement the pack commands for knit repositories.
917
    def test_pack_after_two_commits_packs_everything(self):
918
        format = self.get_format()
919
        tree = self.make_branch_and_tree('.', format=format)
920
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
921
        tree.commit('start')
922
        tree.commit('more work')
923
        tree.branch.repository.pack()
2592.3.219 by Robert Collins
Review feedback.
924
        # there should be 1 pack:
2592.3.175 by Robert Collins
Update for GraphIndex constructor changes.
925
        index = GraphIndex(trans, 'pack-names', None)
2592.3.86 by Robert Collins
Implement the pack commands for knit repositories.
926
        self.assertEqual(1, len(list(index.iter_all_entries())))
927
        self.assertEqual(2, len(tree.branch.repository.all_revision_ids()))
928
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
929
    def test_pack_repositories_support_multiple_write_locks(self):
930
        format = self.get_format()
931
        self.make_repository('.', shared=True, format=format)
932
        r1 = repository.Repository.open('.')
933
        r2 = repository.Repository.open('.')
934
        r1.lock_write()
935
        self.addCleanup(r1.unlock)
936
        r2.lock_write()
937
        r2.unlock()
938
939
    def _add_text(self, repo, fileid):
940
        """Add a text to the repository within a write group."""
941
        vf =repo.weave_store.get_weave(fileid, repo.get_transaction())
942
        vf.add_lines('samplerev+' + fileid, [], [])
943
944
    def test_concurrent_writers_merge_new_packs(self):
945
        format = self.get_format()
946
        self.make_repository('.', shared=True, format=format)
947
        r1 = repository.Repository.open('.')
948
        r2 = repository.Repository.open('.')
949
        r1.lock_write()
950
        try:
951
            # access enough data to load the names list
952
            list(r1.all_revision_ids())
953
            r2.lock_write()
954
            try:
955
                # access enough data to load the names list
956
                list(r2.all_revision_ids())
957
                r1.start_write_group()
958
                try:
959
                    r2.start_write_group()
960
                    try:
961
                        self._add_text(r1, 'fileidr1')
962
                        self._add_text(r2, 'fileidr2')
963
                    except:
964
                        r2.abort_write_group()
965
                        raise
966
                except:
967
                    r1.abort_write_group()
968
                    raise
969
                # both r1 and r2 have open write groups with data in them
970
                # created while the other's write group was open.
971
                # Commit both which requires a merge to the pack-names.
972
                try:
973
                    r1.commit_write_group()
974
                except:
2592.3.219 by Robert Collins
Review feedback.
975
                    r1.abort_write_group()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
976
                    r2.abort_write_group()
977
                    raise
978
                r2.commit_write_group()
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
979
                # tell r1 to reload from disk
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
980
                r1._pack_collection.reset()
2592.3.219 by Robert Collins
Review feedback.
981
                # Now both repositories should know about both names
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
982
                r1._pack_collection.ensure_loaded()
983
                r2._pack_collection.ensure_loaded()
984
                self.assertEqual(r1._pack_collection.names(), r2._pack_collection.names())
985
                self.assertEqual(2, len(r1._pack_collection.names()))
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
986
            finally:
2939.1.1 by Martin Pool
Fix up mismatched lock/unlock pairs.
987
                r2.unlock()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
988
        finally:
2939.1.1 by Martin Pool
Fix up mismatched lock/unlock pairs.
989
            r1.unlock()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
990
991
    def test_concurrent_writer_second_preserves_dropping_a_pack(self):
992
        format = self.get_format()
993
        self.make_repository('.', shared=True, format=format)
994
        r1 = repository.Repository.open('.')
995
        r2 = repository.Repository.open('.')
996
        # add a pack to drop
997
        r1.lock_write()
998
        try:
999
            r1.start_write_group()
1000
            try:
1001
                self._add_text(r1, 'fileidr1')
1002
            except:
1003
                r1.abort_write_group()
1004
                raise
1005
            else:
1006
                r1.commit_write_group()
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1007
            r1._pack_collection.ensure_loaded()
1008
            name_to_drop = r1._pack_collection.all_packs()[0].name
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1009
        finally:
1010
            r1.unlock()
1011
        r1.lock_write()
1012
        try:
1013
            # access enough data to load the names list
1014
            list(r1.all_revision_ids())
1015
            r2.lock_write()
1016
            try:
1017
                # access enough data to load the names list
1018
                list(r2.all_revision_ids())
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1019
                r1._pack_collection.ensure_loaded()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1020
                try:
1021
                    r2.start_write_group()
1022
                    try:
1023
                        # in r1, drop the pack
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1024
                        r1._pack_collection._remove_pack_from_memory(
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1025
                            r1._pack_collection.get_pack_by_name(name_to_drop))
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1026
                        # in r2, add a pack
1027
                        self._add_text(r2, 'fileidr2')
1028
                    except:
1029
                        r2.abort_write_group()
1030
                        raise
1031
                except:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1032
                    r1._pack_collection.reset()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1033
                    raise
1034
                # r1 has a changed names list, and r2 an open write groups with
1035
                # changes.
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
1036
                # save r1, and then commit the r2 write group, which requires a
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1037
                # merge to the pack-names, which should not reinstate
1038
                # name_to_drop
1039
                try:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1040
                    r1._pack_collection._save_pack_names()
1041
                    r1._pack_collection.reset()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1042
                except:
1043
                    r2.abort_write_group()
1044
                    raise
1045
                try:
1046
                    r2.commit_write_group()
1047
                except:
1048
                    r2.abort_write_group()
1049
                    raise
1050
                # Now both repositories should now about just one name.
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1051
                r1._pack_collection.ensure_loaded()
1052
                r2._pack_collection.ensure_loaded()
1053
                self.assertEqual(r1._pack_collection.names(), r2._pack_collection.names())
1054
                self.assertEqual(1, len(r1._pack_collection.names()))
1055
                self.assertFalse(name_to_drop in r1._pack_collection.names())
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1056
            finally:
2939.1.1 by Martin Pool
Fix up mismatched lock/unlock pairs.
1057
                r2.unlock()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1058
        finally:
2939.1.1 by Martin Pool
Fix up mismatched lock/unlock pairs.
1059
            r1.unlock()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1060
1061
    def test_lock_write_does_not_physically_lock(self):
1062
        repo = self.make_repository('.', format=self.get_format())
1063
        repo.lock_write()
1064
        self.addCleanup(repo.unlock)
1065
        self.assertFalse(repo.get_physical_lock_status())
1066
1067
    def prepare_for_break_lock(self):
2592.3.219 by Robert Collins
Review feedback.
1068
        # Setup the global ui factory state so that a break-lock method call
1069
        # will find usable input in the input stream.
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1070
        old_factory = bzrlib.ui.ui_factory
1071
        def restoreFactory():
1072
            bzrlib.ui.ui_factory = old_factory
1073
        self.addCleanup(restoreFactory)
1074
        bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1075
        bzrlib.ui.ui_factory.stdin = StringIO("y\n")
1076
1077
    def test_break_lock_breaks_physical_lock(self):
1078
        repo = self.make_repository('.', format=self.get_format())
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1079
        repo._pack_collection.lock_names()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1080
        repo2 = repository.Repository.open('.')
1081
        self.assertTrue(repo.get_physical_lock_status())
1082
        self.prepare_for_break_lock()
1083
        repo2.break_lock()
1084
        self.assertFalse(repo.get_physical_lock_status())
1085
2592.3.240 by Martin Pool
Rename RepositoryPackCollection.release_names to _unlock_names
1086
    def test_broken_physical_locks_error_on__unlock_names_lock(self):
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1087
        repo = self.make_repository('.', format=self.get_format())
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1088
        repo._pack_collection.lock_names()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1089
        self.assertTrue(repo.get_physical_lock_status())
1090
        repo2 = repository.Repository.open('.')
1091
        self.prepare_for_break_lock()
1092
        repo2.break_lock()
2592.3.240 by Martin Pool
Rename RepositoryPackCollection.release_names to _unlock_names
1093
        self.assertRaises(errors.LockBroken, repo._pack_collection._unlock_names)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1094
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
1095
    def test_fetch_without_find_ghosts_ignores_ghosts(self):
1096
        # we want two repositories at this point:
1097
        # one with a revision that is a ghost in the other
1098
        # repository.
1099
        # 'ghost' is present in has_ghost, 'ghost' is absent in 'missing_ghost'.
1100
        # 'references' is present in both repositories, and 'tip' is present
1101
        # just in has_ghost.
1102
        # has_ghost       missing_ghost
1103
        #------------------------------
1104
        # 'ghost'             -
1105
        # 'references'    'references'
1106
        # 'tip'               -
1107
        # In this test we fetch 'tip' which should not fetch 'ghost'
1108
        has_ghost = self.make_repository('has_ghost', format=self.get_format())
1109
        missing_ghost = self.make_repository('missing_ghost',
1110
            format=self.get_format())
1111
1112
        def add_commit(repo, revision_id, parent_ids):
1113
            repo.lock_write()
1114
            repo.start_write_group()
1115
            inv = inventory.Inventory(revision_id=revision_id)
1116
            inv.root.revision = revision_id
1117
            root_id = inv.root.file_id
1118
            sha1 = repo.add_inventory(revision_id, inv, [])
1119
            vf = repo.weave_store.get_weave_or_empty(root_id,
1120
                repo.get_transaction())
1121
            vf.add_lines(revision_id, [], [])
1122
            rev = bzrlib.revision.Revision(timestamp=0,
1123
                                           timezone=None,
1124
                                           committer="Foo Bar <foo@example.com>",
1125
                                           message="Message",
1126
                                           inventory_sha1=sha1,
1127
                                           revision_id=revision_id)
1128
            rev.parent_ids = parent_ids
1129
            repo.add_revision(revision_id, rev)
1130
            repo.commit_write_group()
1131
            repo.unlock()
1132
        add_commit(has_ghost, 'ghost', [])
1133
        add_commit(has_ghost, 'references', ['ghost'])
1134
        add_commit(missing_ghost, 'references', ['ghost'])
1135
        add_commit(has_ghost, 'tip', ['references'])
1136
        missing_ghost.fetch(has_ghost, 'tip')
1137
        # missing ghost now has tip and not ghost.
1138
        rev = missing_ghost.get_revision('tip')
1139
        inv = missing_ghost.get_inventory('tip')
1140
        self.assertRaises(errors.NoSuchRevision,
1141
            missing_ghost.get_revision, 'ghost')
1142
        self.assertRaises(errors.RevisionNotPresent,
1143
            missing_ghost.get_inventory, 'ghost')
1144
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1145
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
1146
class TestKnitPackSubtrees(TestKnitPackNoSubtrees):
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1147
1148
    def get_format(self):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
1149
        return bzrdir.format_registry.make_bzrdir(
1150
            'knitpack-subtree-experimental')
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1151
1152
    def check_format(self, t):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
1153
        self.assertEqualDiff(
2939.2.7 by Ian Clatworthy
fix strings used in on-disk unit tests
1154
            "Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n",
2939.2.5 by Ian Clatworthy
review feedback from lifeless
1155
            t.get('format').read())
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1156
1157
2592.3.84 by Robert Collins
Start of autopacking logic.
1158
class TestRepositoryPackCollection(TestCaseWithTransport):
1159
1160
    def get_format(self):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
1161
        return bzrdir.format_registry.make_bzrdir('knitpack-experimental')
2592.3.84 by Robert Collins
Start of autopacking logic.
1162
1163
    def test__max_pack_count(self):
2592.3.219 by Robert Collins
Review feedback.
1164
        """The maximum pack count is a function of the number of revisions."""
2592.3.84 by Robert Collins
Start of autopacking logic.
1165
        format = self.get_format()
1166
        repo = self.make_repository('.', format=format)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1167
        packs = repo._pack_collection
2592.3.84 by Robert Collins
Start of autopacking logic.
1168
        # no revisions - one pack, so that we can have a revision free repo
1169
        # without it blowing up
1170
        self.assertEqual(1, packs._max_pack_count(0))
1171
        # after that the sum of the digits, - check the first 1-9
1172
        self.assertEqual(1, packs._max_pack_count(1))
1173
        self.assertEqual(2, packs._max_pack_count(2))
1174
        self.assertEqual(3, packs._max_pack_count(3))
1175
        self.assertEqual(4, packs._max_pack_count(4))
1176
        self.assertEqual(5, packs._max_pack_count(5))
1177
        self.assertEqual(6, packs._max_pack_count(6))
1178
        self.assertEqual(7, packs._max_pack_count(7))
1179
        self.assertEqual(8, packs._max_pack_count(8))
1180
        self.assertEqual(9, packs._max_pack_count(9))
1181
        # check the boundary cases with two digits for the next decade
1182
        self.assertEqual(1, packs._max_pack_count(10))
1183
        self.assertEqual(2, packs._max_pack_count(11))
1184
        self.assertEqual(10, packs._max_pack_count(19))
1185
        self.assertEqual(2, packs._max_pack_count(20))
1186
        self.assertEqual(3, packs._max_pack_count(21))
1187
        # check some arbitrary big numbers
1188
        self.assertEqual(25, packs._max_pack_count(112894))
1189
1190
    def test_pack_distribution_zero(self):
1191
        format = self.get_format()
1192
        repo = self.make_repository('.', format=format)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1193
        packs = repo._pack_collection
2592.3.84 by Robert Collins
Start of autopacking logic.
1194
        self.assertEqual([0], packs.pack_distribution(0))
1195
        
1196
    def test_pack_distribution_one_to_nine(self):
1197
        format = self.get_format()
1198
        repo = self.make_repository('.', format=format)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1199
        packs = repo._pack_collection
2592.3.84 by Robert Collins
Start of autopacking logic.
1200
        self.assertEqual([1],
1201
            packs.pack_distribution(1))
1202
        self.assertEqual([1, 1],
1203
            packs.pack_distribution(2))
1204
        self.assertEqual([1, 1, 1],
1205
            packs.pack_distribution(3))
1206
        self.assertEqual([1, 1, 1, 1],
1207
            packs.pack_distribution(4))
1208
        self.assertEqual([1, 1, 1, 1, 1],
1209
            packs.pack_distribution(5))
1210
        self.assertEqual([1, 1, 1, 1, 1, 1],
1211
            packs.pack_distribution(6))
1212
        self.assertEqual([1, 1, 1, 1, 1, 1, 1],
1213
            packs.pack_distribution(7))
1214
        self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1],
1215
            packs.pack_distribution(8))
1216
        self.assertEqual([1, 1, 1, 1, 1, 1, 1, 1, 1],
1217
            packs.pack_distribution(9))
1218
1219
    def test_pack_distribution_stable_at_boundaries(self):
1220
        """When there are multi-rev packs the counts are stable."""
1221
        format = self.get_format()
1222
        repo = self.make_repository('.', format=format)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1223
        packs = repo._pack_collection
2592.3.84 by Robert Collins
Start of autopacking logic.
1224
        # in 10s:
1225
        self.assertEqual([10], packs.pack_distribution(10))
1226
        self.assertEqual([10, 1], packs.pack_distribution(11))
1227
        self.assertEqual([10, 10], packs.pack_distribution(20))
1228
        self.assertEqual([10, 10, 1], packs.pack_distribution(21))
1229
        # 100s
1230
        self.assertEqual([100], packs.pack_distribution(100))
1231
        self.assertEqual([100, 1], packs.pack_distribution(101))
1232
        self.assertEqual([100, 10, 1], packs.pack_distribution(111))
1233
        self.assertEqual([100, 100], packs.pack_distribution(200))
1234
        self.assertEqual([100, 100, 1], packs.pack_distribution(201))
1235
        self.assertEqual([100, 100, 10, 1], packs.pack_distribution(211))
1236
2592.3.85 by Robert Collins
Finish autopack corner cases.
1237
    def test_plan_pack_operations_2009_revisions_skip_all_packs(self):
1238
        format = self.get_format()
1239
        repo = self.make_repository('.', format=format)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1240
        packs = repo._pack_collection
2592.3.85 by Robert Collins
Finish autopack corner cases.
1241
        existing_packs = [(2000, "big"), (9, "medium")]
1242
        # rev count - 2009 -> 2x1000 + 9x1
1243
        pack_operations = packs.plan_autopack_combinations(
1244
            existing_packs, [1000, 1000, 1, 1, 1, 1, 1, 1, 1, 1, 1])
1245
        self.assertEqual([], pack_operations)
1246
1247
    def test_plan_pack_operations_2010_revisions_skip_all_packs(self):
1248
        format = self.get_format()
1249
        repo = self.make_repository('.', format=format)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1250
        packs = repo._pack_collection
2592.3.85 by Robert Collins
Finish autopack corner cases.
1251
        existing_packs = [(2000, "big"), (9, "medium"), (1, "single")]
1252
        # rev count - 2010 -> 2x1000 + 1x10
1253
        pack_operations = packs.plan_autopack_combinations(
1254
            existing_packs, [1000, 1000, 10])
1255
        self.assertEqual([], pack_operations)
1256
1257
    def test_plan_pack_operations_2010_combines_smallest_two(self):
1258
        format = self.get_format()
1259
        repo = self.make_repository('.', format=format)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1260
        packs = repo._pack_collection
2592.3.85 by Robert Collins
Finish autopack corner cases.
1261
        existing_packs = [(1999, "big"), (9, "medium"), (1, "single2"),
1262
            (1, "single1")]
1263
        # rev count - 2010 -> 2x1000 + 1x10 (3)
1264
        pack_operations = packs.plan_autopack_combinations(
1265
            existing_packs, [1000, 1000, 10])
1266
        self.assertEqual([[2, ["single2", "single1"]], [0, []]], pack_operations)
1267
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1268
    def test_all_packs_none(self):
1269
        format = self.get_format()
1270
        tree = self.make_branch_and_tree('.', format=format)
1271
        tree.lock_read()
1272
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1273
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1274
        packs.ensure_loaded()
1275
        self.assertEqual([], packs.all_packs())
1276
1277
    def test_all_packs_one(self):
1278
        format = self.get_format()
1279
        tree = self.make_branch_and_tree('.', format=format)
1280
        tree.commit('start')
1281
        tree.lock_read()
1282
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1283
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1284
        packs.ensure_loaded()
2592.3.176 by Robert Collins
Various pack refactorings.
1285
        self.assertEqual([
1286
            packs.get_pack_by_name(packs.names()[0])],
1287
            packs.all_packs())
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1288
1289
    def test_all_packs_two(self):
1290
        format = self.get_format()
1291
        tree = self.make_branch_and_tree('.', format=format)
1292
        tree.commit('start')
1293
        tree.commit('continue')
1294
        tree.lock_read()
1295
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1296
        packs = tree.branch.repository._pack_collection
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1297
        packs.ensure_loaded()
1298
        self.assertEqual([
2592.3.176 by Robert Collins
Various pack refactorings.
1299
            packs.get_pack_by_name(packs.names()[0]),
1300
            packs.get_pack_by_name(packs.names()[1]),
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1301
            ], packs.all_packs())
1302
2592.3.176 by Robert Collins
Various pack refactorings.
1303
    def test_get_pack_by_name(self):
1304
        format = self.get_format()
1305
        tree = self.make_branch_and_tree('.', format=format)
1306
        tree.commit('start')
1307
        tree.lock_read()
1308
        self.addCleanup(tree.unlock)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1309
        packs = tree.branch.repository._pack_collection
2592.3.176 by Robert Collins
Various pack refactorings.
1310
        packs.ensure_loaded()
1311
        name = packs.names()[0]
1312
        pack_1 = packs.get_pack_by_name(name)
1313
        # the pack should be correctly initialised
1314
        rev_index = GraphIndex(packs._index_transport, name + '.rix',
1315
            packs._names[name][0])
1316
        inv_index = GraphIndex(packs._index_transport, name + '.iix',
1317
            packs._names[name][1])
1318
        txt_index = GraphIndex(packs._index_transport, name + '.tix',
1319
            packs._names[name][2])
1320
        sig_index = GraphIndex(packs._index_transport, name + '.six',
1321
            packs._names[name][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.
1322
        self.assertEqual(pack_repo.ExistingPack(packs._pack_transport,
2592.3.219 by Robert Collins
Review feedback.
1323
            name, rev_index, inv_index, txt_index, sig_index), pack_1)
2592.3.176 by Robert Collins
Various pack refactorings.
1324
        # and the same instance should be returned on successive calls.
1325
        self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1326
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1327
1328
class TestPack(TestCaseWithTransport):
1329
    """Tests for the Pack object."""
1330
1331
    def assertCurrentlyEqual(self, left, right):
1332
        self.assertTrue(left == right)
1333
        self.assertTrue(right == left)
1334
        self.assertFalse(left != right)
1335
        self.assertFalse(right != left)
1336
1337
    def assertCurrentlyNotEqual(self, left, right):
1338
        self.assertFalse(left == right)
1339
        self.assertFalse(right == left)
1340
        self.assertTrue(left != right)
1341
        self.assertTrue(right != left)
1342
1343
    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.
1344
        left = pack_repo.ExistingPack('', '', '', '', '', '')
1345
        right = pack_repo.ExistingPack('', '', '', '', '', '')
2592.3.173 by Robert Collins
Basic implementation of all_packs.
1346
        self.assertCurrentlyEqual(left, right)
1347
        # change all attributes and ensure equality changes as we do.
1348
        left.revision_index = 'a'
1349
        self.assertCurrentlyNotEqual(left, right)
1350
        right.revision_index = 'a'
1351
        self.assertCurrentlyEqual(left, right)
1352
        left.inventory_index = 'a'
1353
        self.assertCurrentlyNotEqual(left, right)
1354
        right.inventory_index = 'a'
1355
        self.assertCurrentlyEqual(left, right)
1356
        left.text_index = 'a'
1357
        self.assertCurrentlyNotEqual(left, right)
1358
        right.text_index = 'a'
1359
        self.assertCurrentlyEqual(left, right)
1360
        left.signature_index = 'a'
1361
        self.assertCurrentlyNotEqual(left, right)
1362
        right.signature_index = 'a'
1363
        self.assertCurrentlyEqual(left, right)
1364
        left.name = 'a'
1365
        self.assertCurrentlyNotEqual(left, right)
1366
        right.name = 'a'
1367
        self.assertCurrentlyEqual(left, right)
1368
        left.transport = 'a'
1369
        self.assertCurrentlyNotEqual(left, right)
1370
        right.transport = 'a'
1371
        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.
1372
1373
    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.
1374
        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.
1375
        self.assertEqual('a_name.pack', pack.file_name())
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1376
1377
1378
class TestNewPack(TestCaseWithTransport):
1379
    """Tests for pack_repo.NewPack."""
1380
2592.3.193 by Robert Collins
Move hash tracking of new packs into NewPack.
1381
    def test_new_instance_attributes(self):
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1382
        upload_transport = self.get_transport('upload')
1383
        pack_transport = self.get_transport('pack')
1384
        index_transport = self.get_transport('index')
1385
        upload_transport.mkdir('.')
1386
        pack = pack_repo.NewPack(upload_transport, index_transport,
1387
            pack_transport)
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1388
        self.assertIsInstance(pack.revision_index, InMemoryGraphIndex)
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
1389
        self.assertIsInstance(pack.inventory_index, InMemoryGraphIndex)
2592.3.193 by Robert Collins
Move hash tracking of new packs into NewPack.
1390
        self.assertIsInstance(pack._hash, type(md5.new()))
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1391
        self.assertTrue(pack.upload_transport is upload_transport)
1392
        self.assertTrue(pack.index_transport is index_transport)
1393
        self.assertTrue(pack.pack_transport is pack_transport)
1394
        self.assertEqual(None, pack.index_sizes)
1395
        self.assertEqual(20, len(pack.random_name))
1396
        self.assertIsInstance(pack.random_name, str)
1397
        self.assertIsInstance(pack.start_time, float)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1398
1399
1400
class TestPacker(TestCaseWithTransport):
1401
    """Tests for the packs repository Packer class."""
2951.1.10 by Robert Collins
Peer review feedback with Ian.
1402
1403
    # To date, this class has been factored out and nothing new added to it;
1404
    # thus there are not yet any tests.