/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

  • Committer: Jelmer Vernooij
  • Date: 2011-10-30 08:07:30 UTC
  • mfrom: (739 trunk)
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: jelmer@samba.org-20111030080730-512dn70l3sxhsevn
Merge trunk

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
 
 
38
36
import os
39
37
import sys
40
38
 
53
51
 
54
52
import bzrlib
55
53
import bzrlib.api
 
54
from bzrlib import (
 
55
    branch,
 
56
    config,
 
57
    errors,
 
58
    )
56
59
from bzrlib.commands import plugin_cmds
57
60
 
58
 
from bzrlib.plugins.gtk.info import (
 
61
from info import (
59
62
    bzr_plugin_version as version_info,
60
63
    bzr_compatible_versions,
61
64
    )
74
77
 
75
78
 
76
79
def set_ui_factory():
77
 
    from bzrlib.plugins.gtk.ui import GtkUIFactory
 
80
    from ui import GtkUIFactory
78
81
    import bzrlib.ui
79
82
    bzrlib.ui.ui_factory = GtkUIFactory()
80
83
 
127
130
                              "bzrlib.plugins.gtk.commands")
128
131
 
129
132
def save_commit_messages(*args):
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')
 
133
    from bzrlib.plugins.gtk import commit
 
134
    commit.save_commit_messages(*args)
 
135
 
 
136
branch.Branch.hooks.install_named_hook('post_uncommit',
 
137
                                       save_commit_messages,
 
138
                                       "Saving commit messages for gcommit")
 
139
 
 
140
credential_store_registry = getattr(config, "credential_store_registry", None)
 
141
if credential_store_registry is not None:
 
142
    try:
 
143
        credential_store_registry.register_lazy(
 
144
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
 
145
            help="The GNOME Keyring.", fallback=True)
 
146
    except TypeError:
 
147
    # Fallback credentials stores were introduced in Bazaar 1.15
 
148
        credential_store_registry.register_lazy(
 
149
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
 
150
            help="The GNOME Keyring.")
156
151
 
157
152
 
158
153
def load_tests(basic_tests, module, loader):