/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: Daniel Watkins
  • Date: 2008-07-03 04:03:02 UTC
  • mto: This revision was merged to the branch mainline in revision 3583.
  • Revision ID: d.m.watkins@warwick.ac.uk-20080703040302-21t3eqdwo1o3fyj7
Cleaned out BRANCH.TODO.

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
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
 
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
426
 
564
427
class ChrootedTests(TestCaseWithTransport):
565
428
    """A support class that provides readonly urls outside the local namespace.
571
434
 
572
435
    def setUp(self):
573
436
        super(ChrootedTests, self).setUp()
574
 
        if not self.vfs_transport_factory == memory.MemoryServer:
575
 
            self.transport_readonly_server = http_server.HttpServer
 
437
        if not self.vfs_transport_factory == MemoryServer:
 
438
            self.transport_readonly_server = HttpServer
576
439
 
577
440
    def local_branch_path(self, branch):
578
441
         return os.path.realpath(urlutils.local_path_from_url(branch.base))
603
466
        self.assertEqual(os.path.realpath('topdir'),
604
467
                         self.local_branch_path(branch))
605
468
        self.assertEqual(
606
 
            osutils.realpath(os.path.join('topdir', '.bzr', 'repository')),
 
469
            os.path.realpath(os.path.join('topdir', '.bzr', 'repository')),
607
470
            repo.bzrdir.transport.local_abspath('repository'))
608
471
        self.assertEqual(relpath, 'foo')
609
472
 
616
479
        self.assertEqual(os.path.realpath('branch'),
617
480
                         self.local_branch_path(branch))
618
481
        self.assertEqual(
619
 
            osutils.realpath(os.path.join('branch', '.bzr', 'repository')),
 
482
            os.path.realpath(os.path.join('branch', '.bzr', 'repository')),
620
483
            repo.bzrdir.transport.local_abspath('repository'))
621
484
        self.assertEqual(relpath, 'foo')
622
485
 
628
491
        self.assertEqual(tree, None)
629
492
        self.assertEqual(branch, None)
630
493
        self.assertEqual(
631
 
            osutils.realpath(os.path.join('repo', '.bzr', 'repository')),
 
494
            os.path.realpath(os.path.join('repo', '.bzr', 'repository')),
632
495
            repo.bzrdir.transport.local_abspath('repository'))
633
496
        self.assertEqual(relpath, '')
634
497
 
643
506
        self.assertEqual(os.path.realpath('shared/branch'),
644
507
                         self.local_branch_path(branch))
645
508
        self.assertEqual(
646
 
            osutils.realpath(os.path.join('shared', '.bzr', 'repository')),
 
509
            os.path.realpath(os.path.join('shared', '.bzr', 'repository')),
647
510
            repo.bzrdir.transport.local_abspath('repository'))
648
511
        self.assertEqual(relpath, '')
649
512
 
658
521
        self.assertEqual(os.path.realpath('foo'),
659
522
                         self.local_branch_path(branch))
660
523
        self.assertEqual(
661
 
            osutils.realpath(os.path.join('foo', '.bzr', 'repository')),
 
524
            os.path.realpath(os.path.join('foo', '.bzr', 'repository')),
662
525
            repo.bzrdir.transport.local_abspath('repository'))
663
526
        self.assertEqual(relpath, 'bar')
664
527
 
671
534
        self.assertEqual(tree, None)
672
535
        self.assertEqual(branch, None)
673
536
        self.assertEqual(
674
 
            osutils.realpath(os.path.join('bar', '.bzr', 'repository')),
 
537
            os.path.realpath(os.path.join('bar', '.bzr', 'repository')),
675
538
            repo.bzrdir.transport.local_abspath('repository'))
676
539
        self.assertEqual(relpath, 'baz')
677
540
 
739
602
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
740
603
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
741
604
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
742
 
 
 
605
        
743
606
    def test_open_from_transport_no_bzrdir(self):
744
607
        transport = get_transport(self.get_url())
745
608
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
754
617
                          transport)
755
618
 
756
619
    def test_sprout_recursive(self):
757
 
        tree = self.make_branch_and_tree('tree1',
758
 
                                         format='dirstate-with-subtree')
 
620
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
759
621
        sub_tree = self.make_branch_and_tree('tree1/subtree',
760
622
            format='dirstate-with-subtree')
761
 
        sub_tree.set_root_id('subtree-root')
762
623
        tree.add_reference(sub_tree)
763
624
        self.build_tree(['tree1/subtree/file'])
764
625
        sub_tree.add('file')
765
626
        tree.commit('Initial commit')
766
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
767
 
        tree2.lock_read()
768
 
        self.addCleanup(tree2.unlock)
 
627
        tree.bzrdir.sprout('tree2')
769
628
        self.failUnlessExists('tree2/subtree/file')
770
 
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
771
629
 
772
630
    def test_cloning_metadir(self):
773
631
        """Ensure that cloning metadir is suitable"""
899
757
 
900
758
    def test_needs_conversion_different_working_tree(self):
901
759
        # 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)
 
760
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
761
        # test with 
 
762
        new_default = bzrdir.format_registry.make_bzrdir('dirstate')
 
763
        bzrdir.BzrDirFormat._set_default_format(new_default)
 
764
        try:
 
765
            tree = self.make_branch_and_tree('tree', format='knit')
 
766
            self.assertTrue(tree.bzrdir.needs_format_conversion())
 
767
        finally:
 
768
            bzrdir.BzrDirFormat._set_default_format(old_format)
922
769
 
923
770
 
924
771
class TestFormat5(TestCaseWithTransport):
925
772
    """Tests specific to the version 5 bzrdir format."""
926
773
 
927
774
    def test_same_lockfiles_between_tree_repo_branch(self):
928
 
        # this checks that only a single lockfiles instance is created
 
775
        # this checks that only a single lockfiles instance is created 
929
776
        # for format 5 objects
930
777
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
931
778
        def check_dir_components_use_same_lock(dir):
938
785
        # and if we open it normally.
939
786
        dir = bzrdir.BzrDir.open(self.get_url())
940
787
        check_dir_components_use_same_lock(dir)
941
 
 
 
788
    
942
789
    def test_can_convert(self):
943
790
        # format 5 dirs are convertable
944
791
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
945
792
        self.assertTrue(dir.can_convert_format())
946
 
 
 
793
    
947
794
    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()))
 
795
        # format 5 dirs need a conversion if they are not the default.
 
796
        # and they start of not the default.
 
797
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
798
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
799
        try:
 
800
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
 
801
            self.assertFalse(dir.needs_format_conversion())
 
802
        finally:
 
803
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
804
        self.assertTrue(dir.needs_format_conversion())
956
805
 
957
806
 
958
807
class TestFormat6(TestCaseWithTransport):
959
808
    """Tests specific to the version 6 bzrdir format."""
960
809
 
961
810
    def test_same_lockfiles_between_tree_repo_branch(self):
962
 
        # this checks that only a single lockfiles instance is created
 
811
        # this checks that only a single lockfiles instance is created 
963
812
        # for format 6 objects
964
813
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
965
814
        def check_dir_components_use_same_lock(dir):
972
821
        # and if we open it normally.
973
822
        dir = bzrdir.BzrDir.open(self.get_url())
974
823
        check_dir_components_use_same_lock(dir)
975
 
 
 
824
    
976
825
    def test_can_convert(self):
977
826
        # format 6 dirs are convertable
978
827
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
979
828
        self.assertTrue(dir.can_convert_format())
980
 
 
 
829
    
981
830
    def test_needs_conversion(self):
982
831
        # 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()))
 
832
        old_format = bzrdir.BzrDirFormat.get_default_format()
 
833
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
 
834
        try:
 
835
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
 
836
            self.assertTrue(dir.needs_format_conversion())
 
837
        finally:
 
838
            bzrdir.BzrDirFormat._set_default_format(old_format)
986
839
 
987
840
 
988
841
class NotBzrDir(bzrlib.bzrdir.BzrDir):
1019
872
 
1020
873
class TestNotBzrDir(TestCaseWithTransport):
1021
874
    """Tests for using the bzrdir api with a non .bzr based disk format.
1022
 
 
 
875
    
1023
876
    If/when one of these is in the core, we can let the implementation tests
1024
877
    verify this works.
1025
878
    """
1026
879
 
1027
880
    def test_create_and_find_format(self):
1028
 
        # create a .notbzr dir
 
881
        # create a .notbzr dir 
1029
882
        format = NotBzrDirFormat()
1030
883
        dir = format.initialize(self.get_url())
1031
884
        self.assertIsInstance(dir, NotBzrDir)
1055
908
 
1056
909
    def setUp(self):
1057
910
        super(NonLocalTests, self).setUp()
1058
 
        self.vfs_transport_factory = memory.MemoryServer
1059
 
 
 
911
        self.vfs_transport_factory = MemoryServer
 
912
    
1060
913
    def test_create_branch_convenience(self):
1061
914
        # outside a repo the default convenience output is a repo+branch_tree
1062
915
        format = bzrdir.format_registry.make_bzrdir('knit')
1099
952
                              workingtree.WorkingTreeFormat3)
1100
953
 
1101
954
 
1102
 
class TestHTTPRedirections(object):
1103
 
    """Test redirection between two http servers.
 
955
class TestHTTPRedirectionLoop(object):
 
956
    """Test redirection loop between two http servers.
1104
957
 
1105
958
    This MUST be used by daughter classes that also inherit from
1106
959
    TestCaseWithTwoWebservers.
1107
960
 
1108
961
    We can't inherit directly from TestCaseWithTwoWebservers or the
1109
962
    test framework will try to create an instance which cannot
1110
 
    run, its implementation being incomplete.
 
963
    run, its implementation being incomplete. 
1111
964
    """
1112
965
 
 
966
    # Should be defined by daughter classes to ensure redirection
 
967
    # still use the same transport implementation (not currently
 
968
    # enforced as it's a bit tricky to get right (see the FIXME
 
969
    # in BzrDir.open_from_transport for the unique use case so
 
970
    # far)
 
971
    _qualifier = None
 
972
 
1113
973
    def create_transport_readonly_server(self):
1114
 
        return http_utils.HTTPServerRedirecting()
 
974
        return HTTPServerRedirecting()
1115
975
 
1116
976
    def create_transport_secondary_server(self):
1117
 
        return http_utils.HTTPServerRedirecting()
 
977
        return HTTPServerRedirecting()
1118
978
 
1119
979
    def setUp(self):
1120
 
        super(TestHTTPRedirections, self).setUp()
 
980
        # Both servers redirect to each server creating a loop
 
981
        super(TestHTTPRedirectionLoop, self).setUp()
1121
982
        # The redirections will point to the new server
1122
983
        self.new_server = self.get_readonly_server()
1123
984
        # The requests to the old server will be redirected
1124
985
        self.old_server = self.get_secondary_server()
1125
986
        # Configure the redirections
1126
987
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
 
988
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
 
989
 
 
990
    def _qualified_url(self, host, port):
 
991
        return 'http+%s://%s:%s' % (self._qualifier, host, port)
1127
992
 
1128
993
    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
994
        # Starting from either server should loop
1132
 
        old_url = self._qualified_url(self.old_server.host,
 
995
        old_url = self._qualified_url(self.old_server.host, 
1133
996
                                      self.old_server.port)
1134
997
        oldt = self._transport(old_url)
1135
998
        self.assertRaises(errors.NotBranchError,
1136
999
                          bzrdir.BzrDir.open_from_transport, oldt)
1137
 
        new_url = self._qualified_url(self.new_server.host,
 
1000
        new_url = self._qualified_url(self.new_server.host, 
1138
1001
                                      self.new_server.port)
1139
1002
        newt = self._transport(new_url)
1140
1003
        self.assertRaises(errors.NotBranchError,
1141
1004
                          bzrdir.BzrDir.open_from_transport, newt)
1142
1005
 
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):
 
1006
 
 
1007
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop,
 
1008
                                  TestCaseWithTwoWebservers):
1156
1009
    """Tests redirections for urllib implementation"""
1157
1010
 
 
1011
    _qualifier = 'urllib'
1158
1012
    _transport = HttpTransport_urllib
1159
1013
 
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
1014
 
1166
1015
 
1167
1016
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
1168
 
                                  TestHTTPRedirections,
1169
 
                                  http_utils.TestCaseWithTwoWebservers):
 
1017
                                  TestHTTPRedirectionLoop,
 
1018
                                  TestCaseWithTwoWebservers):
1170
1019
    """Tests redirections for pycurl implementation"""
1171
1020
 
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
 
1021
    _qualifier = 'pycurl'
1200
1022
 
1201
1023
 
1202
1024
class TestDotBzrHidden(TestCaseWithTransport):
1226
1048
        b = bzrdir.BzrDir.create(urlutils.local_path_to_url('.'))
1227
1049
        self.build_tree(['a'])
1228
1050
        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'))