~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Merge config-lock-remote into config-options

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
from bzrlib import (
34
34
    branch as _mod_branch,
35
35
    cleanup,
36
 
    config,
37
 
    controldir,
38
36
    errors,
39
37
    fetch,
40
38
    graph,
65
63
    )
66
64
 
67
65
from bzrlib import (
 
66
    config,
 
67
    controldir,
68
68
    hooks,
69
69
    registry,
70
70
    )
1416
1416
    @classmethod
1417
1417
    def get_format_string(cls):
1418
1418
        """Return the ASCII format string that identifies this format."""
1419
 
        raise NotImplementedError(self.get_format_string)
 
1419
        raise NotImplementedError(cls.get_format_string)
1420
1420
 
1421
1421
    def initialize_on_transport(self, transport):
1422
1422
        """Initialize a new bzrdir in the base directory of a Transport."""