/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to __init__.py

Commit messages never contain config options

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
33
33
visualise         Graphically visualise this branch.
34
34
"""
35
35
 
 
36
from __future__ import absolute_import
 
37
 
36
38
import os
37
39
import sys
38
40
 
51
53
 
52
54
import bzrlib
53
55
import bzrlib.api
54
 
from bzrlib import (
55
 
    branch,
56
 
    config,
57
 
    errors,
58
 
    )
59
56
from bzrlib.commands import plugin_cmds
60
57
 
61
 
from info import (
 
58
from bzrlib.plugins.gtk.info import (
62
59
    bzr_plugin_version as version_info,
63
60
    bzr_compatible_versions,
64
61
    )
75
72
    from bzrlib.trace import warning
76
73
    warning("Not running as bzrlib.plugins.gtk, things may break.")
77
74
 
78
 
def import_pygtk():
79
 
    try:
80
 
        import pygtk
81
 
    except ImportError:
82
 
        raise errors.BzrCommandError("PyGTK not installed.")
83
 
    pygtk.require('2.0')
84
 
    return pygtk
85
 
 
86
75
 
87
76
def set_ui_factory():
88
 
    import_pygtk()
89
 
    from ui import GtkUIFactory
 
77
    from bzrlib.plugins.gtk.ui import GtkUIFactory
90
78
    import bzrlib.ui
91
79
    bzrlib.ui.ui_factory = GtkUIFactory()
92
80
 
139
127
                              "bzrlib.plugins.gtk.commands")
140
128
 
141
129
def save_commit_messages(*args):
142
 
    from bzrlib.plugins.gtk import commit
143
 
    commit.save_commit_messages(*args)
144
 
 
145
 
branch.Branch.hooks.install_named_hook('post_uncommit',
146
 
                                       save_commit_messages,
147
 
                                       "Saving commit messages for gcommit")
148
 
 
149
 
credential_store_registry = getattr(config, "credential_store_registry", None)
150
 
if credential_store_registry is not None:
151
 
    try:
152
 
        credential_store_registry.register_lazy(
153
 
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
154
 
            help="The GNOME Keyring.", fallback=True)
155
 
    except TypeError:
156
 
    # Fallback credentials stores were introduced in Bazaar 1.15
157
 
        credential_store_registry.register_lazy(
158
 
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
159
 
            help="The GNOME Keyring.")
 
130
    from bzrlib.plugins.gtk import commitmsgs
 
131
    commitmsgs.save_commit_messages(*args)
 
132
 
 
133
try:
 
134
    from bzrlib.hooks import install_lazy_named_hook
 
135
except ImportError:
 
136
    from bzrlib.branch import Branch
 
137
    Branch.hooks.install_named_hook('post_uncommit',
 
138
                                    save_commit_messages,
 
139
                                    "Saving commit messages for gcommit")
 
140
else:
 
141
    install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
 
142
        'post_uncommit', save_commit_messages, "Saving commit messages for gcommit")
 
143
 
 
144
try:
 
145
    from bzrlib.registry import register_lazy
 
146
except ImportError:
 
147
    from bzrlib import config
 
148
    option_registry = getattr(config, "option_registry", None)
 
149
    if option_registry is not None:
 
150
        config.option_registry.register_lazy('nautilus_integration',
 
151
                'bzrlib.plugins.gtk.config', 'opt_nautilus_integration')
 
152
else:
 
153
    register_lazy("bzrlib.config", "option_registry",
 
154
        'nautilus_integration', 'bzrlib.plugins.gtk.config',
 
155
        'opt_nautilus_integration')
160
156
 
161
157
 
162
158
def load_tests(basic_tests, module, loader):
168
164
    try:
169
165
        result = basic_tests
170
166
        try:
171
 
            import_pygtk()
172
 
        except errors.BzrCommandError:
 
167
            import gi.repository.Gtk
 
168
        except ImportError:
173
169
            return basic_tests
174
170
        basic_tests.addTest(loader.loadTestsFromModuleNames(
175
171
                ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))