← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-17 07:33:12 UTC
  • mfrom: (3530.3.3 btree-graphindex)
  • Revision ID: pqm@pqm.ubuntu.com-20080717073312-reglpowwyo671081
(robertc) Intern GraphIndex strings and handle frozenset inputs to
        make_mpdiffs in the case of errors. (Robert Collins, Andrew Bennetts)

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