/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
 
54
52
import bzrlib
55
53
import bzrlib.api
56
54
from bzrlib import (
 
55
    branch,
57
56
    config,
 
57
    errors,
58
58
    )
59
59
from bzrlib.commands import plugin_cmds
60
60
 
61
 
from bzrlib.plugins.gtk.info import (
 
61
from info import (
62
62
    bzr_plugin_version as version_info,
63
63
    bzr_compatible_versions,
64
64
    )
77
77
 
78
78
 
79
79
def set_ui_factory():
80
 
    from bzrlib.plugins.gtk.ui import GtkUIFactory
 
80
    from ui import GtkUIFactory
81
81
    import bzrlib.ui
82
82
    bzrlib.ui.ui_factory = GtkUIFactory()
83
83
 
130
130
                              "bzrlib.plugins.gtk.commands")
131
131
 
132
132
def save_commit_messages(*args):
133
 
    from bzrlib.plugins.gtk import commitmsgs
134
 
    commitmsgs.save_commit_messages(*args)
135
 
 
136
 
try:
137
 
    from bzrlib.hooks import install_lazy_named_hook
138
 
except ImportError:
139
 
    from bzrlib.branch import Branch
140
 
    Branch.hooks.install_named_hook('post_uncommit',
141
 
                                    save_commit_messages,
142
 
                                    "Saving commit messages for gcommit")
143
 
else:
144
 
    install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
145
 
        'post_uncommit', save_commit_messages, "Saving commit messages for gcommit")
146
 
 
147
 
 
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')
 
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.")
 
151
 
152
152
 
153
153
def load_tests(basic_tests, module, loader):
154
154
    testmod_names = [