← 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: Jelmer Vernooij
  • Date: 2011-10-14 12:49:33 UTC
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014124933-732wmdc39ebzga0b
Fix last locking issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
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
24
24
import sys
25
25
 
26
26
from bzrlib import (
 
27
    branch,
27
28
    bzrdir,
 
29
    config,
 
30
    controldir,
28
31
    errors,
29
32
    help_topics,
 
33
    lock,
30
34
    repository,
 
35
    revision as _mod_revision,
31
36
    osutils,
32
37
    remote,
 
38
    symbol_versioning,
 
39
    transport as _mod_transport,
33
40
    urlutils,
34
41
    win32utils,
35
 
    workingtree,
 
42
    workingtree_3,
 
43
    workingtree_4,
36
44
    )
37
45
import bzrlib.branch
38
 
from bzrlib.errors import (NotBranchError,
39
 
                           NoColocatedBranchSupport,
40
 
                           UnknownFormatError,
41
 
                           UnsupportedFormatError,
42
 
                           )
 
46
from bzrlib.errors import (
 
47
    NotBranchError,
 
48
    NoColocatedBranchSupport,
 
49
    UnknownFormatError,
 
50
    UnsupportedFormatError,
 
51
    )
43
52
from bzrlib.tests import (
44
53
    TestCase,
45
54
    TestCaseWithMemoryTransport,
52
61
    )
53
62
from bzrlib.tests.test_http import TestWithTransport_pycurl
54
63
from bzrlib.transport import (
55
 
    get_transport,
56
64
    memory,
 
65
    pathfilter,
57
66
    )
58
67
from bzrlib.transport.http._urllib import HttpTransport_urllib
59
68
from bzrlib.transport.nosmart import NoSmartTransportDecorator
60
69
from bzrlib.transport.readonly import ReadonlyTransportDecorator
61
 
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
 
70
from bzrlib.repofmt import knitrepo, knitpack_repo
62
71
 
63
72
 
64
73
class TestDefaultFormat(TestCase):
65
74
 
66
75
    def test_get_set_default_format(self):
67
76
        old_format = bzrdir.BzrDirFormat.get_default_format()
68
 
        # default is BzrDirFormat6
69
 
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
70
 
        bzrdir.BzrDirFormat._set_default_format(SampleBzrDirFormat())
 
77
        # default is BzrDirMetaFormat1
 
78
        self.assertIsInstance(old_format, bzrdir.BzrDirMetaFormat1)
 
79
        controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
71
80
        # creating a bzr dir should now create an instrumented dir.
72
81
        try:
73
82
            result = bzrdir.BzrDir.create('memory:///')
74
 
            self.failUnless(isinstance(result, SampleBzrDir))
 
83
            self.assertIsInstance(result, SampleBzrDir)
75
84
        finally:
76
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
85
            controldir.ControlDirFormat._set_default_format(old_format)
77
86
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
78
87
 
79
88
 
 
89
class DeprecatedBzrDirFormat(bzrdir.BzrDirFormat):
 
90
    """A deprecated bzr dir format."""
 
91
 
 
92
 
80
93
class TestFormatRegistry(TestCase):
81
94
 
82
95
    def make_format_registry(self):
83
 
        my_format_registry = bzrdir.BzrDirFormatRegistry()
84
 
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
85
 
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
86
 
            ' repositories', deprecated=True)
87
 
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
88
 
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
89
 
        my_format_registry.register_metadir('knit',
 
96
        my_format_registry = controldir.ControlDirFormatRegistry()
 
97
        my_format_registry.register('deprecated', DeprecatedBzrDirFormat,
 
98
            'Some format.  Slower and unawesome and deprecated.',
 
99
            deprecated=True)
 
100
        my_format_registry.register_lazy('lazy', 'bzrlib.tests.test_bzrdir',
 
101
            'DeprecatedBzrDirFormat', 'Format registered lazily',
 
102
            deprecated=True)
 
103
        bzrdir.register_metadir(my_format_registry, 'knit',
90
104
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
91
105
            'Format using knits',
92
106
            )
93
107
        my_format_registry.set_default('knit')
94
 
        my_format_registry.register_metadir(
 
108
        bzrdir.register_metadir(my_format_registry,
95
109
            'branch6',
96
110
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
97
111
            'Experimental successor to knit.  Use at your own risk.',
98
112
            branch_format='bzrlib.branch.BzrBranchFormat6',
99
113
            experimental=True)
100
 
        my_format_registry.register_metadir(
 
114
        bzrdir.register_metadir(my_format_registry,
101
115
            'hidden format',
102
116
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
103
117
            'Experimental successor to knit.  Use at your own risk.',
104
118
            branch_format='bzrlib.branch.BzrBranchFormat6', hidden=True)
105
 
        my_format_registry.register('hiddenweave', bzrdir.BzrDirFormat6,
106
 
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
107
 
            ' repositories', hidden=True)
108
 
        my_format_registry.register_lazy('hiddenlazy', 'bzrlib.bzrdir',
109
 
            'BzrDirFormat6', 'Format registered lazily', deprecated=True,
110
 
            hidden=True)
 
119
        my_format_registry.register('hiddendeprecated', DeprecatedBzrDirFormat,
 
120
            'Old format.  Slower and does not support things. ', hidden=True)
 
121
        my_format_registry.register_lazy('hiddenlazy', 'bzrlib.tests.test_bzrdir',
 
122
            'DeprecatedBzrDirFormat', 'Format registered lazily',
 
123
            deprecated=True, hidden=True)
111
124
        return my_format_registry
112
125
 
113
126
    def test_format_registry(self):
114
127
        my_format_registry = self.make_format_registry()
115
128
        my_bzrdir = my_format_registry.make_bzrdir('lazy')
116
 
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
117
 
        my_bzrdir = my_format_registry.make_bzrdir('weave')
118
 
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
 
129
        self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
 
130
        my_bzrdir = my_format_registry.make_bzrdir('deprecated')
 
131
        self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
119
132
        my_bzrdir = my_format_registry.make_bzrdir('default')
120
133
        self.assertIsInstance(my_bzrdir.repository_format,
121
134
            knitrepo.RepositoryFormatKnit1)
134
147
                         my_format_registry.get_help('knit'))
135
148
        self.assertEqual('Format using knits',
136
149
                         my_format_registry.get_help('default'))
137
 
        self.assertEqual('Pre-0.8 format.  Slower and does not support'
138
 
                         ' checkouts or shared repositories',
139
 
                         my_format_registry.get_help('weave'))
 
150
        self.assertEqual('Some format.  Slower and unawesome and deprecated.',
 
151
                         my_format_registry.get_help('deprecated'))
140
152
 
141
153
    def test_help_topic(self):
142
154
        topics = help_topics.HelpTopicRegistry()
166
178
            self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'),
167
179
                          bzrdir.format_registry.get('default'))
168
180
            self.assertIs(
169
 
                repository.RepositoryFormat.get_default_format().__class__,
 
181
                repository.format_registry.get_default().__class__,
170
182
                knitrepo.RepositoryFormatKnit3)
171
183
        finally:
172
184
            bzrdir.format_registry.set_default_repository(old_default)
173
185
 
174
186
    def test_aliases(self):
175
 
        a_registry = bzrdir.BzrDirFormatRegistry()
176
 
        a_registry.register('weave', bzrdir.BzrDirFormat6,
177
 
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
178
 
            ' repositories', deprecated=True)
179
 
        a_registry.register('weavealias', bzrdir.BzrDirFormat6,
180
 
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
181
 
            ' repositories', deprecated=True, alias=True)
182
 
        self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
 
187
        a_registry = controldir.ControlDirFormatRegistry()
 
188
        a_registry.register('deprecated', DeprecatedBzrDirFormat,
 
189
            'Old format.  Slower and does not support stuff',
 
190
            deprecated=True)
 
191
        a_registry.register('deprecatedalias', DeprecatedBzrDirFormat,
 
192
            'Old format.  Slower and does not support stuff',
 
193
            deprecated=True, alias=True)
 
194
        self.assertEqual(frozenset(['deprecatedalias']), a_registry.aliases())
183
195
 
184
196
 
185
197
class SampleBranch(bzrlib.branch.Branch):
242
254
        return "opened branch."
243
255
 
244
256
 
 
257
class BzrDirFormatTest1(bzrdir.BzrDirMetaFormat1):
 
258
 
 
259
    @staticmethod
 
260
    def get_format_string():
 
261
        return "Test format 1"
 
262
 
 
263
 
 
264
class BzrDirFormatTest2(bzrdir.BzrDirMetaFormat1):
 
265
 
 
266
    @staticmethod
 
267
    def get_format_string():
 
268
        return "Test format 2"
 
269
 
 
270
 
245
271
class TestBzrDirFormat(TestCaseWithTransport):
246
272
    """Tests for the BzrDirFormat facility."""
247
273
 
248
274
    def test_find_format(self):
249
275
        # is the right format object found for a branch?
250
276
        # create a branch with a few known format objects.
251
 
        # this is not quite the same as
252
 
        t = get_transport(self.get_url())
 
277
        bzrdir.BzrProber.formats.register(BzrDirFormatTest1.get_format_string(),
 
278
            BzrDirFormatTest1())
 
279
        self.addCleanup(bzrdir.BzrProber.formats.remove,
 
280
            BzrDirFormatTest1.get_format_string())
 
281
        bzrdir.BzrProber.formats.register(BzrDirFormatTest2.get_format_string(),
 
282
            BzrDirFormatTest2())
 
283
        self.addCleanup(bzrdir.BzrProber.formats.remove,
 
284
            BzrDirFormatTest2.get_format_string())
 
285
        t = self.get_transport()
253
286
        self.build_tree(["foo/", "bar/"], transport=t)
254
287
        def check_format(format, url):
255
288
            format.initialize(url)
256
 
            t = get_transport(url)
 
289
            t = _mod_transport.get_transport_from_path(url)
257
290
            found_format = bzrdir.BzrDirFormat.find_format(t)
258
 
            self.failUnless(isinstance(found_format, format.__class__))
259
 
        check_format(bzrdir.BzrDirFormat5(), "foo")
260
 
        check_format(bzrdir.BzrDirFormat6(), "bar")
 
291
            self.assertIsInstance(found_format, format.__class__)
 
292
        check_format(BzrDirFormatTest1(), "foo")
 
293
        check_format(BzrDirFormatTest2(), "bar")
261
294
 
262
295
    def test_find_format_nothing_there(self):
263
296
        self.assertRaises(NotBranchError,
264
297
                          bzrdir.BzrDirFormat.find_format,
265
 
                          get_transport('.'))
 
298
                          _mod_transport.get_transport_from_path('.'))
266
299
 
267
300
    def test_find_format_unknown_format(self):
268
 
        t = get_transport(self.get_url())
 
301
        t = self.get_transport()
269
302
        t.mkdir('.bzr')
270
303
        t.put_bytes('.bzr/branch-format', '')
271
304
        self.assertRaises(UnknownFormatError,
272
305
                          bzrdir.BzrDirFormat.find_format,
273
 
                          get_transport('.'))
 
306
                          _mod_transport.get_transport_from_path('.'))
274
307
 
275
308
    def test_register_unregister_format(self):
276
309
        format = SampleBzrDirFormat()
278
311
        # make a bzrdir
279
312
        format.initialize(url)
280
313
        # register a format for it.
281
 
        bzrdir.BzrDirFormat.register_format(format)
 
314
        bzrdir.BzrProber.formats.register(format.get_format_string(), format)
282
315
        # which bzrdir.Open will refuse (not supported)
283
316
        self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open, url)
284
317
        # which bzrdir.open_containing will refuse (not supported)
285
318
        self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open_containing, url)
286
319
        # but open_downlevel will work
287
 
        t = get_transport(url)
 
320
        t = _mod_transport.get_transport_from_url(url)
288
321
        self.assertEqual(format.open(t), bzrdir.BzrDir.open_unsupported(url))
289
322
        # unregister the format
290
 
        bzrdir.BzrDirFormat.unregister_format(format)
 
323
        bzrdir.BzrProber.formats.remove(format.get_format_string())
291
324
        # now open_downlevel should fail too.
292
325
        self.assertRaises(UnknownFormatError, bzrdir.BzrDir.open_unsupported, url)
293
326
 
470
503
    def test_default_stacking_with_stackable_branch_unstackable_repo(self):
471
504
        # Make stackable source branch with an unstackable repo format.
472
505
        source_bzrdir = self.make_bzrdir('source')
473
 
        pack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
 
506
        knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
474
507
        source_branch = bzrlib.branch.BzrBranchFormat7().initialize(
475
508
            source_bzrdir)
476
509
        # Make a directory with a default stacking policy
480
513
        # Clone source into directory
481
514
        target = source_bzrdir.clone(self.get_url('parent/target'))
482
515
 
 
516
    def test_format_initialize_on_transport_ex_stacked_on(self):
 
517
        # trunk is a stackable format.  Note that its in the same server area
 
518
        # which is what launchpad does, but not sufficient to exercise the
 
519
        # general case.
 
520
        trunk = self.make_branch('trunk', format='1.9')
 
521
        t = self.get_transport('stacked')
 
522
        old_fmt = bzrdir.format_registry.make_bzrdir('pack-0.92')
 
523
        repo_name = old_fmt.repository_format.network_name()
 
524
        # Should end up with a 1.9 format (stackable)
 
525
        repo, control, require_stacking, repo_policy = \
 
526
            old_fmt.initialize_on_transport_ex(t,
 
527
                    repo_format_name=repo_name, stacked_on='../trunk',
 
528
                    stack_on_pwd=t.base)
 
529
        if repo is not None:
 
530
            # Repositories are open write-locked
 
531
            self.assertTrue(repo.is_write_locked())
 
532
            self.addCleanup(repo.unlock)
 
533
        else:
 
534
            repo = control.open_repository()
 
535
        self.assertIsInstance(control, bzrdir.BzrDir)
 
536
        opened = bzrdir.BzrDir.open(t.base)
 
537
        if not isinstance(old_fmt, remote.RemoteBzrDirFormat):
 
538
            self.assertEqual(control._format.network_name(),
 
539
                old_fmt.network_name())
 
540
            self.assertEqual(control._format.network_name(),
 
541
                opened._format.network_name())
 
542
        self.assertEqual(control.__class__, opened.__class__)
 
543
        self.assertLength(1, repo._fallback_repositories)
 
544
 
483
545
    def test_sprout_obeys_stacking_policy(self):
484
546
        child_branch, new_child_transport = self.prepare_default_stacking()
485
547
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
676
738
        self.assertEqual(relpath, 'baz')
677
739
 
678
740
    def test_open_containing_from_transport(self):
679
 
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport,
680
 
                          get_transport(self.get_readonly_url('')))
681
 
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport,
682
 
                          get_transport(self.get_readonly_url('g/p/q')))
 
741
        self.assertRaises(NotBranchError,
 
742
            bzrdir.BzrDir.open_containing_from_transport,
 
743
            _mod_transport.get_transport_from_url(self.get_readonly_url('')))
 
744
        self.assertRaises(NotBranchError,
 
745
            bzrdir.BzrDir.open_containing_from_transport,
 
746
            _mod_transport.get_transport_from_url(
 
747
                self.get_readonly_url('g/p/q')))
683
748
        control = bzrdir.BzrDir.create(self.get_url())
684
749
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
685
 
            get_transport(self.get_readonly_url('')))
 
750
            _mod_transport.get_transport_from_url(
 
751
                self.get_readonly_url('')))
686
752
        self.assertEqual('', relpath)
687
753
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
688
 
            get_transport(self.get_readonly_url('g/p/q')))
 
754
            _mod_transport.get_transport_from_url(
 
755
                self.get_readonly_url('g/p/q')))
689
756
        self.assertEqual('g/p/q', relpath)
690
757
 
691
758
    def test_open_containing_tree_or_branch(self):
735
802
        # transport pointing at bzrdir should give a bzrdir with root transport
736
803
        # set to the given transport
737
804
        control = bzrdir.BzrDir.create(self.get_url())
738
 
        transport = get_transport(self.get_url())
739
 
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
740
 
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
 
805
        t = self.get_transport()
 
806
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(t)
 
807
        self.assertEqual(t.base, opened_bzrdir.root_transport.base)
741
808
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
742
809
 
743
810
    def test_open_from_transport_no_bzrdir(self):
744
 
        transport = get_transport(self.get_url())
745
 
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
746
 
                          transport)
 
811
        t = self.get_transport()
 
812
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
747
813
 
748
814
    def test_open_from_transport_bzrdir_in_parent(self):
749
815
        control = bzrdir.BzrDir.create(self.get_url())
750
 
        transport = get_transport(self.get_url())
751
 
        transport.mkdir('subdir')
752
 
        transport = transport.clone('subdir')
753
 
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
754
 
                          transport)
 
816
        t = self.get_transport()
 
817
        t.mkdir('subdir')
 
818
        t = t.clone('subdir')
 
819
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
755
820
 
756
821
    def test_sprout_recursive(self):
757
822
        tree = self.make_branch_and_tree('tree1',
766
831
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
767
832
        tree2.lock_read()
768
833
        self.addCleanup(tree2.unlock)
769
 
        self.failUnlessExists('tree2/subtree/file')
 
834
        self.assertPathExists('tree2/subtree/file')
770
835
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
771
836
 
772
837
    def test_cloning_metadir(self):
776
841
        branch = self.make_branch('branch', format='knit')
777
842
        format = branch.bzrdir.cloning_metadir()
778
843
        self.assertIsInstance(format.workingtree_format,
779
 
            workingtree.WorkingTreeFormat3)
 
844
            workingtree_4.WorkingTreeFormat6)
780
845
 
781
846
    def test_sprout_recursive_treeless(self):
782
847
        tree = self.make_branch_and_tree('tree1',
787
852
        self.build_tree(['tree1/subtree/file'])
788
853
        sub_tree.add('file')
789
854
        tree.commit('Initial commit')
 
855
        # The following line force the orhaning to reveal bug #634470
 
856
        tree.branch.get_config().set_user_option(
 
857
            'bzr.transform.orphan_policy', 'move')
790
858
        tree.bzrdir.destroy_workingtree()
 
859
        # FIXME: subtree/.bzr is left here which allows the test to pass (or
 
860
        # fail :-( ) -- vila 20100909
791
861
        repo = self.make_repository('repo', shared=True,
792
862
            format='dirstate-with-subtree')
793
863
        repo.set_make_working_trees(False)
794
 
        tree.bzrdir.sprout('repo/tree2')
795
 
        self.failUnlessExists('repo/tree2/subtree')
796
 
        self.failIfExists('repo/tree2/subtree/file')
 
864
        # FIXME: we just deleted the workingtree and now we want to use it ????
 
865
        # At a minimum, we should use tree.branch below (but this fails too
 
866
        # currently) or stop calling this test 'treeless'. Specifically, I've
 
867
        # turn the line below into an assertRaises when 'subtree/.bzr' is
 
868
        # orphaned and sprout tries to access the branch there (which is left
 
869
        # by bzrdir.BzrDirMeta1.destroy_workingtree when it ignores the
 
870
        # [DeletingParent('Not deleting', u'subtree', None)] conflict). See bug
 
871
        # #634470.  -- vila 20100909
 
872
        self.assertRaises(errors.NotBranchError,
 
873
                          tree.bzrdir.sprout, 'repo/tree2')
 
874
#        self.assertPathExists('repo/tree2/subtree')
 
875
#        self.assertPathDoesNotExist('repo/tree2/subtree/file')
797
876
 
798
877
    def make_foo_bar_baz(self):
799
878
        foo = bzrdir.BzrDir.create_branch_convenience('foo').bzrdir
803
882
 
804
883
    def test_find_bzrdirs(self):
805
884
        foo, bar, baz = self.make_foo_bar_baz()
806
 
        transport = get_transport(self.get_url())
807
 
        self.assertEqualBzrdirs([baz, foo, bar],
808
 
                                bzrdir.BzrDir.find_bzrdirs(transport))
 
885
        t = self.get_transport()
 
886
        self.assertEqualBzrdirs([baz, foo, bar], bzrdir.BzrDir.find_bzrdirs(t))
 
887
 
 
888
    def make_fake_permission_denied_transport(self, transport, paths):
 
889
        """Create a transport that raises PermissionDenied for some paths."""
 
890
        def filter(path):
 
891
            if path in paths:
 
892
                raise errors.PermissionDenied(path)
 
893
            return path
 
894
        path_filter_server = pathfilter.PathFilteringServer(transport, filter)
 
895
        path_filter_server.start_server()
 
896
        self.addCleanup(path_filter_server.stop_server)
 
897
        path_filter_transport = pathfilter.PathFilteringTransport(
 
898
            path_filter_server, '.')
 
899
        return (path_filter_server, path_filter_transport)
 
900
 
 
901
    def assertBranchUrlsEndWith(self, expect_url_suffix, actual_bzrdirs):
 
902
        """Check that each branch url ends with the given suffix."""
 
903
        for actual_bzrdir in actual_bzrdirs:
 
904
            self.assertEndsWith(actual_bzrdir.user_url, expect_url_suffix)
 
905
 
 
906
    def test_find_bzrdirs_permission_denied(self):
 
907
        foo, bar, baz = self.make_foo_bar_baz()
 
908
        t = self.get_transport()
 
909
        path_filter_server, path_filter_transport = \
 
910
            self.make_fake_permission_denied_transport(t, ['foo'])
 
911
        # local transport
 
912
        self.assertBranchUrlsEndWith('/baz/',
 
913
            bzrdir.BzrDir.find_bzrdirs(path_filter_transport))
 
914
        # smart server
 
915
        smart_transport = self.make_smart_server('.',
 
916
            backing_server=path_filter_server)
 
917
        self.assertBranchUrlsEndWith('/baz/',
 
918
            bzrdir.BzrDir.find_bzrdirs(smart_transport))
809
919
 
810
920
    def test_find_bzrdirs_list_current(self):
811
921
        def list_current(transport):
812
922
            return [s for s in transport.list_dir('') if s != 'baz']
813
923
 
814
924
        foo, bar, baz = self.make_foo_bar_baz()
815
 
        transport = get_transport(self.get_url())
816
 
        self.assertEqualBzrdirs([foo, bar],
817
 
                                bzrdir.BzrDir.find_bzrdirs(transport,
818
 
                                    list_current=list_current))
819
 
 
 
925
        t = self.get_transport()
 
926
        self.assertEqualBzrdirs(
 
927
            [foo, bar],
 
928
            bzrdir.BzrDir.find_bzrdirs(t, list_current=list_current))
820
929
 
821
930
    def test_find_bzrdirs_evaluate(self):
822
931
        def evaluate(bzrdir):
823
932
            try:
824
933
                repo = bzrdir.open_repository()
825
 
            except NoRepositoryPresent:
 
934
            except errors.NoRepositoryPresent:
826
935
                return True, bzrdir.root_transport.base
827
936
            else:
828
937
                return False, bzrdir.root_transport.base
829
938
 
830
939
        foo, bar, baz = self.make_foo_bar_baz()
831
 
        transport = get_transport(self.get_url())
 
940
        t = self.get_transport()
832
941
        self.assertEqual([baz.root_transport.base, foo.root_transport.base],
833
 
                         list(bzrdir.BzrDir.find_bzrdirs(transport,
834
 
                                                         evaluate=evaluate)))
 
942
                         list(bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate)))
835
943
 
836
944
    def assertEqualBzrdirs(self, first, second):
837
945
        first = list(first)
844
952
        root = self.make_repository('', shared=True)
845
953
        foo, bar, baz = self.make_foo_bar_baz()
846
954
        qux = self.make_bzrdir('foo/qux')
847
 
        transport = get_transport(self.get_url())
848
 
        branches = bzrdir.BzrDir.find_branches(transport)
 
955
        t = self.get_transport()
 
956
        branches = bzrdir.BzrDir.find_branches(t)
849
957
        self.assertEqual(baz.root_transport.base, branches[0].base)
850
958
        self.assertEqual(foo.root_transport.base, branches[1].base)
851
959
        self.assertEqual(bar.root_transport.base, branches[2].base)
852
960
 
853
961
        # ensure this works without a top-level repo
854
 
        branches = bzrdir.BzrDir.find_branches(transport.clone('foo'))
 
962
        branches = bzrdir.BzrDir.find_branches(t.clone('foo'))
855
963
        self.assertEqual(foo.root_transport.base, branches[0].base)
856
964
        self.assertEqual(bar.root_transport.base, branches[1].base)
857
965
 
858
966
 
 
967
class TestMissingRepoBranchesSkipped(TestCaseWithMemoryTransport):
 
968
 
 
969
    def test_find_bzrdirs_missing_repo(self):
 
970
        t = self.get_transport()
 
971
        arepo = self.make_repository('arepo', shared=True)
 
972
        abranch_url = arepo.user_url + '/abranch'
 
973
        abranch = bzrdir.BzrDir.create(abranch_url).create_branch()
 
974
        t.delete_tree('arepo/.bzr')
 
975
        self.assertRaises(errors.NoRepositoryPresent,
 
976
            branch.Branch.open, abranch_url)
 
977
        self.make_branch('baz')
 
978
        for actual_bzrdir in bzrdir.BzrDir.find_branches(t):
 
979
            self.assertEndsWith(actual_bzrdir.user_url, '/baz/')
 
980
 
 
981
 
859
982
class TestMeta1DirFormat(TestCaseWithTransport):
860
983
    """Tests specific to the meta1 dir format."""
861
984
 
868
991
                         dir.get_branch_transport(bzrlib.branch.BzrBranchFormat5()).base)
869
992
        repository_base = t.clone('repository').base
870
993
        self.assertEqual(repository_base, dir.get_repository_transport(None).base)
 
994
        repository_format = repository.format_registry.get_default()
871
995
        self.assertEqual(repository_base,
872
 
                         dir.get_repository_transport(weaverepo.RepositoryFormat7()).base)
 
996
                         dir.get_repository_transport(repository_format).base)
873
997
        checkout_base = t.clone('checkout').base
874
998
        self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base)
875
999
        self.assertEqual(checkout_base,
876
 
                         dir.get_workingtree_transport(workingtree.WorkingTreeFormat3()).base)
 
1000
                         dir.get_workingtree_transport(workingtree_3.WorkingTreeFormat3()).base)
877
1001
 
878
1002
    def test_meta1dir_uses_lockdir(self):
879
1003
        """Meta1 format uses a LockDir to guard the whole directory, not a file."""
921
1045
        self.assertEqual(2, rpc_count)
922
1046
 
923
1047
 
924
 
class TestFormat5(TestCaseWithTransport):
925
 
    """Tests specific to the version 5 bzrdir format."""
926
 
 
927
 
    def test_same_lockfiles_between_tree_repo_branch(self):
928
 
        # this checks that only a single lockfiles instance is created
929
 
        # for format 5 objects
930
 
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
931
 
        def check_dir_components_use_same_lock(dir):
932
 
            ctrl_1 = dir.open_repository().control_files
933
 
            ctrl_2 = dir.open_branch().control_files
934
 
            ctrl_3 = dir.open_workingtree()._control_files
935
 
            self.assertTrue(ctrl_1 is ctrl_2)
936
 
            self.assertTrue(ctrl_2 is ctrl_3)
937
 
        check_dir_components_use_same_lock(dir)
938
 
        # and if we open it normally.
939
 
        dir = bzrdir.BzrDir.open(self.get_url())
940
 
        check_dir_components_use_same_lock(dir)
941
 
 
942
 
    def test_can_convert(self):
943
 
        # format 5 dirs are convertable
944
 
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
945
 
        self.assertTrue(dir.can_convert_format())
946
 
 
947
 
    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()))
956
 
 
957
 
 
958
 
class TestFormat6(TestCaseWithTransport):
959
 
    """Tests specific to the version 6 bzrdir format."""
960
 
 
961
 
    def test_same_lockfiles_between_tree_repo_branch(self):
962
 
        # this checks that only a single lockfiles instance is created
963
 
        # for format 6 objects
964
 
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
965
 
        def check_dir_components_use_same_lock(dir):
966
 
            ctrl_1 = dir.open_repository().control_files
967
 
            ctrl_2 = dir.open_branch().control_files
968
 
            ctrl_3 = dir.open_workingtree()._control_files
969
 
            self.assertTrue(ctrl_1 is ctrl_2)
970
 
            self.assertTrue(ctrl_2 is ctrl_3)
971
 
        check_dir_components_use_same_lock(dir)
972
 
        # and if we open it normally.
973
 
        dir = bzrdir.BzrDir.open(self.get_url())
974
 
        check_dir_components_use_same_lock(dir)
975
 
 
976
 
    def test_can_convert(self):
977
 
        # format 6 dirs are convertable
978
 
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
979
 
        self.assertTrue(dir.can_convert_format())
980
 
 
981
 
    def test_needs_conversion(self):
982
 
        # 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()))
986
 
 
987
 
 
988
 
class NotBzrDir(bzrlib.bzrdir.BzrDir):
989
 
    """A non .bzr based control directory."""
990
 
 
991
 
    def __init__(self, transport, format):
992
 
        self._format = format
993
 
        self.root_transport = transport
994
 
        self.transport = transport.clone('.not')
995
 
 
996
 
 
997
 
class NotBzrDirFormat(bzrlib.bzrdir.BzrDirFormat):
998
 
    """A test class representing any non-.bzr based disk format."""
999
 
 
1000
 
    def initialize_on_transport(self, transport):
1001
 
        """Initialize a new .not dir in the base directory of a Transport."""
1002
 
        transport.mkdir('.not')
1003
 
        return self.open(transport)
1004
 
 
1005
 
    def open(self, transport):
1006
 
        """Open this directory."""
1007
 
        return NotBzrDir(transport, self)
1008
 
 
1009
 
    @classmethod
1010
 
    def _known_formats(self):
1011
 
        return set([NotBzrDirFormat()])
1012
 
 
1013
 
    @classmethod
1014
 
    def probe_transport(self, transport):
1015
 
        """Our format is present if the transport ends in '.not/'."""
1016
 
        if transport.has('.not'):
1017
 
            return NotBzrDirFormat()
1018
 
 
1019
 
 
1020
 
class TestNotBzrDir(TestCaseWithTransport):
1021
 
    """Tests for using the bzrdir api with a non .bzr based disk format.
1022
 
 
1023
 
    If/when one of these is in the core, we can let the implementation tests
1024
 
    verify this works.
1025
 
    """
1026
 
 
1027
 
    def test_create_and_find_format(self):
1028
 
        # create a .notbzr dir
1029
 
        format = NotBzrDirFormat()
1030
 
        dir = format.initialize(self.get_url())
1031
 
        self.assertIsInstance(dir, NotBzrDir)
1032
 
        # now probe for it.
1033
 
        bzrlib.bzrdir.BzrDirFormat.register_control_format(format)
1034
 
        try:
1035
 
            found = bzrlib.bzrdir.BzrDirFormat.find_format(
1036
 
                get_transport(self.get_url()))
1037
 
            self.assertIsInstance(found, NotBzrDirFormat)
1038
 
        finally:
1039
 
            bzrlib.bzrdir.BzrDirFormat.unregister_control_format(format)
1040
 
 
1041
 
    def test_included_in_known_formats(self):
1042
 
        bzrlib.bzrdir.BzrDirFormat.register_control_format(NotBzrDirFormat)
1043
 
        try:
1044
 
            formats = bzrlib.bzrdir.BzrDirFormat.known_formats()
1045
 
            for format in formats:
1046
 
                if isinstance(format, NotBzrDirFormat):
1047
 
                    return
1048
 
            self.fail("No NotBzrDirFormat in %s" % formats)
1049
 
        finally:
1050
 
            bzrlib.bzrdir.BzrDirFormat.unregister_control_format(NotBzrDirFormat)
1051
 
 
1052
 
 
1053
1048
class NonLocalTests(TestCaseWithTransport):
1054
1049
    """Tests for bzrdir static behaviour on non local paths."""
1055
1050
 
1074
1069
            self.get_url('foo'),
1075
1070
            force_new_tree=True,
1076
1071
            format=format)
1077
 
        t = get_transport(self.get_url('.'))
 
1072
        t = self.get_transport()
1078
1073
        self.assertFalse(t.has('foo'))
1079
1074
 
1080
1075
    def test_clone(self):
1096
1091
        my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2'))
1097
1092
        checkout_format = my_bzrdir.checkout_metadir()
1098
1093
        self.assertIsInstance(checkout_format.workingtree_format,
1099
 
                              workingtree.WorkingTreeFormat3)
 
1094
                              workingtree_4.WorkingTreeFormat4)
1100
1095
 
1101
1096
 
1102
1097
class TestHTTPRedirections(object):
1111
1106
    """
1112
1107
 
1113
1108
    def create_transport_readonly_server(self):
 
1109
        # We don't set the http protocol version, relying on the default
1114
1110
        return http_utils.HTTPServerRedirecting()
1115
1111
 
1116
1112
    def create_transport_secondary_server(self):
 
1113
        # We don't set the http protocol version, relying on the default
1117
1114
        return http_utils.HTTPServerRedirecting()
1118
1115
 
1119
1116
    def setUp(self):
1244
1241
 
1245
1242
    def __init__(self, *args, **kwargs):
1246
1243
        super(_TestBzrDir, self).__init__(*args, **kwargs)
1247
 
        self.test_branch = _TestBranch()
 
1244
        self.test_branch = _TestBranch(self.transport)
1248
1245
        self.test_branch.repository = self.create_repository()
1249
1246
 
1250
1247
    def open_branch(self, unsupported=False):
1261
1258
class _TestBranch(bzrlib.branch.Branch):
1262
1259
    """Test Branch implementation for TestBzrDirSprout."""
1263
1260
 
1264
 
    def __init__(self, *args, **kwargs):
 
1261
    def __init__(self, transport, *args, **kwargs):
1265
1262
        self._format = _TestBranchFormat()
 
1263
        self._transport = transport
 
1264
        self.base = transport.base
1266
1265
        super(_TestBranch, self).__init__(*args, **kwargs)
1267
1266
        self.calls = []
1268
1267
        self._parent = None
1269
1268
 
1270
1269
    def sprout(self, *args, **kwargs):
1271
1270
        self.calls.append('sprout')
1272
 
        return _TestBranch()
 
1271
        return _TestBranch(self._transport)
1273
1272
 
1274
1273
    def copy_content_into(self, destination, revision_id=None):
1275
1274
        self.calls.append('copy_content_into')
1276
1275
 
 
1276
    def last_revision(self):
 
1277
        return _mod_revision.NULL_REVISION
 
1278
 
1277
1279
    def get_parent(self):
1278
1280
        return self._parent
1279
1281
 
 
1282
    def _get_config(self):
 
1283
        return config.TransportConfig(self._transport, 'branch.conf')
 
1284
 
1280
1285
    def set_parent(self, parent):
1281
1286
        self._parent = parent
1282
1287
 
 
1288
    def lock_read(self):
 
1289
        return lock.LogicalLockResult(self.unlock)
 
1290
 
 
1291
    def unlock(self):
 
1292
        return
 
1293
 
1283
1294
 
1284
1295
class TestBzrDirSprout(TestCaseWithMemoryTransport):
1285
1296
 
1351
1362
        self.assertIsInstance(params, RepoInitHookParams)
1352
1363
        self.assertTrue(hasattr(params, 'bzrdir'))
1353
1364
        self.assertTrue(hasattr(params, 'repository'))
 
1365
 
 
1366
    def test_post_repo_init_hook_repr(self):
 
1367
        param_reprs = []
 
1368
        bzrdir.BzrDir.hooks.install_named_hook('post_repo_init',
 
1369
            lambda params: param_reprs.append(repr(params)), None)
 
1370
        self.make_repository('foo')
 
1371
        self.assertLength(1, param_reprs)
 
1372
        param_repr = param_reprs[0]
 
1373
        self.assertStartsWith(param_repr, '<RepoInitHookParams for ')
 
1374
 
 
1375
 
 
1376
class TestGenerateBackupName(TestCaseWithMemoryTransport):
 
1377
    # FIXME: This may need to be unified with test_osutils.TestBackupNames or
 
1378
    # moved to per_bzrdir or per_transport for better coverage ?
 
1379
    # -- vila 20100909
 
1380
 
 
1381
    def setUp(self):
 
1382
        super(TestGenerateBackupName, self).setUp()
 
1383
        self._transport = self.get_transport()
 
1384
        bzrdir.BzrDir.create(self.get_url(),
 
1385
            possible_transports=[self._transport])
 
1386
        self._bzrdir = bzrdir.BzrDir.open_from_transport(self._transport)
 
1387
 
 
1388
    def test_deprecated_generate_backup_name(self):
 
1389
        res = self.applyDeprecated(
 
1390
                symbol_versioning.deprecated_in((2, 3, 0)),
 
1391
                self._bzrdir.generate_backup_name, 'whatever')
 
1392
 
 
1393
    def test_new(self):
 
1394
        self.assertEqual("a.~1~", self._bzrdir._available_backup_name("a"))
 
1395
 
 
1396
    def test_exiting(self):
 
1397
        self._transport.put_bytes("a.~1~", "some content")
 
1398
        self.assertEqual("a.~2~", self._bzrdir._available_backup_name("a"))
 
1399