/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Mark Hammond
  • Date: 2008-08-12 13:07:00 UTC
  • mto: (3691.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 3692.
  • Revision ID: mhammond@skippinet.com.au-20080812130700-05ohg06353nxg22q
eagerly unlock the result_basis to prevent handles staying open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
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
22
import os
 
23
import os.path
 
24
from StringIO import StringIO
23
25
import subprocess
24
26
import sys
25
27
 
28
30
    errors,
29
31
    help_topics,
30
32
    repository,
31
 
    osutils,
32
 
    remote,
 
33
    symbol_versioning,
33
34
    urlutils,
34
35
    win32utils,
35
36
    workingtree,
36
37
    )
37
38
import bzrlib.branch
38
39
from bzrlib.errors import (NotBranchError,
39
 
                           NoColocatedBranchSupport,
40
40
                           UnknownFormatError,
41
41
                           UnsupportedFormatError,
42
42
                           )
45
45
    TestCaseWithMemoryTransport,
46
46
    TestCaseWithTransport,
47
47
    TestSkipped,
 
48
    test_sftp_transport
48
49
    )
49
 
from bzrlib.tests import(
50
 
    http_server,
51
 
    http_utils,
 
50
from bzrlib.tests.http_server import HttpServer
 
51
from bzrlib.tests.http_utils import (
 
52
    TestCaseWithTwoWebservers,
 
53
    HTTPServerRedirecting,
52
54
    )
53
55
from bzrlib.tests.test_http import TestWithTransport_pycurl
54
 
from bzrlib.transport import (
55
 
    get_transport,
56
 
    memory,
57
 
    )
 
56
from bzrlib.transport import get_transport
58
57
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
 
58
from bzrlib.transport.memory import MemoryServer
 
59
from bzrlib.repofmt import knitrepo, weaverepo
62
60
 
63
61
 
64
62
class TestDefaultFormat(TestCase):
84
82
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
85
83
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
86
84
            ' repositories', deprecated=True)
87
 
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
 
85
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir', 
88
86
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
89
87
        my_format_registry.register_metadir('knit',
90
88
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
117
115
        my_bzrdir = my_format_registry.make_bzrdir('weave')
118
116
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
119
117
        my_bzrdir = my_format_registry.make_bzrdir('default')
120
 
        self.assertIsInstance(my_bzrdir.repository_format,
 
118
        self.assertIsInstance(my_bzrdir.repository_format, 
121
119
            knitrepo.RepositoryFormatKnit1)
122
120
        my_bzrdir = my_format_registry.make_bzrdir('knit')
123
 
        self.assertIsInstance(my_bzrdir.repository_format,
 
121
        self.assertIsInstance(my_bzrdir.repository_format, 
124
122
            knitrepo.RepositoryFormatKnit1)
125
123
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
126
124
        self.assertIsInstance(my_bzrdir.get_branch_format(),
130
128
        my_format_registry = self.make_format_registry()
131
129
        self.assertEqual('Format registered lazily',
132
130
                         my_format_registry.get_help('lazy'))
133
 
        self.assertEqual('Format using knits',
 
131
        self.assertEqual('Format using knits', 
134
132
                         my_format_registry.get_help('knit'))
135
 
        self.assertEqual('Format using knits',
 
133
        self.assertEqual('Format using knits', 
136
134
                         my_format_registry.get_help('default'))
137
135
        self.assertEqual('Pre-0.8 format.  Slower and does not support'
138
 
                         ' checkouts or shared repositories',
 
136
                         ' checkouts or shared repositories', 
139
137
                         my_format_registry.get_help('weave'))
140
 
 
 
138
        
141
139
    def test_help_topic(self):
142
140
        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')
 
141
        topics.register('formats', self.make_format_registry().help_topic, 
 
142
                        'Directory formats')
 
143
        topic = topics.get_detail('formats')
 
144
        new, rest = topic.split('Experimental formats')
150
145
        experimental, deprecated = rest.split('Deprecated formats')
151
 
        self.assertContainsRe(new, 'formats-help')
152
 
        self.assertContainsRe(new,
 
146
        self.assertContainsRe(new, 'These formats can be used')
 
147
        self.assertContainsRe(new, 
153
148
                ':knit:\n    \(native\) \(default\) Format using knits\n')
154
 
        self.assertContainsRe(experimental,
 
149
        self.assertContainsRe(experimental, 
155
150
                ':branch6:\n    \(native\) Experimental successor to knit')
156
 
        self.assertContainsRe(deprecated,
 
151
        self.assertContainsRe(deprecated, 
157
152
                ':lazy:\n    \(native\) Format registered lazily\n')
158
153
        self.assertNotContainsRe(new, 'hidden')
159
154
 
180
175
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
181
176
            ' repositories', deprecated=True, alias=True)
182
177
        self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
183
 
 
 
178
    
184
179
 
185
180
class SampleBranch(bzrlib.branch.Branch):
186
181
    """A dummy branch for guess what, dummy use."""
189
184
        self.bzrdir = dir
190
185
 
191
186
 
192
 
class SampleRepository(bzrlib.repository.Repository):
193
 
    """A dummy repo."""
194
 
 
195
 
    def __init__(self, dir):
196
 
        self.bzrdir = dir
197
 
 
198
 
 
199
187
class SampleBzrDir(bzrdir.BzrDir):
200
188
    """A sample BzrDir implementation to allow testing static methods."""
201
189
 
205
193
 
206
194
    def open_repository(self):
207
195
        """See BzrDir.open_repository."""
208
 
        return SampleRepository(self)
 
196
        return "A repository"
209
197
 
210
 
    def create_branch(self, name=None):
 
198
    def create_branch(self):
211
199
        """See BzrDir.create_branch."""
212
 
        if name is not None:
213
 
            raise NoColocatedBranchSupport(self)
214
200
        return SampleBranch(self)
215
201
 
216
202
    def create_workingtree(self):
221
207
class SampleBzrDirFormat(bzrdir.BzrDirFormat):
222
208
    """A sample format
223
209
 
224
 
    this format is initializable, unsupported to aid in testing the
 
210
    this format is initializable, unsupported to aid in testing the 
225
211
    open and open_downlevel routines.
226
212
    """
227
213
 
248
234
    def test_find_format(self):
249
235
        # is the right format object found for a branch?
250
236
        # create a branch with a few known format objects.
251
 
        # this is not quite the same as
 
237
        # this is not quite the same as 
252
238
        t = get_transport(self.get_url())
253
239
        self.build_tree(["foo/", "bar/"], transport=t)
254
240
        def check_format(format, url):
258
244
            self.failUnless(isinstance(found_format, format.__class__))
259
245
        check_format(bzrdir.BzrDirFormat5(), "foo")
260
246
        check_format(bzrdir.BzrDirFormat6(), "bar")
261
 
 
 
247
        
262
248
    def test_find_format_nothing_there(self):
263
249
        self.assertRaises(NotBranchError,
264
250
                          bzrdir.BzrDirFormat.find_format,
308
294
                          branch.bzrdir.open_repository)
309
295
 
310
296
    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
 
297
        # creating a branch and repo in a shared repo can be forced to 
312
298
        # make a new repo
313
299
        format = bzrdir.format_registry.make_bzrdir('knit')
314
300
        self.make_repository('.', shared=True, format=format)
319
305
 
320
306
    def test_create_standalone_working_tree(self):
321
307
        format = SampleBzrDirFormat()
322
 
        # note this is deliberately readonly, as this failure should
 
308
        # note this is deliberately readonly, as this failure should 
323
309
        # occur before any writes.
324
310
        self.assertRaises(errors.NotLocalUrl,
325
311
                          bzrdir.BzrDir.create_standalone_workingtree,
326
312
                          self.get_readonly_url(), format=format)
327
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('.',
 
313
        tree = bzrdir.BzrDir.create_standalone_workingtree('.', 
328
314
                                                           format=format)
329
315
        self.assertEqual('A tree', tree)
330
316
 
332
318
        # create standalone working tree always makes a repo.
333
319
        format = bzrdir.format_registry.make_bzrdir('knit')
334
320
        self.make_repository('.', shared=True, format=format)
335
 
        # note this is deliberately readonly, as this failure should
 
321
        # note this is deliberately readonly, as this failure should 
336
322
        # occur before any writes.
337
323
        self.assertRaises(errors.NotLocalUrl,
338
324
                          bzrdir.BzrDir.create_standalone_workingtree,
339
325
                          self.get_readonly_url('child'), format=format)
340
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('child',
 
326
        tree = bzrdir.BzrDir.create_standalone_workingtree('child', 
341
327
            format=format)
342
328
        tree.bzrdir.open_repository()
343
329
 
359
345
 
360
346
    def test_create_branch_convenience_root(self):
361
347
        """Creating a branch at the root of a fs should work."""
362
 
        self.vfs_transport_factory = memory.MemoryServer
 
348
        self.vfs_transport_factory = MemoryServer
363
349
        # outside a repo the default convenience output is a repo+branch_tree
364
350
        format = bzrdir.format_registry.make_bzrdir('knit')
365
 
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
 
351
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(), 
366
352
                                                         format=format)
367
353
        self.assertRaises(errors.NoWorkingTree,
368
354
                          branch.bzrdir.open_workingtree)
378
364
        branch.bzrdir.open_workingtree()
379
365
        self.assertRaises(errors.NoRepositoryPresent,
380
366
                          branch.bzrdir.open_repository)
381
 
 
 
367
            
382
368
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
383
369
        # inside a repo the default convenience output is a branch+ follow the
384
370
        # repo tree policy but we can override that
390
376
                          branch.bzrdir.open_workingtree)
391
377
        self.assertRaises(errors.NoRepositoryPresent,
392
378
                          branch.bzrdir.open_repository)
393
 
 
 
379
            
394
380
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
395
381
        # inside a repo the default convenience output is a branch+ follow the
396
382
        # repo tree policy
397
383
        format = bzrdir.format_registry.make_bzrdir('knit')
398
384
        repo = self.make_repository('.', shared=True, format=format)
399
385
        repo.set_make_working_trees(False)
400
 
        branch = bzrdir.BzrDir.create_branch_convenience('child',
 
386
        branch = bzrdir.BzrDir.create_branch_convenience('child', 
401
387
                                                         format=format)
402
388
        self.assertRaises(errors.NoWorkingTree,
403
389
                          branch.bzrdir.open_workingtree)
433
419
        """The default acquisition policy should create a standalone branch."""
434
420
        my_bzrdir = self.make_bzrdir('.')
435
421
        repo_policy = my_bzrdir.determine_repository_policy()
436
 
        repo, is_new = repo_policy.acquire_repository()
 
422
        repo = repo_policy.acquire_repository()
437
423
        self.assertEqual(repo.bzrdir.root_transport.base,
438
424
                         my_bzrdir.root_transport.base)
439
425
        self.assertFalse(repo.is_shared())
440
426
 
 
427
 
441
428
    def test_determine_stacking_policy(self):
442
429
        parent_bzrdir = self.make_bzrdir('.')
443
430
        child_bzrdir = self.make_bzrdir('child')
454
441
        self.assertEqual(parent_bzrdir.root_transport.base,
455
442
                         repo_policy._stack_on_pwd)
456
443
 
457
 
    def prepare_default_stacking(self, child_format='1.6'):
 
444
    def prepare_default_stacking(self):
458
445
        parent_bzrdir = self.make_bzrdir('.')
459
 
        child_branch = self.make_branch('child', format=child_format)
 
446
        child_branch = self.make_branch('child', format='development1')
460
447
        parent_bzrdir.get_config().set_default_stack_on(child_branch.base)
461
448
        new_child_transport = parent_bzrdir.transport.clone('child2')
462
449
        return child_branch, new_child_transport
467
454
        self.assertEqual(child_branch.base,
468
455
                         new_child.open_branch().get_stacked_on_url())
469
456
 
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
457
    def test_sprout_obeys_stacking_policy(self):
484
458
        child_branch, new_child_transport = self.prepare_default_stacking()
485
459
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
486
460
        self.assertEqual(child_branch.base,
487
461
                         new_child.open_branch().get_stacked_on_url())
488
462
 
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
463
    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')
 
464
        stack_on = self.make_branch('stack_on', format='development1')
 
465
        repo = self.make_repository('repo', format='development1')
537
466
        policy = bzrdir.UseExistingRepository(repo, stack_on.base)
538
467
        policy._add_fallback(repo)
539
468
 
540
469
    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')
 
470
        stack_on = self.make_branch('stack_on', format='development1')
 
471
        repo = self.make_repository('repo', format='development1')
543
472
        policy = bzrdir.UseExistingRepository(repo, '.', stack_on.base)
544
473
        policy._add_fallback(repo)
545
474
 
546
475
    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')
 
476
        stack_on = self.make_branch('stack_on', format='development1')
 
477
        stacked = self.make_branch('stack_on/stacked', format='development1')
549
478
        policy = bzrdir.UseExistingRepository(stacked.repository,
550
479
            '.', stack_on.base)
551
480
        policy.configure_branch(stacked)
552
481
        self.assertEqual('..', stacked.get_stacked_on_url())
553
482
 
554
483
    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')
 
484
        stack_on = self.make_branch('stack_on', format='development1')
 
485
        stacked = self.make_branch('stack_on/stacked', format='development1')
557
486
        policy = bzrdir.UseExistingRepository(stacked.repository,
558
487
            '.', self.get_readonly_url('stack_on'))
559
488
        policy.configure_branch(stacked)
571
500
 
572
501
    def setUp(self):
573
502
        super(ChrootedTests, self).setUp()
574
 
        if not self.vfs_transport_factory == memory.MemoryServer:
575
 
            self.transport_readonly_server = http_server.HttpServer
 
503
        if not self.vfs_transport_factory == MemoryServer:
 
504
            self.transport_readonly_server = HttpServer
576
505
 
577
506
    def local_branch_path(self, branch):
578
507
         return os.path.realpath(urlutils.local_path_from_url(branch.base))
603
532
        self.assertEqual(os.path.realpath('topdir'),
604
533
                         self.local_branch_path(branch))
605
534
        self.assertEqual(
606
 
            osutils.realpath(os.path.join('topdir', '.bzr', 'repository')),
 
535
            os.path.realpath(os.path.join('topdir', '.bzr', 'repository')),
607
536
            repo.bzrdir.transport.local_abspath('repository'))
608
537
        self.assertEqual(relpath, 'foo')
609
538
 
616
545
        self.assertEqual(os.path.realpath('branch'),
617
546
                         self.local_branch_path(branch))
618
547
        self.assertEqual(
619
 
            osutils.realpath(os.path.join('branch', '.bzr', 'repository')),
 
548
            os.path.realpath(os.path.join('branch', '.bzr', 'repository')),
620
549
            repo.bzrdir.transport.local_abspath('repository'))
621
550
        self.assertEqual(relpath, 'foo')
622
551
 
628
557
        self.assertEqual(tree, None)
629
558
        self.assertEqual(branch, None)
630
559
        self.assertEqual(
631
 
            osutils.realpath(os.path.join('repo', '.bzr', 'repository')),
 
560
            os.path.realpath(os.path.join('repo', '.bzr', 'repository')),
632
561
            repo.bzrdir.transport.local_abspath('repository'))
633
562
        self.assertEqual(relpath, '')
634
563
 
643
572
        self.assertEqual(os.path.realpath('shared/branch'),
644
573
                         self.local_branch_path(branch))
645
574
        self.assertEqual(
646
 
            osutils.realpath(os.path.join('shared', '.bzr', 'repository')),
 
575
            os.path.realpath(os.path.join('shared', '.bzr', 'repository')),
647
576
            repo.bzrdir.transport.local_abspath('repository'))
648
577
        self.assertEqual(relpath, '')
649
578
 
658
587
        self.assertEqual(os.path.realpath('foo'),
659
588
                         self.local_branch_path(branch))
660
589
        self.assertEqual(
661
 
            osutils.realpath(os.path.join('foo', '.bzr', 'repository')),
 
590
            os.path.realpath(os.path.join('foo', '.bzr', 'repository')),
662
591
            repo.bzrdir.transport.local_abspath('repository'))
663
592
        self.assertEqual(relpath, 'bar')
664
593
 
671
600
        self.assertEqual(tree, None)
672
601
        self.assertEqual(branch, None)
673
602
        self.assertEqual(
674
 
            osutils.realpath(os.path.join('bar', '.bzr', 'repository')),
 
603
            os.path.realpath(os.path.join('bar', '.bzr', 'repository')),
675
604
            repo.bzrdir.transport.local_abspath('repository'))
676
605
        self.assertEqual(relpath, 'baz')
677
606
 
739
668
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
740
669
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
741
670
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
742
 
 
 
671
        
743
672
    def test_open_from_transport_no_bzrdir(self):
744
673
        transport = get_transport(self.get_url())
745
674
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
754
683
                          transport)
755
684
 
756
685
    def test_sprout_recursive(self):
757
 
        tree = self.make_branch_and_tree('tree1',
758
 
                                         format='dirstate-with-subtree')
 
686
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
759
687
        sub_tree = self.make_branch_and_tree('tree1/subtree',
760
688
            format='dirstate-with-subtree')
761
 
        sub_tree.set_root_id('subtree-root')
762
689
        tree.add_reference(sub_tree)
763
690
        self.build_tree(['tree1/subtree/file'])
764
691
        sub_tree.add('file')
765
692
        tree.commit('Initial commit')
766
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
767
 
        tree2.lock_read()
768
 
        self.addCleanup(tree2.unlock)
 
693
        tree.bzrdir.sprout('tree2')
769
694
        self.failUnlessExists('tree2/subtree/file')
770
 
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
771
695
 
772
696
    def test_cloning_metadir(self):
773
697
        """Ensure that cloning metadir is suitable"""
899
823
 
900
824
    def test_needs_conversion_different_working_tree(self):
901
825
        # 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)
 
826
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
827
        # test with 
 
828
        new_default = bzrdir.format_registry.make_bzrdir('dirstate')
 
829
        bzrdir.BzrDirFormat._set_default_format(new_default)
 
830
        try:
 
831
            tree = self.make_branch_and_tree('tree', format='knit')
 
832
            self.assertTrue(tree.bzrdir.needs_format_conversion())
 
833
        finally:
 
834
            bzrdir.BzrDirFormat._set_default_format(old_format)
922
835
 
923
836
 
924
837
class TestFormat5(TestCaseWithTransport):
925
838
    """Tests specific to the version 5 bzrdir format."""
926
839
 
927
840
    def test_same_lockfiles_between_tree_repo_branch(self):
928
 
        # this checks that only a single lockfiles instance is created
 
841
        # this checks that only a single lockfiles instance is created 
929
842
        # for format 5 objects
930
843
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
931
844
        def check_dir_components_use_same_lock(dir):
938
851
        # and if we open it normally.
939
852
        dir = bzrdir.BzrDir.open(self.get_url())
940
853
        check_dir_components_use_same_lock(dir)
941
 
 
 
854
    
942
855
    def test_can_convert(self):
943
856
        # format 5 dirs are convertable
944
857
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
945
858
        self.assertTrue(dir.can_convert_format())
946
 
 
 
859
    
947
860
    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()))
 
861
        # format 5 dirs need a conversion if they are not the default.
 
862
        # and they start of not the default.
 
863
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
864
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
865
        try:
 
866
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
 
867
            self.assertFalse(dir.needs_format_conversion())
 
868
        finally:
 
869
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
870
        self.assertTrue(dir.needs_format_conversion())
956
871
 
957
872
 
958
873
class TestFormat6(TestCaseWithTransport):
959
874
    """Tests specific to the version 6 bzrdir format."""
960
875
 
961
876
    def test_same_lockfiles_between_tree_repo_branch(self):
962
 
        # this checks that only a single lockfiles instance is created
 
877
        # this checks that only a single lockfiles instance is created 
963
878
        # for format 6 objects
964
879
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
965
880
        def check_dir_components_use_same_lock(dir):
972
887
        # and if we open it normally.
973
888
        dir = bzrdir.BzrDir.open(self.get_url())
974
889
        check_dir_components_use_same_lock(dir)
975
 
 
 
890
    
976
891
    def test_can_convert(self):
977
892
        # format 6 dirs are convertable
978
893
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
979
894
        self.assertTrue(dir.can_convert_format())
980
 
 
 
895
    
981
896
    def test_needs_conversion(self):
982
897
        # 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()))
 
898
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
899
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
 
900
        try:
 
901
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
 
902
            self.assertTrue(dir.needs_format_conversion())
 
903
        finally:
 
904
            bzrdir.BzrDirFormat._set_default_format(old_format)
986
905
 
987
906
 
988
907
class NotBzrDir(bzrlib.bzrdir.BzrDir):
1019
938
 
1020
939
class TestNotBzrDir(TestCaseWithTransport):
1021
940
    """Tests for using the bzrdir api with a non .bzr based disk format.
1022
 
 
 
941
    
1023
942
    If/when one of these is in the core, we can let the implementation tests
1024
943
    verify this works.
1025
944
    """
1026
945
 
1027
946
    def test_create_and_find_format(self):
1028
 
        # create a .notbzr dir
 
947
        # create a .notbzr dir 
1029
948
        format = NotBzrDirFormat()
1030
949
        dir = format.initialize(self.get_url())
1031
950
        self.assertIsInstance(dir, NotBzrDir)
1055
974
 
1056
975
    def setUp(self):
1057
976
        super(NonLocalTests, self).setUp()
1058
 
        self.vfs_transport_factory = memory.MemoryServer
1059
 
 
 
977
        self.vfs_transport_factory = MemoryServer
 
978
    
1060
979
    def test_create_branch_convenience(self):
1061
980
        # outside a repo the default convenience output is a repo+branch_tree
1062
981
        format = bzrdir.format_registry.make_bzrdir('knit')
1099
1018
                              workingtree.WorkingTreeFormat3)
1100
1019
 
1101
1020
 
1102
 
class TestHTTPRedirections(object):
1103
 
    """Test redirection between two http servers.
 
1021
class TestHTTPRedirectionLoop(object):
 
1022
    """Test redirection loop between two http servers.
1104
1023
 
1105
1024
    This MUST be used by daughter classes that also inherit from
1106
1025
    TestCaseWithTwoWebservers.
1107
1026
 
1108
1027
    We can't inherit directly from TestCaseWithTwoWebservers or the
1109
1028
    test framework will try to create an instance which cannot
1110
 
    run, its implementation being incomplete.
 
1029
    run, its implementation being incomplete. 
1111
1030
    """
1112
1031
 
 
1032
    # Should be defined by daughter classes to ensure redirection
 
1033
    # still use the same transport implementation (not currently
 
1034
    # enforced as it's a bit tricky to get right (see the FIXME
 
1035
    # in BzrDir.open_from_transport for the unique use case so
 
1036
    # far)
 
1037
    _qualifier = None
 
1038
 
1113
1039
    def create_transport_readonly_server(self):
1114
 
        return http_utils.HTTPServerRedirecting()
 
1040
        return HTTPServerRedirecting()
1115
1041
 
1116
1042
    def create_transport_secondary_server(self):
1117
 
        return http_utils.HTTPServerRedirecting()
 
1043
        return HTTPServerRedirecting()
1118
1044
 
1119
1045
    def setUp(self):
1120
 
        super(TestHTTPRedirections, self).setUp()
 
1046
        # Both servers redirect to each server creating a loop
 
1047
        super(TestHTTPRedirectionLoop, self).setUp()
1121
1048
        # The redirections will point to the new server
1122
1049
        self.new_server = self.get_readonly_server()
1123
1050
        # The requests to the old server will be redirected
1124
1051
        self.old_server = self.get_secondary_server()
1125
1052
        # Configure the redirections
1126
1053
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
 
1054
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
 
1055
 
 
1056
    def _qualified_url(self, host, port):
 
1057
        return 'http+%s://%s:%s' % (self._qualifier, host, port)
1127
1058
 
1128
1059
    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
1060
        # Starting from either server should loop
1132
 
        old_url = self._qualified_url(self.old_server.host,
 
1061
        old_url = self._qualified_url(self.old_server.host, 
1133
1062
                                      self.old_server.port)
1134
1063
        oldt = self._transport(old_url)
1135
1064
        self.assertRaises(errors.NotBranchError,
1136
1065
                          bzrdir.BzrDir.open_from_transport, oldt)
1137
 
        new_url = self._qualified_url(self.new_server.host,
 
1066
        new_url = self._qualified_url(self.new_server.host, 
1138
1067
                                      self.new_server.port)
1139
1068
        newt = self._transport(new_url)
1140
1069
        self.assertRaises(errors.NotBranchError,
1141
1070
                          bzrdir.BzrDir.open_from_transport, newt)
1142
1071
 
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):
 
1072
 
 
1073
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop,
 
1074
                                  TestCaseWithTwoWebservers):
1156
1075
    """Tests redirections for urllib implementation"""
1157
1076
 
 
1077
    _qualifier = 'urllib'
1158
1078
    _transport = HttpTransport_urllib
1159
1079
 
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
1080
 
1166
1081
 
1167
1082
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
1168
 
                                  TestHTTPRedirections,
1169
 
                                  http_utils.TestCaseWithTwoWebservers):
 
1083
                                  TestHTTPRedirectionLoop,
 
1084
                                  TestCaseWithTwoWebservers):
1170
1085
    """Tests redirections for pycurl implementation"""
1171
1086
 
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
 
1087
    _qualifier = 'pycurl'
1200
1088
 
1201
1089
 
1202
1090
class TestDotBzrHidden(TestCaseWithTransport):
1237
1125
 
1238
1126
class _TestBzrDir(bzrdir.BzrDirMeta1):
1239
1127
    """Test BzrDir implementation for TestBzrDirSprout.
1240
 
 
 
1128
    
1241
1129
    When created a _TestBzrDir already has repository and a branch.  The branch
1242
1130
    is a test double as well.
1243
1131
    """
1250
1138
    def open_branch(self, unsupported=False):
1251
1139
        return self.test_branch
1252
1140
 
1253
 
    def cloning_metadir(self, require_stacking=False):
 
1141
    def cloning_metadir(self):
1254
1142
        return _TestBzrDirFormat()
1255
1143
 
1256
1144
 
1257
 
class _TestBranchFormat(bzrlib.branch.BranchFormat):
1258
 
    """Test Branch format for TestBzrDirSprout."""
1259
 
 
1260
 
 
1261
1145
class _TestBranch(bzrlib.branch.Branch):
1262
1146
    """Test Branch implementation for TestBzrDirSprout."""
1263
1147
 
1264
1148
    def __init__(self, *args, **kwargs):
1265
 
        self._format = _TestBranchFormat()
1266
1149
        super(_TestBranch, self).__init__(*args, **kwargs)
1267
1150
        self.calls = []
1268
 
        self._parent = None
1269
 
 
 
1151
    
1270
1152
    def sprout(self, *args, **kwargs):
1271
1153
        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
1154
 
1283
1155
 
1284
1156
class TestBzrDirSprout(TestCaseWithMemoryTransport):
1289
1161
        Usually, BzrDir.sprout should delegate to the branch's sprout method
1290
1162
        for part of the work.  This allows the source branch to control the
1291
1163
        choice of format for the new branch.
1292
 
 
 
1164
        
1293
1165
        There are exceptions, but this tests avoids them:
1294
1166
          - if there's no branch in the source bzrdir,
1295
1167
          - or if the stacking has been requested and the format needs to be
1309
1181
        result = source_bzrdir.sprout(target_url, recurse='no')
1310
1182
 
1311
1183
        # 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'))
 
1184
        self.assertEqual(['sprout'], source_bzrdir.test_branch.calls)
 
1185