/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: Jelmer Vernooij
  • Date: 2010-08-02 23:53:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5389.
  • Revision ID: jelmer@samba.org-20100802235316-v6a6p0r2a1os0dsn
base ControlDir on ControlComponent.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
83
83
class TestFormatRegistry(TestCase):
84
84
 
85
85
    def make_format_registry(self):
86
 
        my_format_registry = bzrdir.BzrDirFormatRegistry()
 
86
        my_format_registry = controldir.ControlDirFormatRegistry()
87
87
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
88
88
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
89
89
            ' repositories', deprecated=True)
90
90
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
91
91
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
92
 
        my_format_registry.register_metadir('knit',
 
92
        bzrdir.register_metadir(my_format_registry, 'knit',
93
93
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
94
94
            'Format using knits',
95
95
            )
96
96
        my_format_registry.set_default('knit')
97
 
        my_format_registry.register_metadir(
 
97
        bzrdir.register_metadir(my_format_registry,
98
98
            'branch6',
99
99
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
100
100
            'Experimental successor to knit.  Use at your own risk.',
101
101
            branch_format='bzrlib.branch.BzrBranchFormat6',
102
102
            experimental=True)
103
 
        my_format_registry.register_metadir(
 
103
        bzrdir.register_metadir(my_format_registry,
104
104
            'hidden format',
105
105
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
106
106
            'Experimental successor to knit.  Use at your own risk.',
175
175
            bzrdir.format_registry.set_default_repository(old_default)
176
176
 
177
177
    def test_aliases(self):
178
 
        a_registry = bzrdir.BzrDirFormatRegistry()
 
178
        a_registry = controldir.ControlDirFormatRegistry()
179
179
        a_registry.register('weave', bzrdir.BzrDirFormat6,
180
180
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
181
181
            ' repositories', deprecated=True)