← 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: Vincent Ladeuil
  • Date: 2007-07-15 11:24:18 UTC
  • mfrom: (2617 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070715112418-9nn4n6esxv60ny4b
merge bzr.dev@1617

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
    # Copyright (C) 2005, 2006, 2007 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
22
23
from StringIO import StringIO
23
24
 
 
25
from bzrlib import (
 
26
    bzrdir,
 
27
    errors,
 
28
    help_topics,
 
29
    repository,
 
30
    symbol_versioning,
 
31
    urlutils,
 
32
    workingtree,
 
33
    )
24
34
import bzrlib.branch
25
 
import bzrlib.bzrdir as bzrdir
26
 
import bzrlib.errors as errors
27
35
from bzrlib.errors import (NotBranchError,
28
36
                           UnknownFormatError,
29
37
                           UnsupportedFormatError,
30
38
                           )
31
 
import bzrlib.repository as repository
32
 
from bzrlib.tests import TestCase, TestCaseWithTransport
 
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
33
50
from bzrlib.transport import get_transport
34
 
from bzrlib.transport.http import HttpServer
 
51
from bzrlib.transport.http._urllib import HttpTransport_urllib
35
52
from bzrlib.transport.memory import MemoryServer
36
 
import bzrlib.workingtree as workingtree
 
53
from bzrlib.repofmt import knitrepo, weaverepo
37
54
 
38
55
 
39
56
class TestDefaultFormat(TestCase):
42
59
        old_format = bzrdir.BzrDirFormat.get_default_format()
43
60
        # default is BzrDirFormat6
44
61
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
45
 
        bzrdir.BzrDirFormat.set_default_format(SampleBzrDirFormat())
 
62
        self.applyDeprecated(symbol_versioning.zero_fourteen, 
 
63
                             bzrdir.BzrDirFormat.set_default_format, 
 
64
                             SampleBzrDirFormat())
46
65
        # creating a bzr dir should now create an instrumented dir.
47
66
        try:
48
67
            result = bzrdir.BzrDir.create('memory:///')
49
68
            self.failUnless(isinstance(result, SampleBzrDir))
50
69
        finally:
51
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
70
            self.applyDeprecated(symbol_versioning.zero_fourteen,
 
71
                bzrdir.BzrDirFormat.set_default_format, old_format)
52
72
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
53
73
 
54
74
 
 
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
 
55
163
class SampleBranch(bzrlib.branch.Branch):
56
164
    """A dummy branch for guess what, dummy use."""
57
165
 
62
170
class SampleBzrDir(bzrdir.BzrDir):
63
171
    """A sample BzrDir implementation to allow testing static methods."""
64
172
 
65
 
    def create_repository(self):
 
173
    def create_repository(self, shared=False):
66
174
        """See BzrDir.create_repository."""
67
175
        return "A repository"
68
176
 
90
198
        """See BzrDirFormat.get_format_string()."""
91
199
        return "Sample .bzr dir format."
92
200
 
93
 
    def initialize(self, url):
 
201
    def initialize(self, url, possible_transports=None):
94
202
        """Create a bzr dir."""
95
 
        t = get_transport(url)
 
203
        t = get_transport(url, possible_transports)
96
204
        t.mkdir('.bzr')
97
 
        t.put('.bzr/branch-format', StringIO(self.get_format_string()))
 
205
        t.put_bytes('.bzr/branch-format', self.get_format_string())
98
206
        return SampleBzrDir(t, self)
99
207
 
100
208
    def is_supported(self):
129
237
    def test_find_format_unknown_format(self):
130
238
        t = get_transport(self.get_url())
131
239
        t.mkdir('.bzr')
132
 
        t.put('.bzr/branch-format', StringIO())
 
240
        t.put_bytes('.bzr/branch-format', '')
133
241
        self.assertRaises(UnknownFormatError,
134
242
                          bzrdir.BzrDirFormat.find_format,
135
243
                          get_transport('.'))
155
263
 
156
264
    def test_create_repository(self):
157
265
        format = SampleBzrDirFormat()
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)
 
266
        repo = bzrdir.BzrDir.create_repository(self.get_url(), format=format)
 
267
        self.assertEqual('A repository', repo)
 
268
 
 
269
    def test_create_repository_shared(self):
 
270
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
271
        repo = bzrdir.BzrDir.create_repository('.', shared=True)
 
272
        self.assertTrue(repo.is_shared())
 
273
 
 
274
    def test_create_repository_nonshared(self):
 
275
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
276
        repo = bzrdir.BzrDir.create_repository('.')
 
277
        self.assertFalse(repo.is_shared())
165
278
 
166
279
    def test_create_repository_under_shared(self):
167
280
        # an explicit create_repository always does so.
168
281
        # we trust the format is right from the 'create_repository test'
169
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
170
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
171
 
        try:
172
 
            self.make_repository('.', shared=True)
173
 
            repo = bzrdir.BzrDir.create_repository(self.get_url('child'))
174
 
            self.assertTrue(isinstance(repo, repository.Repository))
175
 
            self.assertTrue(repo.bzrdir.root_transport.base.endswith('child/'))
176
 
        finally:
177
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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/'))
178
288
 
179
289
    def test_create_branch_and_repo_uses_default(self):
180
290
        format = SampleBzrDirFormat()
181
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
182
 
        bzrdir.BzrDirFormat.set_default_format(format)
183
 
        try:
184
 
            branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url())
185
 
            self.assertTrue(isinstance(branch, SampleBranch))
186
 
        finally:
187
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
291
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url(),
 
292
                                                      format=format)
 
293
        self.assertTrue(isinstance(branch, SampleBranch))
188
294
 
189
295
    def test_create_branch_and_repo_under_shared(self):
190
296
        # creating a branch and repo in a shared repo uses the
191
297
        # shared repository
192
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
193
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
194
 
        try:
195
 
            self.make_repository('.', shared=True)
196
 
            branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'))
197
 
            self.assertRaises(errors.NoRepositoryPresent,
198
 
                              branch.bzrdir.open_repository)
199
 
        finally:
200
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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)
201
304
 
202
305
    def test_create_branch_and_repo_under_shared_force_new(self):
203
306
        # creating a branch and repo in a shared repo can be forced to 
204
307
        # make a new repo
205
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
206
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
207
 
        try:
208
 
            self.make_repository('.', shared=True)
209
 
            branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'),
210
 
                                                          force_new_repo=True)
211
 
            branch.bzrdir.open_repository()
212
 
        finally:
213
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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()
214
314
 
215
315
    def test_create_standalone_working_tree(self):
216
316
        format = SampleBzrDirFormat()
217
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
218
 
        bzrdir.BzrDirFormat.set_default_format(format)
219
 
        try:
220
 
            # note this is deliberately readonly, as this failure should 
221
 
            # occur before any writes.
222
 
            self.assertRaises(errors.NotLocalUrl,
223
 
                              bzrdir.BzrDir.create_standalone_workingtree,
224
 
                              self.get_readonly_url())
225
 
            tree = bzrdir.BzrDir.create_standalone_workingtree('.')
226
 
            self.assertEqual('A tree', tree)
227
 
        finally:
228
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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)
229
325
 
230
326
    def test_create_standalone_working_tree_under_shared_repo(self):
231
327
        # create standalone working tree always makes a repo.
232
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
233
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
234
 
        try:
235
 
            self.make_repository('.', shared=True)
236
 
            # note this is deliberately readonly, as this failure should 
237
 
            # occur before any writes.
238
 
            self.assertRaises(errors.NotLocalUrl,
239
 
                              bzrdir.BzrDir.create_standalone_workingtree,
240
 
                              self.get_readonly_url('child'))
241
 
            tree = bzrdir.BzrDir.create_standalone_workingtree('child')
242
 
            tree.bzrdir.open_repository()
243
 
        finally:
244
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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()
245
338
 
246
339
    def test_create_branch_convenience(self):
247
340
        # outside a repo the default convenience output is a repo+branch_tree
248
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
249
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
250
 
        try:
251
 
            branch = bzrdir.BzrDir.create_branch_convenience('.')
252
 
            branch.bzrdir.open_workingtree()
253
 
            branch.bzrdir.open_repository()
254
 
        finally:
255
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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()
256
354
 
257
355
    def test_create_branch_convenience_root(self):
258
356
        """Creating a branch at the root of a fs should work."""
259
 
        self.transport_server = MemoryServer
 
357
        self.vfs_transport_factory = MemoryServer
260
358
        # outside a repo the default convenience output is a repo+branch_tree
261
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
262
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
263
 
        try:
264
 
            branch = bzrdir.BzrDir.create_branch_convenience(self.get_url())
265
 
            self.assertRaises(errors.NoWorkingTree,
266
 
                              branch.bzrdir.open_workingtree)
267
 
            branch.bzrdir.open_repository()
268
 
        finally:
269
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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()
270
365
 
271
366
    def test_create_branch_convenience_under_shared_repo(self):
272
367
        # inside a repo the default convenience output is a branch+ follow the
273
368
        # repo tree policy
274
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
275
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
276
 
        try:
277
 
            self.make_repository('.', shared=True)
278
 
            branch = bzrdir.BzrDir.create_branch_convenience('child')
279
 
            branch.bzrdir.open_workingtree()
280
 
            self.assertRaises(errors.NoRepositoryPresent,
281
 
                              branch.bzrdir.open_repository)
282
 
        finally:
283
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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
376
            
285
377
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
286
378
        # inside a repo the default convenience output is a branch+ follow the
287
379
        # repo tree policy but we can override that
288
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
289
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
290
 
        try:
291
 
            self.make_repository('.', shared=True)
292
 
            branch = bzrdir.BzrDir.create_branch_convenience('child',
293
 
                force_new_tree=False)
294
 
            self.assertRaises(errors.NoWorkingTree,
295
 
                              branch.bzrdir.open_workingtree)
296
 
            self.assertRaises(errors.NoRepositoryPresent,
297
 
                              branch.bzrdir.open_repository)
298
 
        finally:
299
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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)
300
388
            
301
389
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
302
390
        # inside a repo the default convenience output is a branch+ follow the
303
391
        # repo tree policy
304
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
305
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
306
 
        try:
307
 
            repo = self.make_repository('.', shared=True)
308
 
            repo.set_make_working_trees(False)
309
 
            branch = bzrdir.BzrDir.create_branch_convenience('child')
310
 
            self.assertRaises(errors.NoWorkingTree,
311
 
                              branch.bzrdir.open_workingtree)
312
 
            self.assertRaises(errors.NoRepositoryPresent,
313
 
                              branch.bzrdir.open_repository)
314
 
        finally:
315
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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)
316
401
 
317
402
    def test_create_branch_convenience_under_shared_repo_no_tree_policy_force_tree(self):
318
403
        # inside a repo the default convenience output is a branch+ follow the
319
404
        # repo tree policy but we can override that
320
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
321
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
322
 
        try:
323
 
            repo = self.make_repository('.', shared=True)
324
 
            repo.set_make_working_trees(False)
325
 
            branch = bzrdir.BzrDir.create_branch_convenience('child',
326
 
                force_new_tree=True)
327
 
            branch.bzrdir.open_workingtree()
328
 
            self.assertRaises(errors.NoRepositoryPresent,
329
 
                              branch.bzrdir.open_repository)
330
 
        finally:
331
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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)
332
413
 
333
414
    def test_create_branch_convenience_under_shared_repo_force_new_repo(self):
334
415
        # inside a repo the default convenience output is overridable to give
335
416
        # repo+branch+tree
336
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
337
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
338
 
        try:
339
 
            self.make_repository('.', shared=True)
340
 
            branch = bzrdir.BzrDir.create_branch_convenience('child',
341
 
                force_new_repo=True)
342
 
            branch.bzrdir.open_repository()
343
 
            branch.bzrdir.open_workingtree()
344
 
        finally:
345
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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
423
 
347
424
 
348
425
class ChrootedTests(TestCaseWithTransport):
355
432
 
356
433
    def setUp(self):
357
434
        super(ChrootedTests, self).setUp()
358
 
        if not self.transport_server == MemoryServer:
 
435
        if not self.vfs_transport_factory == MemoryServer:
359
436
            self.transport_readonly_server = HttpServer
360
437
 
361
438
    def test_open_containing(self):
382
459
            get_transport(self.get_readonly_url('g/p/q')))
383
460
        self.assertEqual('g/p/q', relpath)
384
461
 
 
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
 
385
549
 
386
550
class TestMeta1DirFormat(TestCaseWithTransport):
387
551
    """Tests specific to the meta1 dir format."""
396
560
        repository_base = t.clone('repository').base
397
561
        self.assertEqual(repository_base, dir.get_repository_transport(None).base)
398
562
        self.assertEqual(repository_base,
399
 
                         dir.get_repository_transport(repository.RepositoryFormat7()).base)
 
563
                         dir.get_repository_transport(weaverepo.RepositoryFormat7()).base)
400
564
        checkout_base = t.clone('checkout').base
401
565
        self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base)
402
566
        self.assertEqual(checkout_base,
408
572
        t = dir.transport
409
573
        self.assertIsDirectory('branch-lock', t)
410
574
 
411
 
        
 
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
 
412
604
class TestFormat5(TestCaseWithTransport):
413
605
    """Tests specific to the version 5 bzrdir format."""
414
606
 
436
628
        # format 5 dirs need a conversion if they are not the default.
437
629
        # and they start of not the default.
438
630
        old_format = bzrdir.BzrDirFormat.get_default_format()
439
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
 
631
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
440
632
        try:
441
633
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
442
634
            self.assertFalse(dir.needs_format_conversion())
443
635
        finally:
444
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
636
            bzrdir.BzrDirFormat._set_default_format(old_format)
445
637
        self.assertTrue(dir.needs_format_conversion())
446
638
 
447
639
 
471
663
    def test_needs_conversion(self):
472
664
        # format 6 dirs need an conversion if they are not the default.
473
665
        old_format = bzrdir.BzrDirFormat.get_default_format()
474
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
666
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
475
667
        try:
476
668
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
477
669
            self.assertTrue(dir.needs_format_conversion())
478
670
        finally:
479
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
671
            bzrdir.BzrDirFormat._set_default_format(old_format)
480
672
 
481
673
 
482
674
class NotBzrDir(bzrlib.bzrdir.BzrDir):
549
741
 
550
742
    def setUp(self):
551
743
        super(NonLocalTests, self).setUp()
552
 
        self.transport_server = MemoryServer
 
744
        self.vfs_transport_factory = MemoryServer
553
745
    
554
746
    def test_create_branch_convenience(self):
555
747
        # outside a repo the default convenience output is a repo+branch_tree
556
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
557
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
558
 
        try:
559
 
            branch = bzrdir.BzrDir.create_branch_convenience(self.get_url('foo'))
560
 
            self.assertRaises(errors.NoWorkingTree,
561
 
                              branch.bzrdir.open_workingtree)
562
 
            branch.bzrdir.open_repository()
563
 
        finally:
564
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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()
565
754
 
566
755
    def test_create_branch_convenience_force_tree_not_local_fails(self):
567
756
        # outside a repo the default convenience output is a repo+branch_tree
568
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
569
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
570
 
        try:
571
 
            self.assertRaises(errors.NotLocalUrl,
572
 
                bzrdir.BzrDir.create_branch_convenience,
573
 
                self.get_url('foo'),
574
 
                force_new_tree=True)
575
 
            t = get_transport(self.get_url('.'))
576
 
            self.assertFalse(t.has('foo'))
577
 
        finally:
578
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
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'))
579
765
 
580
766
    def test_clone(self):
581
767
        # clone into a nonlocal path works
582
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
583
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
584
 
        try:
585
 
            branch = bzrdir.BzrDir.create_branch_convenience('local')
586
 
        finally:
587
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
768
        format = bzrdir.format_registry.make_bzrdir('knit')
 
769
        branch = bzrdir.BzrDir.create_branch_convenience('local',
 
770
                                                         format=format)
588
771
        branch.bzrdir.open_workingtree()
589
772
        result = branch.bzrdir.clone(self.get_url('remote'))
590
773
        self.assertRaises(errors.NoWorkingTree,
592
775
        result.open_branch()
593
776
        result.open_repository()
594
777
 
 
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'