/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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
26
25
gloom             GTK+ loom browse dialog
27
26
gmerge            GTK+ merge dialog
28
 
gmissing          GTK+ missing revisions dialog. 
29
 
gpreferences      GTK+ preferences dialog. 
 
27
gmissing          GTK+ missing revisions dialog.
 
28
gpreferences      GTK+ preferences dialog.
30
29
gpush             GTK+ push.
31
30
gsend             GTK+ send merge directive.
32
31
gstatus           GTK+ status dialog.
33
32
gtags             Manage branch tags.
34
 
visualise         Graphically visualise this branch. 
 
33
visualise         Graphically visualise this branch.
35
34
"""
36
35
 
 
36
from __future__ import absolute_import
 
37
 
37
38
import os
38
39
import sys
39
40
 
52
53
 
53
54
import bzrlib
54
55
import bzrlib.api
55
 
from bzrlib import (
56
 
    branch,
57
 
    config,
58
 
    errors,
 
56
from bzrlib.commands import plugin_cmds
 
57
 
 
58
from bzrlib.plugins.gtk.info import (
 
59
    bzr_plugin_version as version_info,
 
60
    bzr_compatible_versions,
59
61
    )
60
 
from bzrlib.commands import plugin_cmds
61
 
 
62
 
 
63
 
version_info = (0, 98, 0, 'dev', 1)
64
62
 
65
63
if version_info[3] == 'final':
66
64
    version_string = '%d.%d.%d' % version_info[:3]
68
66
    version_string = '%d.%d.%d%s%d' % version_info
69
67
__version__ = version_string
70
68
 
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)
 
69
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
79
70
 
80
71
if __name__ != 'bzrlib.plugins.gtk':
81
72
    from bzrlib.trace import warning
82
73
    warning("Not running as bzrlib.plugins.gtk, things may break.")
83
74
 
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
 
 
92
75
 
93
76
def set_ui_factory():
94
 
    import_pygtk()
95
 
    from ui import GtkUIFactory
 
77
    from bzrlib.plugins.gtk.ui import GtkUIFactory
96
78
    import bzrlib.ui
97
79
    bzrlib.ui.ui_factory = GtkUIFactory()
98
80
 
115
97
    return data_path(os.path.join('icons', *args))
116
98
 
117
99
 
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
 
 
129
100
commands = {
130
101
    "gannotate": ["gblame", "gpraise"],
131
102
    "gbranch": [],
134
105
    "gconflicts": [],
135
106
    "gdiff": [],
136
107
    "ginit": [],
137
 
    "ginfo": [],
138
108
    "gmerge": [],
139
109
    "gmissing": [],
140
110
    "gpreferences": [],
141
111
    "gpush": [],
142
 
    "gselftest": [],
143
112
    "gsend": [],
144
113
    "gstatus": ["gst"],
145
114
    "gtags": [],
146
 
    "visualise": ["visualize", "vis", "viz"],
 
115
    "visualise": ["visualize", "vis", "viz", 'glog'],
147
116
    }
148
117
 
149
118
try:
158
127
                              "bzrlib.plugins.gtk.commands")
159
128
 
160
129
def save_commit_messages(*args):
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.")
 
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')
193
156
 
194
157
 
195
158
def load_tests(basic_tests, module, loader):
201
164
    try:
202
165
        result = basic_tests
203
166
        try:
204
 
            import_pygtk()
205
 
        except errors.BzrCommandError:
 
167
            import gi.repository.Gtk
 
168
        except ImportError:
206
169
            return basic_tests
207
170
        basic_tests.addTest(loader.loadTestsFromModuleNames(
208
171
                ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
211
174
            reload(sys)
212
175
            sys.setdefaultencoding(default_encoding)
213
176
    return basic_tests
 
177