← 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: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

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
2
 
# 
 
1
# Copyright (C) 2006-2010 Canonical Ltd
 
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
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
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the BzrDir facility and any format specific tests.
18
18
 
19
 
For interface contract tests, see tests/bzr_dir_implementations.
 
19
For interface contract tests, see tests/per_bzr_dir.
20
20
"""
21
21
 
22
 
import os.path
23
 
from StringIO import StringIO
 
22
import os
24
23
import subprocess
25
24
import sys
26
25
 
29
28
    errors,
30
29
    help_topics,
31
30
    repository,
32
 
    symbol_versioning,
 
31
    osutils,
 
32
    remote,
33
33
    urlutils,
34
34
    win32utils,
35
35
    workingtree,
36
36
    )
37
37
import bzrlib.branch
38
38
from bzrlib.errors import (NotBranchError,
 
39
                           NoColocatedBranchSupport,
39
40
                           UnknownFormatError,
40
41
                           UnsupportedFormatError,
41
42
                           )
42
 
from bzrlib.symbol_versioning import (
43
 
    zero_ninetyone,
44
 
    )
45
43
from bzrlib.tests import (
46
44
    TestCase,
 
45
    TestCaseWithMemoryTransport,
47
46
    TestCaseWithTransport,
48
47
    TestSkipped,
49
 
    test_sftp_transport
50
48
    )
51
 
from bzrlib.tests.HttpServer import HttpServer
52
 
from bzrlib.tests.HTTPTestUtil import (
53
 
    TestCaseWithTwoWebservers,
54
 
    HTTPServerRedirecting,
 
49
from bzrlib.tests import(
 
50
    http_server,
 
51
    http_utils,
55
52
    )
56
53
from bzrlib.tests.test_http import TestWithTransport_pycurl
57
 
from bzrlib.transport import get_transport
 
54
from bzrlib.transport import (
 
55
    get_transport,
 
56
    memory,
 
57
    )
58
58
from bzrlib.transport.http._urllib import HttpTransport_urllib
59
 
from bzrlib.transport.memory import MemoryServer
60
 
from bzrlib.repofmt import knitrepo, weaverepo
 
59
from bzrlib.transport.nosmart import NoSmartTransportDecorator
 
60
from bzrlib.transport.readonly import ReadonlyTransportDecorator
 
61
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
61
62
 
62
63
 
63
64
class TestDefaultFormat(TestCase):
66
67
        old_format = bzrdir.BzrDirFormat.get_default_format()
67
68
        # default is BzrDirFormat6
68
69
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
69
 
        self.applyDeprecated(symbol_versioning.zero_fourteen, 
70
 
                             bzrdir.BzrDirFormat.set_default_format, 
71
 
                             SampleBzrDirFormat())
 
70
        bzrdir.BzrDirFormat._set_default_format(SampleBzrDirFormat())
72
71
        # creating a bzr dir should now create an instrumented dir.
73
72
        try:
74
73
            result = bzrdir.BzrDir.create('memory:///')
75
74
            self.failUnless(isinstance(result, SampleBzrDir))
76
75
        finally:
77
 
            self.applyDeprecated(symbol_versioning.zero_fourteen,
78
 
                bzrdir.BzrDirFormat.set_default_format, old_format)
 
76
            bzrdir.BzrDirFormat._set_default_format(old_format)
79
77
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
80
78
 
81
79
 
86
84
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
87
85
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
88
86
            ' repositories', deprecated=True)
89
 
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir', 
 
87
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
90
88
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
91
89
        my_format_registry.register_metadir('knit',
92
90
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
119
117
        my_bzrdir = my_format_registry.make_bzrdir('weave')
120
118
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
121
119
        my_bzrdir = my_format_registry.make_bzrdir('default')
122
 
        self.assertIsInstance(my_bzrdir.repository_format, 
 
120
        self.assertIsInstance(my_bzrdir.repository_format,
123
121
            knitrepo.RepositoryFormatKnit1)
124
122
        my_bzrdir = my_format_registry.make_bzrdir('knit')
125
 
        self.assertIsInstance(my_bzrdir.repository_format, 
 
123
        self.assertIsInstance(my_bzrdir.repository_format,
126
124
            knitrepo.RepositoryFormatKnit1)
127
125
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
128
126
        self.assertIsInstance(my_bzrdir.get_branch_format(),
132
130
        my_format_registry = self.make_format_registry()
133
131
        self.assertEqual('Format registered lazily',
134
132
                         my_format_registry.get_help('lazy'))
135
 
        self.assertEqual('Format using knits', 
 
133
        self.assertEqual('Format using knits',
136
134
                         my_format_registry.get_help('knit'))
137
 
        self.assertEqual('Format using knits', 
 
135
        self.assertEqual('Format using knits',
138
136
                         my_format_registry.get_help('default'))
139
137
        self.assertEqual('Pre-0.8 format.  Slower and does not support'
140
 
                         ' checkouts or shared repositories', 
 
138
                         ' checkouts or shared repositories',
141
139
                         my_format_registry.get_help('weave'))
142
 
        
 
140
 
143
141
    def test_help_topic(self):
144
142
        topics = help_topics.HelpTopicRegistry()
145
 
        topics.register('formats', self.make_format_registry().help_topic, 
146
 
                        'Directory formats')
147
 
        topic = topics.get_detail('formats')
148
 
        new, rest = topic.split('Experimental formats')
 
143
        registry = self.make_format_registry()
 
144
        topics.register('current-formats', registry.help_topic,
 
145
                        'Current formats')
 
146
        topics.register('other-formats', registry.help_topic,
 
147
                        'Other formats')
 
148
        new = topics.get_detail('current-formats')
 
149
        rest = topics.get_detail('other-formats')
149
150
        experimental, deprecated = rest.split('Deprecated formats')
150
 
        self.assertContainsRe(new, 'These formats can be used')
151
 
        self.assertContainsRe(new, 
 
151
        self.assertContainsRe(new, 'formats-help')
 
152
        self.assertContainsRe(new,
152
153
                ':knit:\n    \(native\) \(default\) Format using knits\n')
153
 
        self.assertContainsRe(experimental, 
 
154
        self.assertContainsRe(experimental,
154
155
                ':branch6:\n    \(native\) Experimental successor to knit')
155
 
        self.assertContainsRe(deprecated, 
 
156
        self.assertContainsRe(deprecated,
156
157
                ':lazy:\n    \(native\) Format registered lazily\n')
157
158
        self.assertNotContainsRe(new, 'hidden')
158
159
 
170
171
        finally:
171
172
            bzrdir.format_registry.set_default_repository(old_default)
172
173
 
 
174
    def test_aliases(self):
 
175
        a_registry = bzrdir.BzrDirFormatRegistry()
 
176
        a_registry.register('weave', bzrdir.BzrDirFormat6,
 
177
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
 
178
            ' repositories', deprecated=True)
 
179
        a_registry.register('weavealias', bzrdir.BzrDirFormat6,
 
180
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
 
181
            ' repositories', deprecated=True, alias=True)
 
182
        self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
 
183
 
173
184
 
174
185
class SampleBranch(bzrlib.branch.Branch):
175
186
    """A dummy branch for guess what, dummy use."""
178
189
        self.bzrdir = dir
179
190
 
180
191
 
 
192
class SampleRepository(bzrlib.repository.Repository):
 
193
    """A dummy repo."""
 
194
 
 
195
    def __init__(self, dir):
 
196
        self.bzrdir = dir
 
197
 
 
198
 
181
199
class SampleBzrDir(bzrdir.BzrDir):
182
200
    """A sample BzrDir implementation to allow testing static methods."""
183
201
 
187
205
 
188
206
    def open_repository(self):
189
207
        """See BzrDir.open_repository."""
190
 
        return "A repository"
 
208
        return SampleRepository(self)
191
209
 
192
 
    def create_branch(self):
 
210
    def create_branch(self, name=None):
193
211
        """See BzrDir.create_branch."""
 
212
        if name is not None:
 
213
            raise NoColocatedBranchSupport(self)
194
214
        return SampleBranch(self)
195
215
 
196
216
    def create_workingtree(self):
201
221
class SampleBzrDirFormat(bzrdir.BzrDirFormat):
202
222
    """A sample format
203
223
 
204
 
    this format is initializable, unsupported to aid in testing the 
 
224
    this format is initializable, unsupported to aid in testing the
205
225
    open and open_downlevel routines.
206
226
    """
207
227
 
228
248
    def test_find_format(self):
229
249
        # is the right format object found for a branch?
230
250
        # create a branch with a few known format objects.
231
 
        # this is not quite the same as 
 
251
        # this is not quite the same as
232
252
        t = get_transport(self.get_url())
233
253
        self.build_tree(["foo/", "bar/"], transport=t)
234
254
        def check_format(format, url):
238
258
            self.failUnless(isinstance(found_format, format.__class__))
239
259
        check_format(bzrdir.BzrDirFormat5(), "foo")
240
260
        check_format(bzrdir.BzrDirFormat6(), "bar")
241
 
        
 
261
 
242
262
    def test_find_format_nothing_there(self):
243
263
        self.assertRaises(NotBranchError,
244
264
                          bzrdir.BzrDirFormat.find_format,
271
291
        # now open_downlevel should fail too.
272
292
        self.assertRaises(UnknownFormatError, bzrdir.BzrDir.open_unsupported, url)
273
293
 
274
 
    def test_create_repository_deprecated(self):
275
 
        # new interface is to make the bzrdir, then a repository within that.
276
 
        format = SampleBzrDirFormat()
277
 
        repo = self.applyDeprecated(zero_ninetyone,
278
 
                bzrdir.BzrDir.create_repository,
279
 
                self.get_url(), format=format)
280
 
        self.assertEqual('A repository', repo)
281
 
 
282
 
    def test_create_repository_shared(self):
283
 
        # new interface is to make the bzrdir, then a repository within that.
284
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
285
 
        repo = self.applyDeprecated(zero_ninetyone,
286
 
                bzrdir.BzrDir.create_repository,
287
 
                '.', shared=True)
288
 
        self.assertTrue(repo.is_shared())
289
 
 
290
 
    def test_create_repository_nonshared(self):
291
 
        # new interface is to make the bzrdir, then a repository within that.
292
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
293
 
        repo = self.applyDeprecated(zero_ninetyone,
294
 
                bzrdir.BzrDir.create_repository,
295
 
                '.')
296
 
        self.assertFalse(repo.is_shared())
297
 
 
298
 
    def test_create_repository_under_shared(self):
299
 
        # an explicit create_repository always does so.
300
 
        # we trust the format is right from the 'create_repository test'
301
 
        # new interface is to make the bzrdir, then a repository within that.
302
 
        format = bzrdir.format_registry.make_bzrdir('knit')
303
 
        self.make_repository('.', shared=True, format=format)
304
 
        repo = self.applyDeprecated(zero_ninetyone,
305
 
                bzrdir.BzrDir.create_repository,
306
 
                self.get_url('child'),
307
 
                format=format)
308
 
        self.assertTrue(isinstance(repo, repository.Repository))
309
 
        self.assertTrue(repo.bzrdir.root_transport.base.endswith('child/'))
310
 
 
311
294
    def test_create_branch_and_repo_uses_default(self):
312
295
        format = SampleBzrDirFormat()
313
296
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url(),
325
308
                          branch.bzrdir.open_repository)
326
309
 
327
310
    def test_create_branch_and_repo_under_shared_force_new(self):
328
 
        # creating a branch and repo in a shared repo can be forced to 
 
311
        # creating a branch and repo in a shared repo can be forced to
329
312
        # make a new repo
330
313
        format = bzrdir.format_registry.make_bzrdir('knit')
331
314
        self.make_repository('.', shared=True, format=format)
336
319
 
337
320
    def test_create_standalone_working_tree(self):
338
321
        format = SampleBzrDirFormat()
339
 
        # note this is deliberately readonly, as this failure should 
 
322
        # note this is deliberately readonly, as this failure should
340
323
        # occur before any writes.
341
324
        self.assertRaises(errors.NotLocalUrl,
342
325
                          bzrdir.BzrDir.create_standalone_workingtree,
343
326
                          self.get_readonly_url(), format=format)
344
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('.', 
 
327
        tree = bzrdir.BzrDir.create_standalone_workingtree('.',
345
328
                                                           format=format)
346
329
        self.assertEqual('A tree', tree)
347
330
 
349
332
        # create standalone working tree always makes a repo.
350
333
        format = bzrdir.format_registry.make_bzrdir('knit')
351
334
        self.make_repository('.', shared=True, format=format)
352
 
        # note this is deliberately readonly, as this failure should 
 
335
        # note this is deliberately readonly, as this failure should
353
336
        # occur before any writes.
354
337
        self.assertRaises(errors.NotLocalUrl,
355
338
                          bzrdir.BzrDir.create_standalone_workingtree,
356
339
                          self.get_readonly_url('child'), format=format)
357
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('child', 
 
340
        tree = bzrdir.BzrDir.create_standalone_workingtree('child',
358
341
            format=format)
359
342
        tree.bzrdir.open_repository()
360
343
 
376
359
 
377
360
    def test_create_branch_convenience_root(self):
378
361
        """Creating a branch at the root of a fs should work."""
379
 
        self.vfs_transport_factory = MemoryServer
 
362
        self.vfs_transport_factory = memory.MemoryServer
380
363
        # outside a repo the default convenience output is a repo+branch_tree
381
364
        format = bzrdir.format_registry.make_bzrdir('knit')
382
 
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(), 
 
365
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
383
366
                                                         format=format)
384
367
        self.assertRaises(errors.NoWorkingTree,
385
368
                          branch.bzrdir.open_workingtree)
395
378
        branch.bzrdir.open_workingtree()
396
379
        self.assertRaises(errors.NoRepositoryPresent,
397
380
                          branch.bzrdir.open_repository)
398
 
            
 
381
 
399
382
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
400
383
        # inside a repo the default convenience output is a branch+ follow the
401
384
        # repo tree policy but we can override that
407
390
                          branch.bzrdir.open_workingtree)
408
391
        self.assertRaises(errors.NoRepositoryPresent,
409
392
                          branch.bzrdir.open_repository)
410
 
            
 
393
 
411
394
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
412
395
        # inside a repo the default convenience output is a branch+ follow the
413
396
        # repo tree policy
414
397
        format = bzrdir.format_registry.make_bzrdir('knit')
415
398
        repo = self.make_repository('.', shared=True, format=format)
416
399
        repo.set_make_working_trees(False)
417
 
        branch = bzrdir.BzrDir.create_branch_convenience('child', 
 
400
        branch = bzrdir.BzrDir.create_branch_convenience('child',
418
401
                                                         format=format)
419
402
        self.assertRaises(errors.NoWorkingTree,
420
403
                          branch.bzrdir.open_workingtree)
444
427
        branch.bzrdir.open_workingtree()
445
428
 
446
429
 
 
430
class TestRepositoryAcquisitionPolicy(TestCaseWithTransport):
 
431
 
 
432
    def test_acquire_repository_standalone(self):
 
433
        """The default acquisition policy should create a standalone branch."""
 
434
        my_bzrdir = self.make_bzrdir('.')
 
435
        repo_policy = my_bzrdir.determine_repository_policy()
 
436
        repo, is_new = repo_policy.acquire_repository()
 
437
        self.assertEqual(repo.bzrdir.root_transport.base,
 
438
                         my_bzrdir.root_transport.base)
 
439
        self.assertFalse(repo.is_shared())
 
440
 
 
441
    def test_determine_stacking_policy(self):
 
442
        parent_bzrdir = self.make_bzrdir('.')
 
443
        child_bzrdir = self.make_bzrdir('child')
 
444
        parent_bzrdir.get_config().set_default_stack_on('http://example.org')
 
445
        repo_policy = child_bzrdir.determine_repository_policy()
 
446
        self.assertEqual('http://example.org', repo_policy._stack_on)
 
447
 
 
448
    def test_determine_stacking_policy_relative(self):
 
449
        parent_bzrdir = self.make_bzrdir('.')
 
450
        child_bzrdir = self.make_bzrdir('child')
 
451
        parent_bzrdir.get_config().set_default_stack_on('child2')
 
452
        repo_policy = child_bzrdir.determine_repository_policy()
 
453
        self.assertEqual('child2', repo_policy._stack_on)
 
454
        self.assertEqual(parent_bzrdir.root_transport.base,
 
455
                         repo_policy._stack_on_pwd)
 
456
 
 
457
    def prepare_default_stacking(self, child_format='1.6'):
 
458
        parent_bzrdir = self.make_bzrdir('.')
 
459
        child_branch = self.make_branch('child', format=child_format)
 
460
        parent_bzrdir.get_config().set_default_stack_on(child_branch.base)
 
461
        new_child_transport = parent_bzrdir.transport.clone('child2')
 
462
        return child_branch, new_child_transport
 
463
 
 
464
    def test_clone_on_transport_obeys_stacking_policy(self):
 
465
        child_branch, new_child_transport = self.prepare_default_stacking()
 
466
        new_child = child_branch.bzrdir.clone_on_transport(new_child_transport)
 
467
        self.assertEqual(child_branch.base,
 
468
                         new_child.open_branch().get_stacked_on_url())
 
469
 
 
470
    def test_default_stacking_with_stackable_branch_unstackable_repo(self):
 
471
        # Make stackable source branch with an unstackable repo format.
 
472
        source_bzrdir = self.make_bzrdir('source')
 
473
        pack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
 
474
        source_branch = bzrlib.branch.BzrBranchFormat7().initialize(
 
475
            source_bzrdir)
 
476
        # Make a directory with a default stacking policy
 
477
        parent_bzrdir = self.make_bzrdir('parent')
 
478
        stacked_on = self.make_branch('parent/stacked-on', format='pack-0.92')
 
479
        parent_bzrdir.get_config().set_default_stack_on(stacked_on.base)
 
480
        # Clone source into directory
 
481
        target = source_bzrdir.clone(self.get_url('parent/target'))
 
482
 
 
483
    def test_sprout_obeys_stacking_policy(self):
 
484
        child_branch, new_child_transport = self.prepare_default_stacking()
 
485
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
 
486
        self.assertEqual(child_branch.base,
 
487
                         new_child.open_branch().get_stacked_on_url())
 
488
 
 
489
    def test_clone_ignores_policy_for_unsupported_formats(self):
 
490
        child_branch, new_child_transport = self.prepare_default_stacking(
 
491
            child_format='pack-0.92')
 
492
        new_child = child_branch.bzrdir.clone_on_transport(new_child_transport)
 
493
        self.assertRaises(errors.UnstackableBranchFormat,
 
494
                          new_child.open_branch().get_stacked_on_url)
 
495
 
 
496
    def test_sprout_ignores_policy_for_unsupported_formats(self):
 
497
        child_branch, new_child_transport = self.prepare_default_stacking(
 
498
            child_format='pack-0.92')
 
499
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
 
500
        self.assertRaises(errors.UnstackableBranchFormat,
 
501
                          new_child.open_branch().get_stacked_on_url)
 
502
 
 
503
    def test_sprout_upgrades_format_if_stacked_specified(self):
 
504
        child_branch, new_child_transport = self.prepare_default_stacking(
 
505
            child_format='pack-0.92')
 
506
        new_child = child_branch.bzrdir.sprout(new_child_transport.base,
 
507
                                               stacked=True)
 
508
        self.assertEqual(child_branch.bzrdir.root_transport.base,
 
509
                         new_child.open_branch().get_stacked_on_url())
 
510
        repo = new_child.open_repository()
 
511
        self.assertTrue(repo._format.supports_external_lookups)
 
512
        self.assertFalse(repo.supports_rich_root())
 
513
 
 
514
    def test_clone_on_transport_upgrades_format_if_stacked_on_specified(self):
 
515
        child_branch, new_child_transport = self.prepare_default_stacking(
 
516
            child_format='pack-0.92')
 
517
        new_child = child_branch.bzrdir.clone_on_transport(new_child_transport,
 
518
            stacked_on=child_branch.bzrdir.root_transport.base)
 
519
        self.assertEqual(child_branch.bzrdir.root_transport.base,
 
520
                         new_child.open_branch().get_stacked_on_url())
 
521
        repo = new_child.open_repository()
 
522
        self.assertTrue(repo._format.supports_external_lookups)
 
523
        self.assertFalse(repo.supports_rich_root())
 
524
 
 
525
    def test_sprout_upgrades_to_rich_root_format_if_needed(self):
 
526
        child_branch, new_child_transport = self.prepare_default_stacking(
 
527
            child_format='rich-root-pack')
 
528
        new_child = child_branch.bzrdir.sprout(new_child_transport.base,
 
529
                                               stacked=True)
 
530
        repo = new_child.open_repository()
 
531
        self.assertTrue(repo._format.supports_external_lookups)
 
532
        self.assertTrue(repo.supports_rich_root())
 
533
 
 
534
    def test_add_fallback_repo_handles_absolute_urls(self):
 
535
        stack_on = self.make_branch('stack_on', format='1.6')
 
536
        repo = self.make_repository('repo', format='1.6')
 
537
        policy = bzrdir.UseExistingRepository(repo, stack_on.base)
 
538
        policy._add_fallback(repo)
 
539
 
 
540
    def test_add_fallback_repo_handles_relative_urls(self):
 
541
        stack_on = self.make_branch('stack_on', format='1.6')
 
542
        repo = self.make_repository('repo', format='1.6')
 
543
        policy = bzrdir.UseExistingRepository(repo, '.', stack_on.base)
 
544
        policy._add_fallback(repo)
 
545
 
 
546
    def test_configure_relative_branch_stacking_url(self):
 
547
        stack_on = self.make_branch('stack_on', format='1.6')
 
548
        stacked = self.make_branch('stack_on/stacked', format='1.6')
 
549
        policy = bzrdir.UseExistingRepository(stacked.repository,
 
550
            '.', stack_on.base)
 
551
        policy.configure_branch(stacked)
 
552
        self.assertEqual('..', stacked.get_stacked_on_url())
 
553
 
 
554
    def test_relative_branch_stacking_to_absolute(self):
 
555
        stack_on = self.make_branch('stack_on', format='1.6')
 
556
        stacked = self.make_branch('stack_on/stacked', format='1.6')
 
557
        policy = bzrdir.UseExistingRepository(stacked.repository,
 
558
            '.', self.get_readonly_url('stack_on'))
 
559
        policy.configure_branch(stacked)
 
560
        self.assertEqual(self.get_readonly_url('stack_on'),
 
561
                         stacked.get_stacked_on_url())
 
562
 
 
563
 
447
564
class ChrootedTests(TestCaseWithTransport):
448
565
    """A support class that provides readonly urls outside the local namespace.
449
566
 
454
571
 
455
572
    def setUp(self):
456
573
        super(ChrootedTests, self).setUp()
457
 
        if not self.vfs_transport_factory == MemoryServer:
458
 
            self.transport_readonly_server = HttpServer
 
574
        if not self.vfs_transport_factory == memory.MemoryServer:
 
575
            self.transport_readonly_server = http_server.HttpServer
 
576
 
 
577
    def local_branch_path(self, branch):
 
578
         return os.path.realpath(urlutils.local_path_from_url(branch.base))
459
579
 
460
580
    def test_open_containing(self):
461
581
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing,
468
588
        branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url('g/p/q'))
469
589
        self.assertEqual('g/p/q', relpath)
470
590
 
 
591
    def test_open_containing_tree_branch_or_repository_empty(self):
 
592
        self.assertRaises(errors.NotBranchError,
 
593
            bzrdir.BzrDir.open_containing_tree_branch_or_repository,
 
594
            self.get_readonly_url(''))
 
595
 
 
596
    def test_open_containing_tree_branch_or_repository_all(self):
 
597
        self.make_branch_and_tree('topdir')
 
598
        tree, branch, repo, relpath = \
 
599
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
 
600
                'topdir/foo')
 
601
        self.assertEqual(os.path.realpath('topdir'),
 
602
                         os.path.realpath(tree.basedir))
 
603
        self.assertEqual(os.path.realpath('topdir'),
 
604
                         self.local_branch_path(branch))
 
605
        self.assertEqual(
 
606
            osutils.realpath(os.path.join('topdir', '.bzr', 'repository')),
 
607
            repo.bzrdir.transport.local_abspath('repository'))
 
608
        self.assertEqual(relpath, 'foo')
 
609
 
 
610
    def test_open_containing_tree_branch_or_repository_no_tree(self):
 
611
        self.make_branch('branch')
 
612
        tree, branch, repo, relpath = \
 
613
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
 
614
                'branch/foo')
 
615
        self.assertEqual(tree, None)
 
616
        self.assertEqual(os.path.realpath('branch'),
 
617
                         self.local_branch_path(branch))
 
618
        self.assertEqual(
 
619
            osutils.realpath(os.path.join('branch', '.bzr', 'repository')),
 
620
            repo.bzrdir.transport.local_abspath('repository'))
 
621
        self.assertEqual(relpath, 'foo')
 
622
 
 
623
    def test_open_containing_tree_branch_or_repository_repo(self):
 
624
        self.make_repository('repo')
 
625
        tree, branch, repo, relpath = \
 
626
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
 
627
                'repo')
 
628
        self.assertEqual(tree, None)
 
629
        self.assertEqual(branch, None)
 
630
        self.assertEqual(
 
631
            osutils.realpath(os.path.join('repo', '.bzr', 'repository')),
 
632
            repo.bzrdir.transport.local_abspath('repository'))
 
633
        self.assertEqual(relpath, '')
 
634
 
 
635
    def test_open_containing_tree_branch_or_repository_shared_repo(self):
 
636
        self.make_repository('shared', shared=True)
 
637
        bzrdir.BzrDir.create_branch_convenience('shared/branch',
 
638
                                                force_new_tree=False)
 
639
        tree, branch, repo, relpath = \
 
640
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
 
641
                'shared/branch')
 
642
        self.assertEqual(tree, None)
 
643
        self.assertEqual(os.path.realpath('shared/branch'),
 
644
                         self.local_branch_path(branch))
 
645
        self.assertEqual(
 
646
            osutils.realpath(os.path.join('shared', '.bzr', 'repository')),
 
647
            repo.bzrdir.transport.local_abspath('repository'))
 
648
        self.assertEqual(relpath, '')
 
649
 
 
650
    def test_open_containing_tree_branch_or_repository_branch_subdir(self):
 
651
        self.make_branch_and_tree('foo')
 
652
        self.build_tree(['foo/bar/'])
 
653
        tree, branch, repo, relpath = \
 
654
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
 
655
                'foo/bar')
 
656
        self.assertEqual(os.path.realpath('foo'),
 
657
                         os.path.realpath(tree.basedir))
 
658
        self.assertEqual(os.path.realpath('foo'),
 
659
                         self.local_branch_path(branch))
 
660
        self.assertEqual(
 
661
            osutils.realpath(os.path.join('foo', '.bzr', 'repository')),
 
662
            repo.bzrdir.transport.local_abspath('repository'))
 
663
        self.assertEqual(relpath, 'bar')
 
664
 
 
665
    def test_open_containing_tree_branch_or_repository_repo_subdir(self):
 
666
        self.make_repository('bar')
 
667
        self.build_tree(['bar/baz/'])
 
668
        tree, branch, repo, relpath = \
 
669
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
 
670
                'bar/baz')
 
671
        self.assertEqual(tree, None)
 
672
        self.assertEqual(branch, None)
 
673
        self.assertEqual(
 
674
            osutils.realpath(os.path.join('bar', '.bzr', 'repository')),
 
675
            repo.bzrdir.transport.local_abspath('repository'))
 
676
        self.assertEqual(relpath, 'baz')
 
677
 
471
678
    def test_open_containing_from_transport(self):
472
679
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport,
473
680
                          get_transport(self.get_readonly_url('')))
482
689
        self.assertEqual('g/p/q', relpath)
483
690
 
484
691
    def test_open_containing_tree_or_branch(self):
485
 
        def local_branch_path(branch):
486
 
             return os.path.realpath(
487
 
                urlutils.local_path_from_url(branch.base))
488
 
 
489
692
        self.make_branch_and_tree('topdir')
490
693
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
491
694
            'topdir/foo')
492
695
        self.assertEqual(os.path.realpath('topdir'),
493
696
                         os.path.realpath(tree.basedir))
494
697
        self.assertEqual(os.path.realpath('topdir'),
495
 
                         local_branch_path(branch))
 
698
                         self.local_branch_path(branch))
496
699
        self.assertIs(tree.bzrdir, branch.bzrdir)
497
700
        self.assertEqual('foo', relpath)
498
701
        # opening from non-local should not return the tree
506
709
            'topdir/foo')
507
710
        self.assertIs(tree, None)
508
711
        self.assertEqual(os.path.realpath('topdir/foo'),
509
 
                         local_branch_path(branch))
 
712
                         self.local_branch_path(branch))
510
713
        self.assertEqual('', relpath)
511
714
 
512
715
    def test_open_tree_or_branch(self):
513
 
        def local_branch_path(branch):
514
 
             return os.path.realpath(
515
 
                urlutils.local_path_from_url(branch.base))
516
 
 
517
716
        self.make_branch_and_tree('topdir')
518
717
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir')
519
718
        self.assertEqual(os.path.realpath('topdir'),
520
719
                         os.path.realpath(tree.basedir))
521
720
        self.assertEqual(os.path.realpath('topdir'),
522
 
                         local_branch_path(branch))
 
721
                         self.local_branch_path(branch))
523
722
        self.assertIs(tree.bzrdir, branch.bzrdir)
524
723
        # opening from non-local should not return the tree
525
724
        tree, branch = bzrdir.BzrDir.open_tree_or_branch(
530
729
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir/foo')
531
730
        self.assertIs(tree, None)
532
731
        self.assertEqual(os.path.realpath('topdir/foo'),
533
 
                         local_branch_path(branch))
 
732
                         self.local_branch_path(branch))
534
733
 
535
734
    def test_open_from_transport(self):
536
735
        # transport pointing at bzrdir should give a bzrdir with root transport
540
739
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
541
740
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
542
741
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
543
 
        
 
742
 
544
743
    def test_open_from_transport_no_bzrdir(self):
545
744
        transport = get_transport(self.get_url())
546
745
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
555
754
                          transport)
556
755
 
557
756
    def test_sprout_recursive(self):
558
 
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
 
757
        tree = self.make_branch_and_tree('tree1',
 
758
                                         format='dirstate-with-subtree')
559
759
        sub_tree = self.make_branch_and_tree('tree1/subtree',
560
760
            format='dirstate-with-subtree')
 
761
        sub_tree.set_root_id('subtree-root')
561
762
        tree.add_reference(sub_tree)
562
763
        self.build_tree(['tree1/subtree/file'])
563
764
        sub_tree.add('file')
564
765
        tree.commit('Initial commit')
565
 
        tree.bzrdir.sprout('tree2')
 
766
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
767
        tree2.lock_read()
 
768
        self.addCleanup(tree2.unlock)
566
769
        self.failUnlessExists('tree2/subtree/file')
 
770
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
567
771
 
568
772
    def test_cloning_metadir(self):
569
773
        """Ensure that cloning metadir is suitable"""
695
899
 
696
900
    def test_needs_conversion_different_working_tree(self):
697
901
        # meta1dirs need an conversion if any element is not the default.
698
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
699
 
        # test with 
700
 
        new_default = bzrdir.format_registry.make_bzrdir('dirstate')
701
 
        bzrdir.BzrDirFormat._set_default_format(new_default)
702
 
        try:
703
 
            tree = self.make_branch_and_tree('tree', format='knit')
704
 
            self.assertTrue(tree.bzrdir.needs_format_conversion())
705
 
        finally:
706
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
902
        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
 
903
        tree = self.make_branch_and_tree('tree', format='knit')
 
904
        self.assertTrue(tree.bzrdir.needs_format_conversion(
 
905
            new_format))
 
906
 
 
907
    def test_initialize_on_format_uses_smart_transport(self):
 
908
        self.setup_smart_server_with_call_log()
 
909
        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
 
910
        transport = self.get_transport('target')
 
911
        transport.ensure_base()
 
912
        self.reset_smart_call_log()
 
913
        instance = new_format.initialize_on_transport(transport)
 
914
        self.assertIsInstance(instance, remote.RemoteBzrDir)
 
915
        rpc_count = len(self.hpss_calls)
 
916
        # This figure represent the amount of work to perform this use case. It
 
917
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
918
        # being too low. If rpc_count increases, more network roundtrips have
 
919
        # become necessary for this use case. Please do not adjust this number
 
920
        # upwards without agreement from bzr's network support maintainers.
 
921
        self.assertEqual(2, rpc_count)
707
922
 
708
923
 
709
924
class TestFormat5(TestCaseWithTransport):
710
925
    """Tests specific to the version 5 bzrdir format."""
711
926
 
712
927
    def test_same_lockfiles_between_tree_repo_branch(self):
713
 
        # this checks that only a single lockfiles instance is created 
 
928
        # this checks that only a single lockfiles instance is created
714
929
        # for format 5 objects
715
930
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
716
931
        def check_dir_components_use_same_lock(dir):
723
938
        # and if we open it normally.
724
939
        dir = bzrdir.BzrDir.open(self.get_url())
725
940
        check_dir_components_use_same_lock(dir)
726
 
    
 
941
 
727
942
    def test_can_convert(self):
728
943
        # format 5 dirs are convertable
729
944
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
730
945
        self.assertTrue(dir.can_convert_format())
731
 
    
 
946
 
732
947
    def test_needs_conversion(self):
733
 
        # format 5 dirs need a conversion if they are not the default.
734
 
        # and they start of not the default.
735
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
736
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
737
 
        try:
738
 
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
739
 
            self.assertFalse(dir.needs_format_conversion())
740
 
        finally:
741
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
742
 
        self.assertTrue(dir.needs_format_conversion())
 
948
        # format 5 dirs need a conversion if they are not the default,
 
949
        # and they aren't
 
950
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
 
951
        # don't need to convert it to itself
 
952
        self.assertFalse(dir.needs_format_conversion(bzrdir.BzrDirFormat5()))
 
953
        # do need to convert it to the current default
 
954
        self.assertTrue(dir.needs_format_conversion(
 
955
            bzrdir.BzrDirFormat.get_default_format()))
743
956
 
744
957
 
745
958
class TestFormat6(TestCaseWithTransport):
746
959
    """Tests specific to the version 6 bzrdir format."""
747
960
 
748
961
    def test_same_lockfiles_between_tree_repo_branch(self):
749
 
        # this checks that only a single lockfiles instance is created 
 
962
        # this checks that only a single lockfiles instance is created
750
963
        # for format 6 objects
751
964
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
752
965
        def check_dir_components_use_same_lock(dir):
759
972
        # and if we open it normally.
760
973
        dir = bzrdir.BzrDir.open(self.get_url())
761
974
        check_dir_components_use_same_lock(dir)
762
 
    
 
975
 
763
976
    def test_can_convert(self):
764
977
        # format 6 dirs are convertable
765
978
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
766
979
        self.assertTrue(dir.can_convert_format())
767
 
    
 
980
 
768
981
    def test_needs_conversion(self):
769
982
        # format 6 dirs need an conversion if they are not the default.
770
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
771
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
772
 
        try:
773
 
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
774
 
            self.assertTrue(dir.needs_format_conversion())
775
 
        finally:
776
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
983
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
 
984
        self.assertTrue(dir.needs_format_conversion(
 
985
            bzrdir.BzrDirFormat.get_default_format()))
777
986
 
778
987
 
779
988
class NotBzrDir(bzrlib.bzrdir.BzrDir):
810
1019
 
811
1020
class TestNotBzrDir(TestCaseWithTransport):
812
1021
    """Tests for using the bzrdir api with a non .bzr based disk format.
813
 
    
 
1022
 
814
1023
    If/when one of these is in the core, we can let the implementation tests
815
1024
    verify this works.
816
1025
    """
817
1026
 
818
1027
    def test_create_and_find_format(self):
819
 
        # create a .notbzr dir 
 
1028
        # create a .notbzr dir
820
1029
        format = NotBzrDirFormat()
821
1030
        dir = format.initialize(self.get_url())
822
1031
        self.assertIsInstance(dir, NotBzrDir)
846
1055
 
847
1056
    def setUp(self):
848
1057
        super(NonLocalTests, self).setUp()
849
 
        self.vfs_transport_factory = MemoryServer
850
 
    
 
1058
        self.vfs_transport_factory = memory.MemoryServer
 
1059
 
851
1060
    def test_create_branch_convenience(self):
852
1061
        # outside a repo the default convenience output is a repo+branch_tree
853
1062
        format = bzrdir.format_registry.make_bzrdir('knit')
890
1099
                              workingtree.WorkingTreeFormat3)
891
1100
 
892
1101
 
893
 
class TestHTTPRedirectionLoop(object):
894
 
    """Test redirection loop between two http servers.
 
1102
class TestHTTPRedirections(object):
 
1103
    """Test redirection between two http servers.
895
1104
 
896
1105
    This MUST be used by daughter classes that also inherit from
897
1106
    TestCaseWithTwoWebservers.
898
1107
 
899
1108
    We can't inherit directly from TestCaseWithTwoWebservers or the
900
1109
    test framework will try to create an instance which cannot
901
 
    run, its implementation being incomplete. 
 
1110
    run, its implementation being incomplete.
902
1111
    """
903
1112
 
904
 
    # Should be defined by daughter classes to ensure redirection
905
 
    # still use the same transport implementation (not currently
906
 
    # enforced as it's a bit tricky to get right (see the FIXME
907
 
    # in BzrDir.open_from_transport for the unique use case so
908
 
    # far)
909
 
    _qualifier = None
910
 
 
911
1113
    def create_transport_readonly_server(self):
912
 
        return HTTPServerRedirecting()
 
1114
        return http_utils.HTTPServerRedirecting()
913
1115
 
914
1116
    def create_transport_secondary_server(self):
915
 
        return HTTPServerRedirecting()
 
1117
        return http_utils.HTTPServerRedirecting()
916
1118
 
917
1119
    def setUp(self):
918
 
        # Both servers redirect to each server creating a loop
919
 
        super(TestHTTPRedirectionLoop, self).setUp()
 
1120
        super(TestHTTPRedirections, self).setUp()
920
1121
        # The redirections will point to the new server
921
1122
        self.new_server = self.get_readonly_server()
922
1123
        # The requests to the old server will be redirected
923
1124
        self.old_server = self.get_secondary_server()
924
1125
        # Configure the redirections
925
1126
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
 
1127
 
 
1128
    def test_loop(self):
 
1129
        # Both servers redirect to each other creating a loop
926
1130
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
927
 
 
928
 
    def _qualified_url(self, host, port):
929
 
        return 'http+%s://%s:%s' % (self._qualifier, host, port)
930
 
 
931
 
    def test_loop(self):
932
1131
        # Starting from either server should loop
933
 
        old_url = self._qualified_url(self.old_server.host, 
 
1132
        old_url = self._qualified_url(self.old_server.host,
934
1133
                                      self.old_server.port)
935
1134
        oldt = self._transport(old_url)
936
1135
        self.assertRaises(errors.NotBranchError,
937
1136
                          bzrdir.BzrDir.open_from_transport, oldt)
938
 
        new_url = self._qualified_url(self.new_server.host, 
 
1137
        new_url = self._qualified_url(self.new_server.host,
939
1138
                                      self.new_server.port)
940
1139
        newt = self._transport(new_url)
941
1140
        self.assertRaises(errors.NotBranchError,
942
1141
                          bzrdir.BzrDir.open_from_transport, newt)
943
1142
 
944
 
 
945
 
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop,
946
 
                                  TestCaseWithTwoWebservers):
 
1143
    def test_qualifier_preserved(self):
 
1144
        wt = self.make_branch_and_tree('branch')
 
1145
        old_url = self._qualified_url(self.old_server.host,
 
1146
                                      self.old_server.port)
 
1147
        start = self._transport(old_url).clone('branch')
 
1148
        bdir = bzrdir.BzrDir.open_from_transport(start)
 
1149
        # Redirection should preserve the qualifier, hence the transport class
 
1150
        # itself.
 
1151
        self.assertIsInstance(bdir.root_transport, type(start))
 
1152
 
 
1153
 
 
1154
class TestHTTPRedirections_urllib(TestHTTPRedirections,
 
1155
                                  http_utils.TestCaseWithTwoWebservers):
947
1156
    """Tests redirections for urllib implementation"""
948
1157
 
949
 
    _qualifier = 'urllib'
950
1158
    _transport = HttpTransport_urllib
951
1159
 
 
1160
    def _qualified_url(self, host, port):
 
1161
        result = 'http+urllib://%s:%s' % (host, port)
 
1162
        self.permit_url(result)
 
1163
        return result
 
1164
 
952
1165
 
953
1166
 
954
1167
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
955
 
                                  TestHTTPRedirectionLoop,
956
 
                                  TestCaseWithTwoWebservers):
 
1168
                                  TestHTTPRedirections,
 
1169
                                  http_utils.TestCaseWithTwoWebservers):
957
1170
    """Tests redirections for pycurl implementation"""
958
1171
 
959
 
    _qualifier = 'pycurl'
 
1172
    def _qualified_url(self, host, port):
 
1173
        result = 'http+pycurl://%s:%s' % (host, port)
 
1174
        self.permit_url(result)
 
1175
        return result
 
1176
 
 
1177
 
 
1178
class TestHTTPRedirections_nosmart(TestHTTPRedirections,
 
1179
                                  http_utils.TestCaseWithTwoWebservers):
 
1180
    """Tests redirections for the nosmart decorator"""
 
1181
 
 
1182
    _transport = NoSmartTransportDecorator
 
1183
 
 
1184
    def _qualified_url(self, host, port):
 
1185
        result = 'nosmart+http://%s:%s' % (host, port)
 
1186
        self.permit_url(result)
 
1187
        return result
 
1188
 
 
1189
 
 
1190
class TestHTTPRedirections_readonly(TestHTTPRedirections,
 
1191
                                    http_utils.TestCaseWithTwoWebservers):
 
1192
    """Tests redirections for readonly decoratror"""
 
1193
 
 
1194
    _transport = ReadonlyTransportDecorator
 
1195
 
 
1196
    def _qualified_url(self, host, port):
 
1197
        result = 'readonly+http://%s:%s' % (host, port)
 
1198
        self.permit_url(result)
 
1199
        return result
960
1200
 
961
1201
 
962
1202
class TestDotBzrHidden(TestCaseWithTransport):
986
1226
        b = bzrdir.BzrDir.create(urlutils.local_path_to_url('.'))
987
1227
        self.build_tree(['a'])
988
1228
        self.assertEquals(['a'], self.get_ls())
 
1229
 
 
1230
 
 
1231
class _TestBzrDirFormat(bzrdir.BzrDirMetaFormat1):
 
1232
    """Test BzrDirFormat implementation for TestBzrDirSprout."""
 
1233
 
 
1234
    def _open(self, transport):
 
1235
        return _TestBzrDir(transport, self)
 
1236
 
 
1237
 
 
1238
class _TestBzrDir(bzrdir.BzrDirMeta1):
 
1239
    """Test BzrDir implementation for TestBzrDirSprout.
 
1240
 
 
1241
    When created a _TestBzrDir already has repository and a branch.  The branch
 
1242
    is a test double as well.
 
1243
    """
 
1244
 
 
1245
    def __init__(self, *args, **kwargs):
 
1246
        super(_TestBzrDir, self).__init__(*args, **kwargs)
 
1247
        self.test_branch = _TestBranch()
 
1248
        self.test_branch.repository = self.create_repository()
 
1249
 
 
1250
    def open_branch(self, unsupported=False):
 
1251
        return self.test_branch
 
1252
 
 
1253
    def cloning_metadir(self, require_stacking=False):
 
1254
        return _TestBzrDirFormat()
 
1255
 
 
1256
 
 
1257
class _TestBranchFormat(bzrlib.branch.BranchFormat):
 
1258
    """Test Branch format for TestBzrDirSprout."""
 
1259
 
 
1260
 
 
1261
class _TestBranch(bzrlib.branch.Branch):
 
1262
    """Test Branch implementation for TestBzrDirSprout."""
 
1263
 
 
1264
    def __init__(self, *args, **kwargs):
 
1265
        self._format = _TestBranchFormat()
 
1266
        super(_TestBranch, self).__init__(*args, **kwargs)
 
1267
        self.calls = []
 
1268
        self._parent = None
 
1269
 
 
1270
    def sprout(self, *args, **kwargs):
 
1271
        self.calls.append('sprout')
 
1272
        return _TestBranch()
 
1273
 
 
1274
    def copy_content_into(self, destination, revision_id=None):
 
1275
        self.calls.append('copy_content_into')
 
1276
 
 
1277
    def get_parent(self):
 
1278
        return self._parent
 
1279
 
 
1280
    def set_parent(self, parent):
 
1281
        self._parent = parent
 
1282
 
 
1283
 
 
1284
class TestBzrDirSprout(TestCaseWithMemoryTransport):
 
1285
 
 
1286
    def test_sprout_uses_branch_sprout(self):
 
1287
        """BzrDir.sprout calls Branch.sprout.
 
1288
 
 
1289
        Usually, BzrDir.sprout should delegate to the branch's sprout method
 
1290
        for part of the work.  This allows the source branch to control the
 
1291
        choice of format for the new branch.
 
1292
 
 
1293
        There are exceptions, but this tests avoids them:
 
1294
          - if there's no branch in the source bzrdir,
 
1295
          - or if the stacking has been requested and the format needs to be
 
1296
            overridden to satisfy that.
 
1297
        """
 
1298
        # Make an instrumented bzrdir.
 
1299
        t = self.get_transport('source')
 
1300
        t.ensure_base()
 
1301
        source_bzrdir = _TestBzrDirFormat().initialize_on_transport(t)
 
1302
        # The instrumented bzrdir has a test_branch attribute that logs calls
 
1303
        # made to the branch contained in that bzrdir.  Initially the test
 
1304
        # branch exists but no calls have been made to it.
 
1305
        self.assertEqual([], source_bzrdir.test_branch.calls)
 
1306
 
 
1307
        # Sprout the bzrdir
 
1308
        target_url = self.get_url('target')
 
1309
        result = source_bzrdir.sprout(target_url, recurse='no')
 
1310
 
 
1311
        # The bzrdir called the branch's sprout method.
 
1312
        self.assertSubset(['sprout'], source_bzrdir.test_branch.calls)
 
1313
 
 
1314
    def test_sprout_parent(self):
 
1315
        grandparent_tree = self.make_branch('grandparent')
 
1316
        parent = grandparent_tree.bzrdir.sprout('parent').open_branch()
 
1317
        branch_tree = parent.bzrdir.sprout('branch').open_branch()
 
1318
        self.assertContainsRe(branch_tree.get_parent(), '/parent/$')
 
1319
 
 
1320
 
 
1321
class TestBzrDirHooks(TestCaseWithMemoryTransport):
 
1322
 
 
1323
    def test_pre_open_called(self):
 
1324
        calls = []
 
1325
        bzrdir.BzrDir.hooks.install_named_hook('pre_open', calls.append, None)
 
1326
        transport = self.get_transport('foo')
 
1327
        url = transport.base
 
1328
        self.assertRaises(errors.NotBranchError, bzrdir.BzrDir.open, url)
 
1329
        self.assertEqual([transport.base], [t.base for t in calls])
 
1330
 
 
1331
    def test_pre_open_actual_exceptions_raised(self):
 
1332
        count = [0]
 
1333
        def fail_once(transport):
 
1334
            count[0] += 1
 
1335
            if count[0] == 1:
 
1336
                raise errors.BzrError("fail")
 
1337
        bzrdir.BzrDir.hooks.install_named_hook('pre_open', fail_once, None)
 
1338
        transport = self.get_transport('foo')
 
1339
        url = transport.base
 
1340
        err = self.assertRaises(errors.BzrError, bzrdir.BzrDir.open, url)
 
1341
        self.assertEqual('fail', err._preformatted_string)