/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 dir.py

More renames.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
18
18
"""An adapter between a Git control dir and a Bazaar ControlDir."""
19
19
 
20
20
from bzrlib import (
21
 
    bzrdir,
22
21
    errors as bzr_errors,
23
22
    lockable_files,
24
23
    urlutils,
33
32
try:
34
33
    from bzrlib.controldir import (
35
34
        ControlDir,
 
35
        format_registry,
36
36
        )
37
37
except ImportError:
38
38
    # bzr < 2.3
39
39
    from bzrlib.bzrdir import (
40
40
        BzrDir,
 
41
        format_registry,
41
42
        )
42
43
    ControlDir = BzrDir
43
44
 
89
90
        return False
90
91
 
91
92
    def cloning_metadir(self, stacked=False):
92
 
        return bzrdir.format_registry.make_bzrdir("default")
 
93
        return format_registry.make_bzrdir("default")
93
94
 
94
95
    def _branch_name_to_ref(self, name):
95
96
        raise NotImplementedError(self._branch_name_to_ref)