← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Alexander Belchenko
  • Date: 2006-07-31 16:12:57 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060731161257-91a231523255332c
new official bzr.ico

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
1
 
    # Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
# 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
# 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
# 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
19
For interface contract tests, see tests/bzr_dir_implementations.
20
20
"""
21
21
 
22
 
import os.path
23
22
from StringIO import StringIO
24
23
 
25
 
from bzrlib import (
26
 
    bzrdir,
27
 
    errors,
28
 
    help_topics,
29
 
    repository,
30
 
    symbol_versioning,
31
 
    urlutils,
32
 
    workingtree,
33
 
    )
34
24
import bzrlib.branch
 
25
import bzrlib.bzrdir as bzrdir
 
26
import bzrlib.errors as errors
35
27
from bzrlib.errors import (NotBranchError,
36
28
                           UnknownFormatError,
37
29
                           UnsupportedFormatError,
38
30
                           )
39
 
from bzrlib.tests import (
40
 
    TestCase,
41
 
    TestCaseWithTransport,
42
 
    test_sftp_transport
43
 
    )
44
 
from bzrlib.tests.HttpServer import HttpServer
45
 
from bzrlib.tests.HTTPTestUtil import (
46
 
    TestCaseWithTwoWebservers,
47
 
    HTTPServerRedirecting,
48
 
    )
49
 
from bzrlib.tests.test_http import TestWithTransport_pycurl
 
31
import bzrlib.repository as repository
 
32
from bzrlib.tests import TestCase, TestCaseWithTransport
50
33
from bzrlib.transport import get_transport
51
 
from bzrlib.transport.http._urllib import HttpTransport_urllib
 
34
from bzrlib.transport.http import HttpServer
52
35
from bzrlib.transport.memory import MemoryServer
53
 
from bzrlib.repofmt import knitrepo, weaverepo
 
36
import bzrlib.workingtree as workingtree
54
37
 
55
38
 
56
39
class TestDefaultFormat(TestCase):
59
42
        old_format = bzrdir.BzrDirFormat.get_default_format()
60
43
        # default is BzrDirFormat6
61
44
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
62
 
        self.applyDeprecated(symbol_versioning.zero_fourteen, 
63
 
                             bzrdir.BzrDirFormat.set_default_format, 
64
 
                             SampleBzrDirFormat())
 
45
        bzrdir.BzrDirFormat.set_default_format(SampleBzrDirFormat())
65
46
        # creating a bzr dir should now create an instrumented dir.
66
47
        try:
67
48
            result = bzrdir.BzrDir.create('memory:///')
68
49
            self.failUnless(isinstance(result, SampleBzrDir))
69
50
        finally:
70
 
            self.applyDeprecated(symbol_versioning.zero_fourteen,
71
 
                bzrdir.BzrDirFormat.set_default_format, old_format)
 
51
            bzrdir.BzrDirFormat.set_default_format(old_format)
72
52
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
73
53
 
74
54
 
75
 
class TestFormatRegistry(TestCase):
76
 
 
77
 
    def make_format_registry(self):
78
 
        my_format_registry = bzrdir.BzrDirFormatRegistry()
79
 
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
80
 
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
81
 
            ' repositories', deprecated=True)
82
 
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir', 
83
 
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
84
 
        my_format_registry.register_metadir('knit',
85
 
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
86
 
            'Format using knits',
87
 
            )
88
 
        my_format_registry.set_default('knit')
89
 
        my_format_registry.register_metadir(
90
 
            'branch6',
91
 
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
92
 
            'Experimental successor to knit.  Use at your own risk.',
93
 
            branch_format='bzrlib.branch.BzrBranchFormat6')
94
 
        my_format_registry.register_metadir(
95
 
            'hidden format',
96
 
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
97
 
            'Experimental successor to knit.  Use at your own risk.',
98
 
            branch_format='bzrlib.branch.BzrBranchFormat6', hidden=True)
99
 
        my_format_registry.register('hiddenweave', bzrdir.BzrDirFormat6,
100
 
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
101
 
            ' repositories', hidden=True)
102
 
        my_format_registry.register_lazy('hiddenlazy', 'bzrlib.bzrdir',
103
 
            'BzrDirFormat6', 'Format registered lazily', deprecated=True,
104
 
            hidden=True)
105
 
        return my_format_registry
106
 
 
107
 
    def test_format_registry(self):
108
 
        my_format_registry = self.make_format_registry()
109
 
        my_bzrdir = my_format_registry.make_bzrdir('lazy')
110
 
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
111
 
        my_bzrdir = my_format_registry.make_bzrdir('weave')
112
 
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
113
 
        my_bzrdir = my_format_registry.make_bzrdir('default')
114
 
        self.assertIsInstance(my_bzrdir.repository_format, 
115
 
            knitrepo.RepositoryFormatKnit1)
116
 
        my_bzrdir = my_format_registry.make_bzrdir('knit')
117
 
        self.assertIsInstance(my_bzrdir.repository_format, 
118
 
            knitrepo.RepositoryFormatKnit1)
119
 
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
120
 
        self.assertIsInstance(my_bzrdir.get_branch_format(),
121
 
                              bzrlib.branch.BzrBranchFormat6)
122
 
 
123
 
    def test_get_help(self):
124
 
        my_format_registry = self.make_format_registry()
125
 
        self.assertEqual('Format registered lazily',
126
 
                         my_format_registry.get_help('lazy'))
127
 
        self.assertEqual('Format using knits', 
128
 
                         my_format_registry.get_help('knit'))
129
 
        self.assertEqual('Format using knits', 
130
 
                         my_format_registry.get_help('default'))
131
 
        self.assertEqual('Pre-0.8 format.  Slower and does not support'
132
 
                         ' checkouts or shared repositories', 
133
 
                         my_format_registry.get_help('weave'))
134
 
        
135
 
    def test_help_topic(self):
136
 
        topics = help_topics.HelpTopicRegistry()
137
 
        topics.register('formats', self.make_format_registry().help_topic, 
138
 
                        'Directory formats')
139
 
        topic = topics.get_detail('formats')
140
 
        new, deprecated = topic.split('Deprecated formats')
141
 
        self.assertContainsRe(new, 'Bazaar directory formats')
142
 
        self.assertContainsRe(new, 
143
 
            '  knit/default:\n    \(native\) Format using knits\n')
144
 
        self.assertContainsRe(deprecated, 
145
 
            '  lazy:\n    \(native\) Format registered lazily\n')
146
 
        self.assertNotContainsRe(new, 'hidden')
147
 
 
148
 
    def test_set_default_repository(self):
149
 
        default_factory = bzrdir.format_registry.get('default')
150
 
        old_default = [k for k, v in bzrdir.format_registry.iteritems()
151
 
                       if v == default_factory and k != 'default'][0]
152
 
        bzrdir.format_registry.set_default_repository('dirstate-with-subtree')
153
 
        try:
154
 
            self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'),
155
 
                          bzrdir.format_registry.get('default'))
156
 
            self.assertIs(
157
 
                repository.RepositoryFormat.get_default_format().__class__,
158
 
                knitrepo.RepositoryFormatKnit3)
159
 
        finally:
160
 
            bzrdir.format_registry.set_default_repository(old_default)
161
 
 
162
 
 
163
55
class SampleBranch(bzrlib.branch.Branch):
164
56
    """A dummy branch for guess what, dummy use."""
165
57
 
198
90
        """See BzrDirFormat.get_format_string()."""
199
91
        return "Sample .bzr dir format."
200
92
 
201
 
    def initialize(self, url, possible_transports=None):
 
93
    def initialize(self, url):
202
94
        """Create a bzr dir."""
203
 
        t = get_transport(url, possible_transports)
 
95
        t = get_transport(url)
204
96
        t.mkdir('.bzr')
205
 
        t.put_bytes('.bzr/branch-format', self.get_format_string())
 
97
        t.put('.bzr/branch-format', StringIO(self.get_format_string()))
206
98
        return SampleBzrDir(t, self)
207
99
 
208
100
    def is_supported(self):
237
129
    def test_find_format_unknown_format(self):
238
130
        t = get_transport(self.get_url())
239
131
        t.mkdir('.bzr')
240
 
        t.put_bytes('.bzr/branch-format', '')
 
132
        t.put('.bzr/branch-format', StringIO())
241
133
        self.assertRaises(UnknownFormatError,
242
134
                          bzrdir.BzrDirFormat.find_format,
243
135
                          get_transport('.'))
263
155
 
264
156
    def test_create_repository(self):
265
157
        format = SampleBzrDirFormat()
266
 
        repo = bzrdir.BzrDir.create_repository(self.get_url(), format=format)
267
 
        self.assertEqual('A repository', repo)
 
158
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
159
        bzrdir.BzrDirFormat.set_default_format(format)
 
160
        try:
 
161
            repo = bzrdir.BzrDir.create_repository(self.get_url())
 
162
            self.assertEqual('A repository', repo)
 
163
        finally:
 
164
            bzrdir.BzrDirFormat.set_default_format(old_format)
268
165
 
269
166
    def test_create_repository_shared(self):
270
167
        old_format = bzrdir.BzrDirFormat.get_default_format()
279
176
    def test_create_repository_under_shared(self):
280
177
        # an explicit create_repository always does so.
281
178
        # we trust the format is right from the 'create_repository test'
282
 
        format = bzrdir.format_registry.make_bzrdir('knit')
283
 
        self.make_repository('.', shared=True, format=format)
284
 
        repo = bzrdir.BzrDir.create_repository(self.get_url('child'),
285
 
                                               format=format)
286
 
        self.assertTrue(isinstance(repo, repository.Repository))
287
 
        self.assertTrue(repo.bzrdir.root_transport.base.endswith('child/'))
 
179
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
180
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
181
        try:
 
182
            self.make_repository('.', shared=True)
 
183
            repo = bzrdir.BzrDir.create_repository(self.get_url('child'))
 
184
            self.assertTrue(isinstance(repo, repository.Repository))
 
185
            self.assertTrue(repo.bzrdir.root_transport.base.endswith('child/'))
 
186
        finally:
 
187
            bzrdir.BzrDirFormat.set_default_format(old_format)
288
188
 
289
189
    def test_create_branch_and_repo_uses_default(self):
290
190
        format = SampleBzrDirFormat()
291
 
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url(),
292
 
                                                      format=format)
293
 
        self.assertTrue(isinstance(branch, SampleBranch))
 
191
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
192
        bzrdir.BzrDirFormat.set_default_format(format)
 
193
        try:
 
194
            branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url())
 
195
            self.assertTrue(isinstance(branch, SampleBranch))
 
196
        finally:
 
197
            bzrdir.BzrDirFormat.set_default_format(old_format)
294
198
 
295
199
    def test_create_branch_and_repo_under_shared(self):
296
200
        # creating a branch and repo in a shared repo uses the
297
201
        # shared repository
298
 
        format = bzrdir.format_registry.make_bzrdir('knit')
299
 
        self.make_repository('.', shared=True, format=format)
300
 
        branch = bzrdir.BzrDir.create_branch_and_repo(
301
 
            self.get_url('child'), format=format)
302
 
        self.assertRaises(errors.NoRepositoryPresent,
303
 
                          branch.bzrdir.open_repository)
 
202
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
203
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
204
        try:
 
205
            self.make_repository('.', shared=True)
 
206
            branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'))
 
207
            self.assertRaises(errors.NoRepositoryPresent,
 
208
                              branch.bzrdir.open_repository)
 
209
        finally:
 
210
            bzrdir.BzrDirFormat.set_default_format(old_format)
304
211
 
305
212
    def test_create_branch_and_repo_under_shared_force_new(self):
306
213
        # creating a branch and repo in a shared repo can be forced to 
307
214
        # make a new repo
308
 
        format = bzrdir.format_registry.make_bzrdir('knit')
309
 
        self.make_repository('.', shared=True, format=format)
310
 
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'),
311
 
                                                      force_new_repo=True,
312
 
                                                      format=format)
313
 
        branch.bzrdir.open_repository()
 
215
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
216
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
217
        try:
 
218
            self.make_repository('.', shared=True)
 
219
            branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'),
 
220
                                                          force_new_repo=True)
 
221
            branch.bzrdir.open_repository()
 
222
        finally:
 
223
            bzrdir.BzrDirFormat.set_default_format(old_format)
314
224
 
315
225
    def test_create_standalone_working_tree(self):
316
226
        format = SampleBzrDirFormat()
317
 
        # note this is deliberately readonly, as this failure should 
318
 
        # occur before any writes.
319
 
        self.assertRaises(errors.NotLocalUrl,
320
 
                          bzrdir.BzrDir.create_standalone_workingtree,
321
 
                          self.get_readonly_url(), format=format)
322
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('.', 
323
 
                                                           format=format)
324
 
        self.assertEqual('A tree', tree)
 
227
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
228
        bzrdir.BzrDirFormat.set_default_format(format)
 
229
        try:
 
230
            # note this is deliberately readonly, as this failure should 
 
231
            # occur before any writes.
 
232
            self.assertRaises(errors.NotLocalUrl,
 
233
                              bzrdir.BzrDir.create_standalone_workingtree,
 
234
                              self.get_readonly_url())
 
235
            tree = bzrdir.BzrDir.create_standalone_workingtree('.')
 
236
            self.assertEqual('A tree', tree)
 
237
        finally:
 
238
            bzrdir.BzrDirFormat.set_default_format(old_format)
325
239
 
326
240
    def test_create_standalone_working_tree_under_shared_repo(self):
327
241
        # create standalone working tree always makes a repo.
328
 
        format = bzrdir.format_registry.make_bzrdir('knit')
329
 
        self.make_repository('.', shared=True, format=format)
330
 
        # note this is deliberately readonly, as this failure should 
331
 
        # occur before any writes.
332
 
        self.assertRaises(errors.NotLocalUrl,
333
 
                          bzrdir.BzrDir.create_standalone_workingtree,
334
 
                          self.get_readonly_url('child'), format=format)
335
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('child', 
336
 
            format=format)
337
 
        tree.bzrdir.open_repository()
 
242
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
243
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
244
        try:
 
245
            self.make_repository('.', shared=True)
 
246
            # note this is deliberately readonly, as this failure should 
 
247
            # occur before any writes.
 
248
            self.assertRaises(errors.NotLocalUrl,
 
249
                              bzrdir.BzrDir.create_standalone_workingtree,
 
250
                              self.get_readonly_url('child'))
 
251
            tree = bzrdir.BzrDir.create_standalone_workingtree('child')
 
252
            tree.bzrdir.open_repository()
 
253
        finally:
 
254
            bzrdir.BzrDirFormat.set_default_format(old_format)
338
255
 
339
256
    def test_create_branch_convenience(self):
340
257
        # outside a repo the default convenience output is a repo+branch_tree
341
 
        format = bzrdir.format_registry.make_bzrdir('knit')
342
 
        branch = bzrdir.BzrDir.create_branch_convenience('.', format=format)
343
 
        branch.bzrdir.open_workingtree()
344
 
        branch.bzrdir.open_repository()
345
 
 
346
 
    def test_create_branch_convenience_possible_transports(self):
347
 
        """Check that the optional 'possible_transports' is recognized"""
348
 
        format = bzrdir.format_registry.make_bzrdir('knit')
349
 
        t = self.get_transport()
350
 
        branch = bzrdir.BzrDir.create_branch_convenience(
351
 
            '.', format=format, possible_transports=[t])
352
 
        branch.bzrdir.open_workingtree()
353
 
        branch.bzrdir.open_repository()
 
258
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
259
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
260
        try:
 
261
            branch = bzrdir.BzrDir.create_branch_convenience('.')
 
262
            branch.bzrdir.open_workingtree()
 
263
            branch.bzrdir.open_repository()
 
264
        finally:
 
265
            bzrdir.BzrDirFormat.set_default_format(old_format)
354
266
 
355
267
    def test_create_branch_convenience_root(self):
356
268
        """Creating a branch at the root of a fs should work."""
357
 
        self.vfs_transport_factory = MemoryServer
 
269
        self.transport_server = MemoryServer
358
270
        # outside a repo the default convenience output is a repo+branch_tree
359
 
        format = bzrdir.format_registry.make_bzrdir('knit')
360
 
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(), 
361
 
                                                         format=format)
362
 
        self.assertRaises(errors.NoWorkingTree,
363
 
                          branch.bzrdir.open_workingtree)
364
 
        branch.bzrdir.open_repository()
 
271
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
272
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
273
        try:
 
274
            branch = bzrdir.BzrDir.create_branch_convenience(self.get_url())
 
275
            self.assertRaises(errors.NoWorkingTree,
 
276
                              branch.bzrdir.open_workingtree)
 
277
            branch.bzrdir.open_repository()
 
278
        finally:
 
279
            bzrdir.BzrDirFormat.set_default_format(old_format)
365
280
 
366
281
    def test_create_branch_convenience_under_shared_repo(self):
367
282
        # inside a repo the default convenience output is a branch+ follow the
368
283
        # repo tree policy
369
 
        format = bzrdir.format_registry.make_bzrdir('knit')
370
 
        self.make_repository('.', shared=True, format=format)
371
 
        branch = bzrdir.BzrDir.create_branch_convenience('child',
372
 
            format=format)
373
 
        branch.bzrdir.open_workingtree()
374
 
        self.assertRaises(errors.NoRepositoryPresent,
375
 
                          branch.bzrdir.open_repository)
 
284
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
285
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
286
        try:
 
287
            self.make_repository('.', shared=True)
 
288
            branch = bzrdir.BzrDir.create_branch_convenience('child')
 
289
            branch.bzrdir.open_workingtree()
 
290
            self.assertRaises(errors.NoRepositoryPresent,
 
291
                              branch.bzrdir.open_repository)
 
292
        finally:
 
293
            bzrdir.BzrDirFormat.set_default_format(old_format)
376
294
            
377
295
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
378
296
        # inside a repo the default convenience output is a branch+ follow the
379
297
        # repo tree policy but we can override that
380
 
        format = bzrdir.format_registry.make_bzrdir('knit')
381
 
        self.make_repository('.', shared=True, format=format)
382
 
        branch = bzrdir.BzrDir.create_branch_convenience('child',
383
 
            force_new_tree=False, format=format)
384
 
        self.assertRaises(errors.NoWorkingTree,
385
 
                          branch.bzrdir.open_workingtree)
386
 
        self.assertRaises(errors.NoRepositoryPresent,
387
 
                          branch.bzrdir.open_repository)
 
298
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
299
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
300
        try:
 
301
            self.make_repository('.', shared=True)
 
302
            branch = bzrdir.BzrDir.create_branch_convenience('child',
 
303
                force_new_tree=False)
 
304
            self.assertRaises(errors.NoWorkingTree,
 
305
                              branch.bzrdir.open_workingtree)
 
306
            self.assertRaises(errors.NoRepositoryPresent,
 
307
                              branch.bzrdir.open_repository)
 
308
        finally:
 
309
            bzrdir.BzrDirFormat.set_default_format(old_format)
388
310
            
389
311
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
390
312
        # inside a repo the default convenience output is a branch+ follow the
391
313
        # repo tree policy
392
 
        format = bzrdir.format_registry.make_bzrdir('knit')
393
 
        repo = self.make_repository('.', shared=True, format=format)
394
 
        repo.set_make_working_trees(False)
395
 
        branch = bzrdir.BzrDir.create_branch_convenience('child', 
396
 
                                                         format=format)
397
 
        self.assertRaises(errors.NoWorkingTree,
398
 
                          branch.bzrdir.open_workingtree)
399
 
        self.assertRaises(errors.NoRepositoryPresent,
400
 
                          branch.bzrdir.open_repository)
 
314
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
315
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
316
        try:
 
317
            repo = self.make_repository('.', shared=True)
 
318
            repo.set_make_working_trees(False)
 
319
            branch = bzrdir.BzrDir.create_branch_convenience('child')
 
320
            self.assertRaises(errors.NoWorkingTree,
 
321
                              branch.bzrdir.open_workingtree)
 
322
            self.assertRaises(errors.NoRepositoryPresent,
 
323
                              branch.bzrdir.open_repository)
 
324
        finally:
 
325
            bzrdir.BzrDirFormat.set_default_format(old_format)
401
326
 
402
327
    def test_create_branch_convenience_under_shared_repo_no_tree_policy_force_tree(self):
403
328
        # inside a repo the default convenience output is a branch+ follow the
404
329
        # repo tree policy but we can override that
405
 
        format = bzrdir.format_registry.make_bzrdir('knit')
406
 
        repo = self.make_repository('.', shared=True, format=format)
407
 
        repo.set_make_working_trees(False)
408
 
        branch = bzrdir.BzrDir.create_branch_convenience('child',
409
 
            force_new_tree=True, format=format)
410
 
        branch.bzrdir.open_workingtree()
411
 
        self.assertRaises(errors.NoRepositoryPresent,
412
 
                          branch.bzrdir.open_repository)
 
330
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
331
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
332
        try:
 
333
            repo = self.make_repository('.', shared=True)
 
334
            repo.set_make_working_trees(False)
 
335
            branch = bzrdir.BzrDir.create_branch_convenience('child',
 
336
                force_new_tree=True)
 
337
            branch.bzrdir.open_workingtree()
 
338
            self.assertRaises(errors.NoRepositoryPresent,
 
339
                              branch.bzrdir.open_repository)
 
340
        finally:
 
341
            bzrdir.BzrDirFormat.set_default_format(old_format)
413
342
 
414
343
    def test_create_branch_convenience_under_shared_repo_force_new_repo(self):
415
344
        # inside a repo the default convenience output is overridable to give
416
345
        # repo+branch+tree
417
 
        format = bzrdir.format_registry.make_bzrdir('knit')
418
 
        self.make_repository('.', shared=True, format=format)
419
 
        branch = bzrdir.BzrDir.create_branch_convenience('child',
420
 
            force_new_repo=True, format=format)
421
 
        branch.bzrdir.open_repository()
422
 
        branch.bzrdir.open_workingtree()
 
346
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
347
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
348
        try:
 
349
            self.make_repository('.', shared=True)
 
350
            branch = bzrdir.BzrDir.create_branch_convenience('child',
 
351
                force_new_repo=True)
 
352
            branch.bzrdir.open_repository()
 
353
            branch.bzrdir.open_workingtree()
 
354
        finally:
 
355
            bzrdir.BzrDirFormat.set_default_format(old_format)
423
356
 
424
357
 
425
358
class ChrootedTests(TestCaseWithTransport):
432
365
 
433
366
    def setUp(self):
434
367
        super(ChrootedTests, self).setUp()
435
 
        if not self.vfs_transport_factory == MemoryServer:
 
368
        if not self.transport_server == MemoryServer:
436
369
            self.transport_readonly_server = HttpServer
437
370
 
438
371
    def test_open_containing(self):
459
392
            get_transport(self.get_readonly_url('g/p/q')))
460
393
        self.assertEqual('g/p/q', relpath)
461
394
 
462
 
    def test_open_containing_tree_or_branch(self):
463
 
        def local_branch_path(branch):
464
 
             return os.path.realpath(
465
 
                urlutils.local_path_from_url(branch.base))
466
 
 
467
 
        self.make_branch_and_tree('topdir')
468
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
469
 
            'topdir/foo')
470
 
        self.assertEqual(os.path.realpath('topdir'),
471
 
                         os.path.realpath(tree.basedir))
472
 
        self.assertEqual(os.path.realpath('topdir'),
473
 
                         local_branch_path(branch))
474
 
        self.assertIs(tree.bzrdir, branch.bzrdir)
475
 
        self.assertEqual('foo', relpath)
476
 
        # opening from non-local should not return the tree
477
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
478
 
            self.get_readonly_url('topdir/foo'))
479
 
        self.assertEqual(None, tree)
480
 
        self.assertEqual('foo', relpath)
481
 
        # without a tree:
482
 
        self.make_branch('topdir/foo')
483
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
484
 
            'topdir/foo')
485
 
        self.assertIs(tree, None)
486
 
        self.assertEqual(os.path.realpath('topdir/foo'),
487
 
                         local_branch_path(branch))
488
 
        self.assertEqual('', relpath)
489
 
 
490
 
    def test_open_from_transport(self):
491
 
        # transport pointing at bzrdir should give a bzrdir with root transport
492
 
        # set to the given transport
493
 
        control = bzrdir.BzrDir.create(self.get_url())
494
 
        transport = get_transport(self.get_url())
495
 
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
496
 
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
497
 
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
498
 
        
499
 
    def test_open_from_transport_no_bzrdir(self):
500
 
        transport = get_transport(self.get_url())
501
 
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
502
 
                          transport)
503
 
 
504
 
    def test_open_from_transport_bzrdir_in_parent(self):
505
 
        control = bzrdir.BzrDir.create(self.get_url())
506
 
        transport = get_transport(self.get_url())
507
 
        transport.mkdir('subdir')
508
 
        transport = transport.clone('subdir')
509
 
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
510
 
                          transport)
511
 
 
512
 
    def test_sprout_recursive(self):
513
 
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
514
 
        sub_tree = self.make_branch_and_tree('tree1/subtree',
515
 
            format='dirstate-with-subtree')
516
 
        tree.add_reference(sub_tree)
517
 
        self.build_tree(['tree1/subtree/file'])
518
 
        sub_tree.add('file')
519
 
        tree.commit('Initial commit')
520
 
        tree.bzrdir.sprout('tree2')
521
 
        self.failUnlessExists('tree2/subtree/file')
522
 
 
523
 
    def test_cloning_metadir(self):
524
 
        """Ensure that cloning metadir is suitable"""
525
 
        bzrdir = self.make_bzrdir('bzrdir')
526
 
        bzrdir.cloning_metadir()
527
 
        branch = self.make_branch('branch', format='knit')
528
 
        format = branch.bzrdir.cloning_metadir()
529
 
        self.assertIsInstance(format.workingtree_format,
530
 
            workingtree.WorkingTreeFormat3)
531
 
 
532
 
    def test_sprout_recursive_treeless(self):
533
 
        tree = self.make_branch_and_tree('tree1',
534
 
            format='dirstate-with-subtree')
535
 
        sub_tree = self.make_branch_and_tree('tree1/subtree',
536
 
            format='dirstate-with-subtree')
537
 
        tree.add_reference(sub_tree)
538
 
        self.build_tree(['tree1/subtree/file'])
539
 
        sub_tree.add('file')
540
 
        tree.commit('Initial commit')
541
 
        tree.bzrdir.destroy_workingtree()
542
 
        repo = self.make_repository('repo', shared=True,
543
 
            format='dirstate-with-subtree')
544
 
        repo.set_make_working_trees(False)
545
 
        tree.bzrdir.sprout('repo/tree2')
546
 
        self.failUnlessExists('repo/tree2/subtree')
547
 
        self.failIfExists('repo/tree2/subtree/file')
548
 
 
549
395
 
550
396
class TestMeta1DirFormat(TestCaseWithTransport):
551
397
    """Tests specific to the meta1 dir format."""
560
406
        repository_base = t.clone('repository').base
561
407
        self.assertEqual(repository_base, dir.get_repository_transport(None).base)
562
408
        self.assertEqual(repository_base,
563
 
                         dir.get_repository_transport(weaverepo.RepositoryFormat7()).base)
 
409
                         dir.get_repository_transport(repository.RepositoryFormat7()).base)
564
410
        checkout_base = t.clone('checkout').base
565
411
        self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base)
566
412
        self.assertEqual(checkout_base,
572
418
        t = dir.transport
573
419
        self.assertIsDirectory('branch-lock', t)
574
420
 
575
 
    def test_comparison(self):
576
 
        """Equality and inequality behave properly.
577
 
 
578
 
        Metadirs should compare equal iff they have the same repo, branch and
579
 
        tree formats.
580
 
        """
581
 
        mydir = bzrdir.format_registry.make_bzrdir('knit')
582
 
        self.assertEqual(mydir, mydir)
583
 
        self.assertFalse(mydir != mydir)
584
 
        otherdir = bzrdir.format_registry.make_bzrdir('knit')
585
 
        self.assertEqual(otherdir, mydir)
586
 
        self.assertFalse(otherdir != mydir)
587
 
        otherdir2 = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
588
 
        self.assertNotEqual(otherdir2, mydir)
589
 
        self.assertFalse(otherdir2 == mydir)
590
 
 
591
 
    def test_needs_conversion_different_working_tree(self):
592
 
        # meta1dirs need an conversion if any element is not the default.
593
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
594
 
        # test with 
595
 
        new_default = bzrdir.format_registry.make_bzrdir('dirstate')
596
 
        bzrdir.BzrDirFormat._set_default_format(new_default)
597
 
        try:
598
 
            tree = self.make_branch_and_tree('tree', format='knit')
599
 
            self.assertTrue(tree.bzrdir.needs_format_conversion())
600
 
        finally:
601
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
602
 
 
603
 
 
 
421
        
604
422
class TestFormat5(TestCaseWithTransport):
605
423
    """Tests specific to the version 5 bzrdir format."""
606
424
 
628
446
        # format 5 dirs need a conversion if they are not the default.
629
447
        # and they start of not the default.
630
448
        old_format = bzrdir.BzrDirFormat.get_default_format()
631
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
449
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
632
450
        try:
633
451
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
634
452
            self.assertFalse(dir.needs_format_conversion())
635
453
        finally:
636
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
454
            bzrdir.BzrDirFormat.set_default_format(old_format)
637
455
        self.assertTrue(dir.needs_format_conversion())
638
456
 
639
457
 
663
481
    def test_needs_conversion(self):
664
482
        # format 6 dirs need an conversion if they are not the default.
665
483
        old_format = bzrdir.BzrDirFormat.get_default_format()
666
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
 
484
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
667
485
        try:
668
486
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
669
487
            self.assertTrue(dir.needs_format_conversion())
670
488
        finally:
671
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
489
            bzrdir.BzrDirFormat.set_default_format(old_format)
672
490
 
673
491
 
674
492
class NotBzrDir(bzrlib.bzrdir.BzrDir):
741
559
 
742
560
    def setUp(self):
743
561
        super(NonLocalTests, self).setUp()
744
 
        self.vfs_transport_factory = MemoryServer
 
562
        self.transport_server = MemoryServer
745
563
    
746
564
    def test_create_branch_convenience(self):
747
565
        # outside a repo the default convenience output is a repo+branch_tree
748
 
        format = bzrdir.format_registry.make_bzrdir('knit')
749
 
        branch = bzrdir.BzrDir.create_branch_convenience(
750
 
            self.get_url('foo'), format=format)
751
 
        self.assertRaises(errors.NoWorkingTree,
752
 
                          branch.bzrdir.open_workingtree)
753
 
        branch.bzrdir.open_repository()
 
566
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
567
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
568
        try:
 
569
            branch = bzrdir.BzrDir.create_branch_convenience(self.get_url('foo'))
 
570
            self.assertRaises(errors.NoWorkingTree,
 
571
                              branch.bzrdir.open_workingtree)
 
572
            branch.bzrdir.open_repository()
 
573
        finally:
 
574
            bzrdir.BzrDirFormat.set_default_format(old_format)
754
575
 
755
576
    def test_create_branch_convenience_force_tree_not_local_fails(self):
756
577
        # outside a repo the default convenience output is a repo+branch_tree
757
 
        format = bzrdir.format_registry.make_bzrdir('knit')
758
 
        self.assertRaises(errors.NotLocalUrl,
759
 
            bzrdir.BzrDir.create_branch_convenience,
760
 
            self.get_url('foo'),
761
 
            force_new_tree=True,
762
 
            format=format)
763
 
        t = get_transport(self.get_url('.'))
764
 
        self.assertFalse(t.has('foo'))
 
578
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
579
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
580
        try:
 
581
            self.assertRaises(errors.NotLocalUrl,
 
582
                bzrdir.BzrDir.create_branch_convenience,
 
583
                self.get_url('foo'),
 
584
                force_new_tree=True)
 
585
            t = get_transport(self.get_url('.'))
 
586
            self.assertFalse(t.has('foo'))
 
587
        finally:
 
588
            bzrdir.BzrDirFormat.set_default_format(old_format)
765
589
 
766
590
    def test_clone(self):
767
591
        # clone into a nonlocal path works
768
 
        format = bzrdir.format_registry.make_bzrdir('knit')
769
 
        branch = bzrdir.BzrDir.create_branch_convenience('local',
770
 
                                                         format=format)
 
592
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
593
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
594
        try:
 
595
            branch = bzrdir.BzrDir.create_branch_convenience('local')
 
596
        finally:
 
597
            bzrdir.BzrDirFormat.set_default_format(old_format)
771
598
        branch.bzrdir.open_workingtree()
772
599
        result = branch.bzrdir.clone(self.get_url('remote'))
773
600
        self.assertRaises(errors.NoWorkingTree,
775
602
        result.open_branch()
776
603
        result.open_repository()
777
604
 
778
 
    def test_checkout_metadir(self):
779
 
        # checkout_metadir has reasonable working tree format even when no
780
 
        # working tree is present
781
 
        self.make_branch('branch-knit2', format='dirstate-with-subtree')
782
 
        my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2'))
783
 
        checkout_format = my_bzrdir.checkout_metadir()
784
 
        self.assertIsInstance(checkout_format.workingtree_format,
785
 
                              workingtree.WorkingTreeFormat3)
786
 
 
787
 
 
788
 
class TestHTTPRedirectionLoop(object):
789
 
    """Test redirection loop between two http servers.
790
 
 
791
 
    This MUST be used by daughter classes that also inherit from
792
 
    TestCaseWithTwoWebservers.
793
 
 
794
 
    We can't inherit directly from TestCaseWithTwoWebservers or the
795
 
    test framework will try to create an instance which cannot
796
 
    run, its implementation being incomplete. 
797
 
    """
798
 
 
799
 
    # Should be defined by daughter classes to ensure redirection
800
 
    # still use the same transport implementation (not currently
801
 
    # enforced as it's a bit tricky to get right (see the FIXME
802
 
    # in BzrDir.open_from_transport for the unique use case so
803
 
    # far)
804
 
    _qualifier = None
805
 
 
806
 
    def create_transport_readonly_server(self):
807
 
        return HTTPServerRedirecting()
808
 
 
809
 
    def create_transport_secondary_server(self):
810
 
        return HTTPServerRedirecting()
811
 
 
812
 
    def setUp(self):
813
 
        # Both servers redirect to each server creating a loop
814
 
        super(TestHTTPRedirectionLoop, self).setUp()
815
 
        # The redirections will point to the new server
816
 
        self.new_server = self.get_readonly_server()
817
 
        # The requests to the old server will be redirected
818
 
        self.old_server = self.get_secondary_server()
819
 
        # Configure the redirections
820
 
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
821
 
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
822
 
 
823
 
    def _qualified_url(self, host, port):
824
 
        return 'http+%s://%s:%s' % (self._qualifier, host, port)
825
 
 
826
 
    def test_loop(self):
827
 
        # Starting from either server should loop
828
 
        old_url = self._qualified_url(self.old_server.host, 
829
 
                                      self.old_server.port)
830
 
        oldt = self._transport(old_url)
831
 
        self.assertRaises(errors.NotBranchError,
832
 
                          bzrdir.BzrDir.open_from_transport, oldt)
833
 
        new_url = self._qualified_url(self.new_server.host, 
834
 
                                      self.new_server.port)
835
 
        newt = self._transport(new_url)
836
 
        self.assertRaises(errors.NotBranchError,
837
 
                          bzrdir.BzrDir.open_from_transport, newt)
838
 
 
839
 
 
840
 
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop,
841
 
                                  TestCaseWithTwoWebservers):
842
 
    """Tests redirections for urllib implementation"""
843
 
 
844
 
    _qualifier = 'urllib'
845
 
    _transport = HttpTransport_urllib
846
 
 
847
 
 
848
 
 
849
 
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
850
 
                                  TestHTTPRedirectionLoop,
851
 
                                  TestCaseWithTwoWebservers):
852
 
    """Tests redirections for pycurl implementation"""
853
 
 
854
 
    _qualifier = 'pycurl'