~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Martin Pool
  • Date: 2008-05-08 04:12:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080508041206-tkrr8ucmcyrlzkum
Some review cleanups for assertion removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2005, 2006, 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for the BzrDir facility and any format specific tests.
18
18
 
19
 
For interface contract tests, see tests/per_bzr_dir.
 
19
For interface contract tests, see tests/bzr_dir_implementations.
20
20
"""
21
21
 
22
 
import os
 
22
import os.path
 
23
from StringIO import StringIO
23
24
import subprocess
24
25
import sys
25
26
 
28
29
    errors,
29
30
    help_topics,
30
31
    repository,
31
 
    osutils,
32
 
    remote,
 
32
    symbol_versioning,
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,
40
39
                           UnknownFormatError,
41
40
                           UnsupportedFormatError,
42
41
                           )
 
42
from bzrlib.symbol_versioning import (
 
43
    zero_ninetyone,
 
44
    )
43
45
from bzrlib.tests import (
44
46
    TestCase,
45
 
    TestCaseWithMemoryTransport,
46
47
    TestCaseWithTransport,
47
48
    TestSkipped,
 
49
    test_sftp_transport
48
50
    )
49
 
from bzrlib.tests import(
50
 
    http_server,
51
 
    http_utils,
 
51
from bzrlib.tests.http_server import HttpServer
 
52
from bzrlib.tests.http_utils import (
 
53
    TestCaseWithTwoWebservers,
 
54
    HTTPServerRedirecting,
52
55
    )
53
56
from bzrlib.tests.test_http import TestWithTransport_pycurl
54
 
from bzrlib.transport import (
55
 
    get_transport,
56
 
    memory,
57
 
    )
 
57
from bzrlib.transport import get_transport
58
58
from bzrlib.transport.http._urllib import HttpTransport_urllib
59
 
from bzrlib.transport.nosmart import NoSmartTransportDecorator
60
 
from bzrlib.transport.readonly import ReadonlyTransportDecorator
61
 
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
 
59
from bzrlib.transport.memory import MemoryServer
 
60
from bzrlib.repofmt import knitrepo, weaverepo
62
61
 
63
62
 
64
63
class TestDefaultFormat(TestCase):
67
66
        old_format = bzrdir.BzrDirFormat.get_default_format()
68
67
        # default is BzrDirFormat6
69
68
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
70
 
        bzrdir.BzrDirFormat._set_default_format(SampleBzrDirFormat())
 
69
        self.applyDeprecated(symbol_versioning.zero_fourteen, 
 
70
                             bzrdir.BzrDirFormat.set_default_format, 
 
71
                             SampleBzrDirFormat())
71
72
        # creating a bzr dir should now create an instrumented dir.
72
73
        try:
73
74
            result = bzrdir.BzrDir.create('memory:///')
74
75
            self.failUnless(isinstance(result, SampleBzrDir))
75
76
        finally:
76
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
77
            self.applyDeprecated(symbol_versioning.zero_fourteen,
 
78
                bzrdir.BzrDirFormat.set_default_format, old_format)
77
79
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
78
80
 
79
81
 
84
86
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
85
87
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
86
88
            ' repositories', deprecated=True)
87
 
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
 
89
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir', 
88
90
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
89
91
        my_format_registry.register_metadir('knit',
90
92
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
117
119
        my_bzrdir = my_format_registry.make_bzrdir('weave')
118
120
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
119
121
        my_bzrdir = my_format_registry.make_bzrdir('default')
120
 
        self.assertIsInstance(my_bzrdir.repository_format,
 
122
        self.assertIsInstance(my_bzrdir.repository_format, 
121
123
            knitrepo.RepositoryFormatKnit1)
122
124
        my_bzrdir = my_format_registry.make_bzrdir('knit')
123
 
        self.assertIsInstance(my_bzrdir.repository_format,
 
125
        self.assertIsInstance(my_bzrdir.repository_format, 
124
126
            knitrepo.RepositoryFormatKnit1)
125
127
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
126
128
        self.assertIsInstance(my_bzrdir.get_branch_format(),
130
132
        my_format_registry = self.make_format_registry()
131
133
        self.assertEqual('Format registered lazily',
132
134
                         my_format_registry.get_help('lazy'))
133
 
        self.assertEqual('Format using knits',
 
135
        self.assertEqual('Format using knits', 
134
136
                         my_format_registry.get_help('knit'))
135
 
        self.assertEqual('Format using knits',
 
137
        self.assertEqual('Format using knits', 
136
138
                         my_format_registry.get_help('default'))
137
139
        self.assertEqual('Pre-0.8 format.  Slower and does not support'
138
 
                         ' checkouts or shared repositories',
 
140
                         ' checkouts or shared repositories', 
139
141
                         my_format_registry.get_help('weave'))
140
 
 
 
142
        
141
143
    def test_help_topic(self):
142
144
        topics = help_topics.HelpTopicRegistry()
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')
 
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')
150
149
        experimental, deprecated = rest.split('Deprecated formats')
151
 
        self.assertContainsRe(new, 'formats-help')
152
 
        self.assertContainsRe(new,
 
150
        self.assertContainsRe(new, 'These formats can be used')
 
151
        self.assertContainsRe(new, 
153
152
                ':knit:\n    \(native\) \(default\) Format using knits\n')
154
 
        self.assertContainsRe(experimental,
 
153
        self.assertContainsRe(experimental, 
155
154
                ':branch6:\n    \(native\) Experimental successor to knit')
156
 
        self.assertContainsRe(deprecated,
 
155
        self.assertContainsRe(deprecated, 
157
156
                ':lazy:\n    \(native\) Format registered lazily\n')
158
157
        self.assertNotContainsRe(new, 'hidden')
159
158
 
180
179
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
181
180
            ' repositories', deprecated=True, alias=True)
182
181
        self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
183
 
 
 
182
    
184
183
 
185
184
class SampleBranch(bzrlib.branch.Branch):
186
185
    """A dummy branch for guess what, dummy use."""
189
188
        self.bzrdir = dir
190
189
 
191
190
 
192
 
class SampleRepository(bzrlib.repository.Repository):
193
 
    """A dummy repo."""
194
 
 
195
 
    def __init__(self, dir):
196
 
        self.bzrdir = dir
197
 
 
198
 
 
199
191
class SampleBzrDir(bzrdir.BzrDir):
200
192
    """A sample BzrDir implementation to allow testing static methods."""
201
193
 
205
197
 
206
198
    def open_repository(self):
207
199
        """See BzrDir.open_repository."""
208
 
        return SampleRepository(self)
 
200
        return "A repository"
209
201
 
210
 
    def create_branch(self, name=None):
 
202
    def create_branch(self):
211
203
        """See BzrDir.create_branch."""
212
 
        if name is not None:
213
 
            raise NoColocatedBranchSupport(self)
214
204
        return SampleBranch(self)
215
205
 
216
206
    def create_workingtree(self):
221
211
class SampleBzrDirFormat(bzrdir.BzrDirFormat):
222
212
    """A sample format
223
213
 
224
 
    this format is initializable, unsupported to aid in testing the
 
214
    this format is initializable, unsupported to aid in testing the 
225
215
    open and open_downlevel routines.
226
216
    """
227
217
 
248
238
    def test_find_format(self):
249
239
        # is the right format object found for a branch?
250
240
        # create a branch with a few known format objects.
251
 
        # this is not quite the same as
 
241
        # this is not quite the same as 
252
242
        t = get_transport(self.get_url())
253
243
        self.build_tree(["foo/", "bar/"], transport=t)
254
244
        def check_format(format, url):
258
248
            self.failUnless(isinstance(found_format, format.__class__))
259
249
        check_format(bzrdir.BzrDirFormat5(), "foo")
260
250
        check_format(bzrdir.BzrDirFormat6(), "bar")
261
 
 
 
251
        
262
252
    def test_find_format_nothing_there(self):
263
253
        self.assertRaises(NotBranchError,
264
254
                          bzrdir.BzrDirFormat.find_format,
291
281
        # now open_downlevel should fail too.
292
282
        self.assertRaises(UnknownFormatError, bzrdir.BzrDir.open_unsupported, url)
293
283
 
 
284
    def test_create_repository_deprecated(self):
 
285
        # new interface is to make the bzrdir, then a repository within that.
 
286
        format = SampleBzrDirFormat()
 
287
        repo = self.applyDeprecated(zero_ninetyone,
 
288
                bzrdir.BzrDir.create_repository,
 
289
                self.get_url(), format=format)
 
290
        self.assertEqual('A repository', repo)
 
291
 
 
292
    def test_create_repository_shared(self):
 
293
        # new interface is to make the bzrdir, then a repository within that.
 
294
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
295
        repo = self.applyDeprecated(zero_ninetyone,
 
296
                bzrdir.BzrDir.create_repository,
 
297
                '.', shared=True)
 
298
        self.assertTrue(repo.is_shared())
 
299
 
 
300
    def test_create_repository_nonshared(self):
 
301
        # new interface is to make the bzrdir, then a repository within that.
 
302
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
303
        repo = self.applyDeprecated(zero_ninetyone,
 
304
                bzrdir.BzrDir.create_repository,
 
305
                '.')
 
306
        self.assertFalse(repo.is_shared())
 
307
 
 
308
    def test_create_repository_under_shared(self):
 
309
        # an explicit create_repository always does so.
 
310
        # we trust the format is right from the 'create_repository test'
 
311
        # new interface is to make the bzrdir, then a repository within that.
 
312
        format = bzrdir.format_registry.make_bzrdir('knit')
 
313
        self.make_repository('.', shared=True, format=format)
 
314
        repo = self.applyDeprecated(zero_ninetyone,
 
315
                bzrdir.BzrDir.create_repository,
 
316
                self.get_url('child'),
 
317
                format=format)
 
318
        self.assertTrue(isinstance(repo, repository.Repository))
 
319
        self.assertTrue(repo.bzrdir.root_transport.base.endswith('child/'))
 
320
 
294
321
    def test_create_branch_and_repo_uses_default(self):
295
322
        format = SampleBzrDirFormat()
296
323
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url(),
308
335
                          branch.bzrdir.open_repository)
309
336
 
310
337
    def test_create_branch_and_repo_under_shared_force_new(self):
311
 
        # creating a branch and repo in a shared repo can be forced to
 
338
        # creating a branch and repo in a shared repo can be forced to 
312
339
        # make a new repo
313
340
        format = bzrdir.format_registry.make_bzrdir('knit')
314
341
        self.make_repository('.', shared=True, format=format)
319
346
 
320
347
    def test_create_standalone_working_tree(self):
321
348
        format = SampleBzrDirFormat()
322
 
        # note this is deliberately readonly, as this failure should
 
349
        # note this is deliberately readonly, as this failure should 
323
350
        # occur before any writes.
324
351
        self.assertRaises(errors.NotLocalUrl,
325
352
                          bzrdir.BzrDir.create_standalone_workingtree,
326
353
                          self.get_readonly_url(), format=format)
327
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('.',
 
354
        tree = bzrdir.BzrDir.create_standalone_workingtree('.', 
328
355
                                                           format=format)
329
356
        self.assertEqual('A tree', tree)
330
357
 
332
359
        # create standalone working tree always makes a repo.
333
360
        format = bzrdir.format_registry.make_bzrdir('knit')
334
361
        self.make_repository('.', shared=True, format=format)
335
 
        # note this is deliberately readonly, as this failure should
 
362
        # note this is deliberately readonly, as this failure should 
336
363
        # occur before any writes.
337
364
        self.assertRaises(errors.NotLocalUrl,
338
365
                          bzrdir.BzrDir.create_standalone_workingtree,
339
366
                          self.get_readonly_url('child'), format=format)
340
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('child',
 
367
        tree = bzrdir.BzrDir.create_standalone_workingtree('child', 
341
368
            format=format)
342
369
        tree.bzrdir.open_repository()
343
370
 
359
386
 
360
387
    def test_create_branch_convenience_root(self):
361
388
        """Creating a branch at the root of a fs should work."""
362
 
        self.vfs_transport_factory = memory.MemoryServer
 
389
        self.vfs_transport_factory = MemoryServer
363
390
        # outside a repo the default convenience output is a repo+branch_tree
364
391
        format = bzrdir.format_registry.make_bzrdir('knit')
365
 
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
 
392
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(), 
366
393
                                                         format=format)
367
394
        self.assertRaises(errors.NoWorkingTree,
368
395
                          branch.bzrdir.open_workingtree)
378
405
        branch.bzrdir.open_workingtree()
379
406
        self.assertRaises(errors.NoRepositoryPresent,
380
407
                          branch.bzrdir.open_repository)
381
 
 
 
408
            
382
409
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
383
410
        # inside a repo the default convenience output is a branch+ follow the
384
411
        # repo tree policy but we can override that
390
417
                          branch.bzrdir.open_workingtree)
391
418
        self.assertRaises(errors.NoRepositoryPresent,
392
419
                          branch.bzrdir.open_repository)
393
 
 
 
420
            
394
421
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
395
422
        # inside a repo the default convenience output is a branch+ follow the
396
423
        # repo tree policy
397
424
        format = bzrdir.format_registry.make_bzrdir('knit')
398
425
        repo = self.make_repository('.', shared=True, format=format)
399
426
        repo.set_make_working_trees(False)
400
 
        branch = bzrdir.BzrDir.create_branch_convenience('child',
 
427
        branch = bzrdir.BzrDir.create_branch_convenience('child', 
401
428
                                                         format=format)
402
429
        self.assertRaises(errors.NoWorkingTree,
403
430
                          branch.bzrdir.open_workingtree)
433
460
        """The default acquisition policy should create a standalone branch."""
434
461
        my_bzrdir = self.make_bzrdir('.')
435
462
        repo_policy = my_bzrdir.determine_repository_policy()
436
 
        repo, is_new = repo_policy.acquire_repository()
 
463
        repo = repo_policy.acquire_repository()
437
464
        self.assertEqual(repo.bzrdir.root_transport.base,
438
465
                         my_bzrdir.root_transport.base)
439
466
        self.assertFalse(repo.is_shared())
440
467
 
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
468
 
564
469
class ChrootedTests(TestCaseWithTransport):
565
470
    """A support class that provides readonly urls outside the local namespace.
571
476
 
572
477
    def setUp(self):
573
478
        super(ChrootedTests, self).setUp()
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))
 
479
        if not self.vfs_transport_factory == MemoryServer:
 
480
            self.transport_readonly_server = HttpServer
579
481
 
580
482
    def test_open_containing(self):
581
483
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing,
588
490
        branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url('g/p/q'))
589
491
        self.assertEqual('g/p/q', relpath)
590
492
 
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
 
 
678
493
    def test_open_containing_from_transport(self):
679
494
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport,
680
495
                          get_transport(self.get_readonly_url('')))
689
504
        self.assertEqual('g/p/q', relpath)
690
505
 
691
506
    def test_open_containing_tree_or_branch(self):
 
507
        def local_branch_path(branch):
 
508
             return os.path.realpath(
 
509
                urlutils.local_path_from_url(branch.base))
 
510
 
692
511
        self.make_branch_and_tree('topdir')
693
512
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
694
513
            'topdir/foo')
695
514
        self.assertEqual(os.path.realpath('topdir'),
696
515
                         os.path.realpath(tree.basedir))
697
516
        self.assertEqual(os.path.realpath('topdir'),
698
 
                         self.local_branch_path(branch))
 
517
                         local_branch_path(branch))
699
518
        self.assertIs(tree.bzrdir, branch.bzrdir)
700
519
        self.assertEqual('foo', relpath)
701
520
        # opening from non-local should not return the tree
709
528
            'topdir/foo')
710
529
        self.assertIs(tree, None)
711
530
        self.assertEqual(os.path.realpath('topdir/foo'),
712
 
                         self.local_branch_path(branch))
 
531
                         local_branch_path(branch))
713
532
        self.assertEqual('', relpath)
714
533
 
715
534
    def test_open_tree_or_branch(self):
 
535
        def local_branch_path(branch):
 
536
             return os.path.realpath(
 
537
                urlutils.local_path_from_url(branch.base))
 
538
 
716
539
        self.make_branch_and_tree('topdir')
717
540
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir')
718
541
        self.assertEqual(os.path.realpath('topdir'),
719
542
                         os.path.realpath(tree.basedir))
720
543
        self.assertEqual(os.path.realpath('topdir'),
721
 
                         self.local_branch_path(branch))
 
544
                         local_branch_path(branch))
722
545
        self.assertIs(tree.bzrdir, branch.bzrdir)
723
546
        # opening from non-local should not return the tree
724
547
        tree, branch = bzrdir.BzrDir.open_tree_or_branch(
729
552
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir/foo')
730
553
        self.assertIs(tree, None)
731
554
        self.assertEqual(os.path.realpath('topdir/foo'),
732
 
                         self.local_branch_path(branch))
 
555
                         local_branch_path(branch))
733
556
 
734
557
    def test_open_from_transport(self):
735
558
        # transport pointing at bzrdir should give a bzrdir with root transport
739
562
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
740
563
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
741
564
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
742
 
 
 
565
        
743
566
    def test_open_from_transport_no_bzrdir(self):
744
567
        transport = get_transport(self.get_url())
745
568
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
754
577
                          transport)
755
578
 
756
579
    def test_sprout_recursive(self):
757
 
        tree = self.make_branch_and_tree('tree1',
758
 
                                         format='dirstate-with-subtree')
 
580
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
759
581
        sub_tree = self.make_branch_and_tree('tree1/subtree',
760
582
            format='dirstate-with-subtree')
761
 
        sub_tree.set_root_id('subtree-root')
762
583
        tree.add_reference(sub_tree)
763
584
        self.build_tree(['tree1/subtree/file'])
764
585
        sub_tree.add('file')
765
586
        tree.commit('Initial commit')
766
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
767
 
        tree2.lock_read()
768
 
        self.addCleanup(tree2.unlock)
 
587
        tree.bzrdir.sprout('tree2')
769
588
        self.failUnlessExists('tree2/subtree/file')
770
 
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
771
589
 
772
590
    def test_cloning_metadir(self):
773
591
        """Ensure that cloning metadir is suitable"""
899
717
 
900
718
    def test_needs_conversion_different_working_tree(self):
901
719
        # meta1dirs need an conversion if any element is not the default.
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)
 
720
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
721
        # test with 
 
722
        new_default = bzrdir.format_registry.make_bzrdir('dirstate')
 
723
        bzrdir.BzrDirFormat._set_default_format(new_default)
 
724
        try:
 
725
            tree = self.make_branch_and_tree('tree', format='knit')
 
726
            self.assertTrue(tree.bzrdir.needs_format_conversion())
 
727
        finally:
 
728
            bzrdir.BzrDirFormat._set_default_format(old_format)
922
729
 
923
730
 
924
731
class TestFormat5(TestCaseWithTransport):
925
732
    """Tests specific to the version 5 bzrdir format."""
926
733
 
927
734
    def test_same_lockfiles_between_tree_repo_branch(self):
928
 
        # this checks that only a single lockfiles instance is created
 
735
        # this checks that only a single lockfiles instance is created 
929
736
        # for format 5 objects
930
737
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
931
738
        def check_dir_components_use_same_lock(dir):
938
745
        # and if we open it normally.
939
746
        dir = bzrdir.BzrDir.open(self.get_url())
940
747
        check_dir_components_use_same_lock(dir)
941
 
 
 
748
    
942
749
    def test_can_convert(self):
943
750
        # format 5 dirs are convertable
944
751
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
945
752
        self.assertTrue(dir.can_convert_format())
946
 
 
 
753
    
947
754
    def test_needs_conversion(self):
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()))
 
755
        # format 5 dirs need a conversion if they are not the default.
 
756
        # and they start of not the default.
 
757
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
758
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
759
        try:
 
760
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
 
761
            self.assertFalse(dir.needs_format_conversion())
 
762
        finally:
 
763
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
764
        self.assertTrue(dir.needs_format_conversion())
956
765
 
957
766
 
958
767
class TestFormat6(TestCaseWithTransport):
959
768
    """Tests specific to the version 6 bzrdir format."""
960
769
 
961
770
    def test_same_lockfiles_between_tree_repo_branch(self):
962
 
        # this checks that only a single lockfiles instance is created
 
771
        # this checks that only a single lockfiles instance is created 
963
772
        # for format 6 objects
964
773
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
965
774
        def check_dir_components_use_same_lock(dir):
972
781
        # and if we open it normally.
973
782
        dir = bzrdir.BzrDir.open(self.get_url())
974
783
        check_dir_components_use_same_lock(dir)
975
 
 
 
784
    
976
785
    def test_can_convert(self):
977
786
        # format 6 dirs are convertable
978
787
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
979
788
        self.assertTrue(dir.can_convert_format())
980
 
 
 
789
    
981
790
    def test_needs_conversion(self):
982
791
        # format 6 dirs need an conversion if they are not the default.
983
 
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
984
 
        self.assertTrue(dir.needs_format_conversion(
985
 
            bzrdir.BzrDirFormat.get_default_format()))
 
792
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
793
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
 
794
        try:
 
795
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
 
796
            self.assertTrue(dir.needs_format_conversion())
 
797
        finally:
 
798
            bzrdir.BzrDirFormat._set_default_format(old_format)
986
799
 
987
800
 
988
801
class NotBzrDir(bzrlib.bzrdir.BzrDir):
1019
832
 
1020
833
class TestNotBzrDir(TestCaseWithTransport):
1021
834
    """Tests for using the bzrdir api with a non .bzr based disk format.
1022
 
 
 
835
    
1023
836
    If/when one of these is in the core, we can let the implementation tests
1024
837
    verify this works.
1025
838
    """
1026
839
 
1027
840
    def test_create_and_find_format(self):
1028
 
        # create a .notbzr dir
 
841
        # create a .notbzr dir 
1029
842
        format = NotBzrDirFormat()
1030
843
        dir = format.initialize(self.get_url())
1031
844
        self.assertIsInstance(dir, NotBzrDir)
1055
868
 
1056
869
    def setUp(self):
1057
870
        super(NonLocalTests, self).setUp()
1058
 
        self.vfs_transport_factory = memory.MemoryServer
1059
 
 
 
871
        self.vfs_transport_factory = MemoryServer
 
872
    
1060
873
    def test_create_branch_convenience(self):
1061
874
        # outside a repo the default convenience output is a repo+branch_tree
1062
875
        format = bzrdir.format_registry.make_bzrdir('knit')
1099
912
                              workingtree.WorkingTreeFormat3)
1100
913
 
1101
914
 
1102
 
class TestHTTPRedirections(object):
1103
 
    """Test redirection between two http servers.
 
915
class TestHTTPRedirectionLoop(object):
 
916
    """Test redirection loop between two http servers.
1104
917
 
1105
918
    This MUST be used by daughter classes that also inherit from
1106
919
    TestCaseWithTwoWebservers.
1107
920
 
1108
921
    We can't inherit directly from TestCaseWithTwoWebservers or the
1109
922
    test framework will try to create an instance which cannot
1110
 
    run, its implementation being incomplete.
 
923
    run, its implementation being incomplete. 
1111
924
    """
1112
925
 
 
926
    # Should be defined by daughter classes to ensure redirection
 
927
    # still use the same transport implementation (not currently
 
928
    # enforced as it's a bit tricky to get right (see the FIXME
 
929
    # in BzrDir.open_from_transport for the unique use case so
 
930
    # far)
 
931
    _qualifier = None
 
932
 
1113
933
    def create_transport_readonly_server(self):
1114
 
        return http_utils.HTTPServerRedirecting()
 
934
        return HTTPServerRedirecting()
1115
935
 
1116
936
    def create_transport_secondary_server(self):
1117
 
        return http_utils.HTTPServerRedirecting()
 
937
        return HTTPServerRedirecting()
1118
938
 
1119
939
    def setUp(self):
1120
 
        super(TestHTTPRedirections, self).setUp()
 
940
        # Both servers redirect to each server creating a loop
 
941
        super(TestHTTPRedirectionLoop, self).setUp()
1121
942
        # The redirections will point to the new server
1122
943
        self.new_server = self.get_readonly_server()
1123
944
        # The requests to the old server will be redirected
1124
945
        self.old_server = self.get_secondary_server()
1125
946
        # Configure the redirections
1126
947
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
 
948
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
 
949
 
 
950
    def _qualified_url(self, host, port):
 
951
        return 'http+%s://%s:%s' % (self._qualifier, host, port)
1127
952
 
1128
953
    def test_loop(self):
1129
 
        # Both servers redirect to each other creating a loop
1130
 
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
1131
954
        # Starting from either server should loop
1132
 
        old_url = self._qualified_url(self.old_server.host,
 
955
        old_url = self._qualified_url(self.old_server.host, 
1133
956
                                      self.old_server.port)
1134
957
        oldt = self._transport(old_url)
1135
958
        self.assertRaises(errors.NotBranchError,
1136
959
                          bzrdir.BzrDir.open_from_transport, oldt)
1137
 
        new_url = self._qualified_url(self.new_server.host,
 
960
        new_url = self._qualified_url(self.new_server.host, 
1138
961
                                      self.new_server.port)
1139
962
        newt = self._transport(new_url)
1140
963
        self.assertRaises(errors.NotBranchError,
1141
964
                          bzrdir.BzrDir.open_from_transport, newt)
1142
965
 
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):
 
966
 
 
967
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop,
 
968
                                  TestCaseWithTwoWebservers):
1156
969
    """Tests redirections for urllib implementation"""
1157
970
 
 
971
    _qualifier = 'urllib'
1158
972
    _transport = HttpTransport_urllib
1159
973
 
1160
 
    def _qualified_url(self, host, port):
1161
 
        result = 'http+urllib://%s:%s' % (host, port)
1162
 
        self.permit_url(result)
1163
 
        return result
1164
 
 
1165
974
 
1166
975
 
1167
976
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
1168
 
                                  TestHTTPRedirections,
1169
 
                                  http_utils.TestCaseWithTwoWebservers):
 
977
                                  TestHTTPRedirectionLoop,
 
978
                                  TestCaseWithTwoWebservers):
1170
979
    """Tests redirections for pycurl implementation"""
1171
980
 
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
 
981
    _qualifier = 'pycurl'
1200
982
 
1201
983
 
1202
984
class TestDotBzrHidden(TestCaseWithTransport):
1226
1008
        b = bzrdir.BzrDir.create(urlutils.local_path_to_url('.'))
1227
1009
        self.build_tree(['a'])
1228
1010
        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)
1342
 
 
1343
 
    def test_post_repo_init(self):
1344
 
        from bzrlib.bzrdir import RepoInitHookParams
1345
 
        calls = []
1346
 
        bzrdir.BzrDir.hooks.install_named_hook('post_repo_init',
1347
 
            calls.append, None)
1348
 
        self.make_repository('foo')
1349
 
        self.assertLength(1, calls)
1350
 
        params = calls[0]
1351
 
        self.assertIsInstance(params, RepoInitHookParams)
1352
 
        self.assertTrue(hasattr(params, 'bzrdir'))
1353
 
        self.assertTrue(hasattr(params, 'repository'))