/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: 2010-02-08 13:28:34 UTC
  • Revision ID: jelmer@samba.org-20100208132834-443aedcu5hq4x5tj
use system configobj if bzrlib doesn't ship with one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
15
15
"""Graphical support for Bazaar using GTK.
16
16
 
17
17
This plugin includes:
18
 
gannotate         GTK+ annotate.
19
 
gbranch           GTK+ branching.
20
 
gcheckout         GTK+ checkout.
 
18
gannotate         GTK+ annotate. 
 
19
gbranch           GTK+ branching. 
 
20
gcheckout         GTK+ checkout. 
21
21
gcommit           GTK+ commit dialog.
22
 
gconflicts        GTK+ conflicts.
23
 
gdiff             Show differences in working tree in a GTK+ Window.
 
22
gconflicts        GTK+ conflicts. 
 
23
gdiff             Show differences in working tree in a GTK+ Window. 
24
24
ginit             Initialise a new branch.
 
25
ginfo             GTK+ branch info dialog
25
26
gloom             GTK+ loom browse dialog
26
27
gmerge            GTK+ merge dialog
27
 
gmissing          GTK+ missing revisions dialog.
28
 
gpreferences      GTK+ preferences dialog.
 
28
gmissing          GTK+ missing revisions dialog. 
 
29
gpreferences      GTK+ preferences dialog. 
29
30
gpush             GTK+ push.
30
31
gsend             GTK+ send merge directive.
31
32
gstatus           GTK+ status dialog.
32
33
gtags             Manage branch tags.
33
 
visualise         Graphically visualise this branch.
 
34
visualise         Graphically visualise this branch. 
34
35
"""
35
36
 
36
 
from __future__ import absolute_import
37
 
 
38
37
import os
39
38
import sys
40
39
 
53
52
 
54
53
import bzrlib
55
54
import bzrlib.api
 
55
from bzrlib import (
 
56
    branch,
 
57
    config,
 
58
    errors,
 
59
    )
56
60
from bzrlib.commands import plugin_cmds
57
61
 
58
 
from bzrlib.plugins.gtk.info import (
59
 
    bzr_plugin_version as version_info,
60
 
    bzr_compatible_versions,
61
 
    )
 
62
 
 
63
version_info = (0, 98, 0, 'dev', 1)
62
64
 
63
65
if version_info[3] == 'final':
64
66
    version_string = '%d.%d.%d' % version_info[:3]
66
68
    version_string = '%d.%d.%d%s%d' % version_info
67
69
__version__ = version_string
68
70
 
69
 
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
 
71
COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0),
 
72
                           (1, 10, 0), (1, 11, 0), (1, 12, 0), (1, 13, 0),
 
73
                           (1, 15, 0),
 
74
                           (1, 17, 0),
 
75
                           (2, 1, 0),
 
76
                           ]
 
77
 
 
78
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
70
79
 
71
80
if __name__ != 'bzrlib.plugins.gtk':
72
81
    from bzrlib.trace import warning
73
82
    warning("Not running as bzrlib.plugins.gtk, things may break.")
74
83
 
 
84
def import_pygtk():
 
85
    try:
 
86
        import pygtk
 
87
    except ImportError:
 
88
        raise errors.BzrCommandError("PyGTK not installed.")
 
89
    pygtk.require('2.0')
 
90
    return pygtk
 
91
 
75
92
 
76
93
def set_ui_factory():
77
 
    from bzrlib.plugins.gtk.ui import GtkUIFactory
 
94
    import_pygtk()
 
95
    from ui import GtkUIFactory
78
96
    import bzrlib.ui
79
97
    bzrlib.ui.ui_factory = GtkUIFactory()
80
98
 
97
115
    return data_path(os.path.join('icons', *args))
98
116
 
99
117
 
 
118
def open_display():
 
119
    pygtk = import_pygtk()
 
120
    try:
 
121
        import gtk
 
122
    except RuntimeError, e:
 
123
        if str(e) == "could not open display":
 
124
            raise NoDisplayError
 
125
    set_ui_factory()
 
126
    return gtk
 
127
 
 
128
 
100
129
commands = {
101
130
    "gannotate": ["gblame", "gpraise"],
102
131
    "gbranch": [],
105
134
    "gconflicts": [],
106
135
    "gdiff": [],
107
136
    "ginit": [],
 
137
    "ginfo": [],
108
138
    "gmerge": [],
109
139
    "gmissing": [],
110
140
    "gpreferences": [],
111
141
    "gpush": [],
 
142
    "gselftest": [],
112
143
    "gsend": [],
113
144
    "gstatus": ["gst"],
114
145
    "gtags": [],
115
 
    "visualise": ["visualize", "vis", "viz", 'glog'],
 
146
    "visualise": ["visualize", "vis", "viz"],
116
147
    }
117
148
 
118
149
try:
127
158
                              "bzrlib.plugins.gtk.commands")
128
159
 
129
160
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')
 
161
    from bzrlib.plugins.gtk import commit
 
162
    commit.save_commit_messages(*args)
 
163
 
 
164
branch.Branch.hooks.install_named_hook('post_uncommit',
 
165
                                       save_commit_messages,
 
166
                                       "Saving commit messages for gcommit")
 
167
 
 
168
import gettext
 
169
gettext.install('olive-gtk')
 
170
 
 
171
# Let's create a specialized alias to protect '_' from being erased by other
 
172
# uses of '_' as an anonymous variable (think pdb for one).
 
173
_i18n = gettext.gettext
 
174
 
 
175
class NoDisplayError(errors.BzrCommandError):
 
176
    """gtk could not find a proper display"""
 
177
 
 
178
    def __str__(self):
 
179
        return "No DISPLAY. Unable to run GTK+ application."
 
180
 
 
181
 
 
182
credential_store_registry = getattr(config, "credential_store_registry", None)
 
183
if credential_store_registry is not None:
 
184
    try:
 
185
        credential_store_registry.register_lazy(
 
186
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
 
187
            help="The GNOME Keyring.", fallback=True)
 
188
    except TypeError:
 
189
    # Fallback credentials stores were introduced in Bazaar 1.15
 
190
        credential_store_registry.register_lazy(
 
191
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
 
192
            help="The GNOME Keyring.")
156
193
 
157
194
 
158
195
def load_tests(basic_tests, module, loader):
164
201
    try:
165
202
        result = basic_tests
166
203
        try:
167
 
            import gi.repository.Gtk
168
 
        except ImportError:
 
204
            import_pygtk()
 
205
        except errors.BzrCommandError:
169
206
            return basic_tests
170
207
        basic_tests.addTest(loader.loadTestsFromModuleNames(
171
208
                ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
174
211
            reload(sys)
175
212
            sys.setdefaultencoding(default_encoding)
176
213
    return basic_tests
177