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

  • Committer: Jelmer Vernooij
  • Date: 2011-04-05 13:58:33 UTC
  • mfrom: (5757 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5770.
  • Revision ID: jelmer@samba.org-20110405135833-lzphu3vh7vzubiz9
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
29
29
 
30
30
from bzrlib.lazy_import import lazy_import
31
31
lazy_import(globals(), """
32
 
from stat import S_ISDIR
33
 
 
34
32
import bzrlib
35
33
from bzrlib import (
 
34
    branch as _mod_branch,
36
35
    cleanup,
37
36
    config,
38
37
    controldir,
49
48
    transport as _mod_transport,
50
49
    ui,
51
50
    urlutils,
52
 
    versionedfile,
53
51
    win32utils,
54
52
    workingtree,
55
53
    workingtree_4,
1082
1080
 
1083
1081
    def __init__(self):
1084
1082
        """Create the default hooks."""
1085
 
        hooks.Hooks.__init__(self)
1086
 
        self.create_hook(hooks.HookPoint('pre_open',
 
1083
        hooks.Hooks.__init__(self, "bzrlib.bzrdir", "BzrDir.hooks")
 
1084
        self.add_hook('pre_open',
1087
1085
            "Invoked before attempting to open a BzrDir with the transport "
1088
 
            "that the open will use.", (1, 14), None))
1089
 
        self.create_hook(hooks.HookPoint('post_repo_init',
 
1086
            "that the open will use.", (1, 14))
 
1087
        self.add_hook('post_repo_init',
1090
1088
            "Invoked after a repository has been initialized. "
1091
1089
            "post_repo_init is called with a "
1092
1090
            "bzrlib.bzrdir.RepoInitHookParams.",
1093
 
            (2, 2), None))
 
1091
            (2, 2))
1094
1092
 
1095
1093
# install the default hooks
1096
1094
BzrDir.hooks = BzrDirHooks()
1860
1858
            # TODO: conversions of Branch and Tree should be done by
1861
1859
            # InterXFormat lookups/some sort of registry.
1862
1860
            # Avoid circular imports
1863
 
            from bzrlib import branch as _mod_branch
1864
1861
            old = branch._format.__class__
1865
1862
            new = self.target_format.get_branch_format().__class__
1866
1863
            while old != new: