/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: 2007-07-23 12:03:29 UTC
  • Revision ID: jelmer@samba.org-20070723120329-jh92obhhs519edga
Use application path to find icons.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
12
12
# along with this program; if not, write to the Free Software
13
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
14
14
 
15
 
"""GTK+ frontends to Bazaar commands """
 
15
"""Graphical support for Bazaar using GTK.
 
16
 
 
17
This plugin includes:
 
18
commit-notify     Start the graphical notifier of commits.
 
19
gannotate         GTK+ annotate. 
 
20
gbranch           GTK+ branching. 
 
21
gcheckout         GTK+ checkout. 
 
22
gcommit           GTK+ commit dialog 
 
23
gconflicts        GTK+ push. 
 
24
gdiff             Show differences in working tree in a GTK+ Window. 
 
25
ginit             Initialise a new branch.
 
26
gmissing          GTK+ missing revisions dialog. 
 
27
gpreferences      GTK+ preferences dialog. 
 
28
gpush             GTK+ push. 
 
29
gstatus           GTK+ status dialog 
 
30
gtags             Manage branch tags.
 
31
visualise         Graphically visualise this branch. 
 
32
"""
 
33
 
 
34
import bzrlib
 
35
 
 
36
__version__ = '0.19.0'
 
37
version_info = tuple(int(n) for n in __version__.split('.'))
 
38
 
 
39
 
 
40
def check_bzrlib_version(desired):
 
41
    """Check that bzrlib is compatible.
 
42
 
 
43
    If version is < bzr-gtk version, assume incompatible.
 
44
    If version == bzr-gtk version, assume completely compatible
 
45
    If version == bzr-gtk version + 1, assume compatible, with deprecations
 
46
    Otherwise, assume incompatible.
 
47
    """
 
48
    desired_plus = (desired[0], desired[1]+1)
 
49
    bzrlib_version = bzrlib.version_info[:2]
 
50
    if bzrlib_version == desired or (bzrlib_version == desired_plus and
 
51
                                     bzrlib.version_info[3] == 'dev'):
 
52
        return
 
53
    try:
 
54
        from bzrlib.trace import warning
 
55
    except ImportError:
 
56
        # get the message out any way we can
 
57
        from warnings import warn as warning
 
58
    if bzrlib_version < desired:
 
59
        from bzrlib.errors import BzrError
 
60
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
 
61
                ' %s.' % (bzrlib.__version__, __version__))
 
62
        raise BzrError('Version mismatch: %r' % version_info)
 
63
    else:
 
64
        warning('bzr-gtk is not up to date with installed bzr version %s.'
 
65
                ' \nThere should be a newer version available, e.g. %i.%i.' 
 
66
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
 
67
 
 
68
 
 
69
check_bzrlib_version(version_info[:2])
 
70
 
 
71
from bzrlib.trace import warning
 
72
if __name__ != 'bzrlib.plugins.gtk':
 
73
    warning("Not running as bzrlib.plugins.gtk, things may break.")
 
74
 
 
75
from bzrlib.lazy_import import lazy_import
 
76
lazy_import(globals(), """
 
77
from bzrlib import (
 
78
    branch,
 
79
    errors,
 
80
    workingtree,
 
81
    )
 
82
""")
16
83
 
17
84
from bzrlib.commands import Command, register_command, display_command
18
85
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
19
 
from bzrlib.commands import Command, register_command
20
86
from bzrlib.option import Option
21
 
from bzrlib.branch import Branch
22
 
from bzrlib.workingtree import WorkingTree
23
 
from bzrlib.bzrdir import BzrDir
24
 
 
25
 
__version__ = '0.11.0'
26
 
 
27
 
class cmd_gbranch(Command):
 
87
 
 
88
import os.path
 
89
 
 
90
def import_pygtk():
 
91
    try:
 
92
        import pygtk
 
93
    except ImportError:
 
94
        raise errors.BzrCommandError("PyGTK not installed.")
 
95
    pygtk.require('2.0')
 
96
    return pygtk
 
97
 
 
98
 
 
99
def set_ui_factory():
 
100
    import_pygtk()
 
101
    from ui import GtkUIFactory
 
102
    import bzrlib.ui
 
103
    bzrlib.ui.ui_factory = GtkUIFactory()
 
104
 
 
105
 
 
106
def data_path():
 
107
    return os.path.dirname(__file__)
 
108
 
 
109
 
 
110
class GTKCommand(Command):
 
111
    """Abstract class providing GTK specific run commands."""
 
112
 
 
113
    def open_display(self):
 
114
        pygtk = import_pygtk()
 
115
        try:
 
116
            import gtk
 
117
        except RuntimeError, e:
 
118
            if str(e) == "could not open display":
 
119
                raise NoDisplayError
 
120
        set_ui_factory()
 
121
        return gtk
 
122
 
 
123
    def run(self):
 
124
        self.open_display()
 
125
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
 
126
        dialog.run()
 
127
 
 
128
 
 
129
class cmd_gbranch(GTKCommand):
28
130
    """GTK+ branching.
29
131
    
30
132
    """
31
133
 
32
 
    def run(self):
33
 
        import pygtk
34
 
        pygtk.require("2.0")
35
 
        try:
36
 
            import gtk
37
 
        except RuntimeError, e:
38
 
            if str(e) == "could not open display":
39
 
                raise NoDisplayError
40
 
 
41
 
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
42
 
 
43
 
        window = BranchDialog('.')
44
 
        window.display()
45
 
 
46
 
register_command(cmd_gbranch)
47
 
 
48
 
class cmd_gdiff(Command):
 
134
    def get_gtk_dialog(self, path):
 
135
        from bzrlib.plugins.gtk.branch import BranchDialog
 
136
        return BranchDialog(path)
 
137
 
 
138
 
 
139
class cmd_gcheckout(GTKCommand):
 
140
    """ GTK+ checkout.
 
141
    
 
142
    """
 
143
    
 
144
    def get_gtk_dialog(self, path):
 
145
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
 
146
        return CheckoutDialog(path)
 
147
 
 
148
 
 
149
 
 
150
class cmd_gpush(GTKCommand):
 
151
    """ GTK+ push.
 
152
    
 
153
    """
 
154
    takes_args = [ "location?" ]
 
155
 
 
156
    def run(self, location="."):
 
157
        (br, path) = branch.Branch.open_containing(location)
 
158
        self.open_display()
 
159
        from push import PushDialog
 
160
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
161
        dialog.run()
 
162
 
 
163
 
 
164
 
 
165
class cmd_gdiff(GTKCommand):
49
166
    """Show differences in working tree in a GTK+ Window.
50
167
    
51
168
    Otherwise, all changes for the tree are listed.
55
172
 
56
173
    @display_command
57
174
    def run(self, revision=None, filename=None):
58
 
        wt = WorkingTree.open_containing(".")[0]
59
 
        branch = wt.branch
60
 
        if revision is not None:
61
 
            if len(revision) == 1:
 
175
        set_ui_factory()
 
176
        wt = workingtree.WorkingTree.open_containing(".")[0]
 
177
        wt.lock_read()
 
178
        try:
 
179
            branch = wt.branch
 
180
            if revision is not None:
 
181
                if len(revision) == 1:
 
182
                    tree1 = wt
 
183
                    revision_id = revision[0].in_history(branch).rev_id
 
184
                    tree2 = branch.repository.revision_tree(revision_id)
 
185
                elif len(revision) == 2:
 
186
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
187
                    tree2 = branch.repository.revision_tree(revision_id_0)
 
188
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
189
                    tree1 = branch.repository.revision_tree(revision_id_1)
 
190
            else:
62
191
                tree1 = wt
63
 
                revision_id = revision[0].in_history(branch).rev_id
64
 
                tree2 = branch.repository.revision_tree(revision_id)
65
 
            elif len(revision) == 2:
66
 
                revision_id_0 = revision[0].in_history(branch).rev_id
67
 
                tree2 = branch.repository.revision_tree(revision_id_0)
68
 
                revision_id_1 = revision[1].in_history(branch).rev_id
69
 
                tree1 = branch.repository.revision_tree(revision_id_1)
70
 
        else:
71
 
            tree1 = wt
72
 
            tree2 = tree1.basis_tree()
73
 
 
74
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
75
 
        import gtk
76
 
        window = DiffWindow()
77
 
        window.connect("destroy", lambda w: gtk.main_quit())
78
 
        window.set_diff("Working Tree", tree1, tree2)
79
 
        if filename is not None:
80
 
            tree_filename = tree1.relpath(filename)
81
 
            try:
82
 
                window.set_file(tree_filename)
83
 
            except NoSuchFile:
84
 
                if (tree1.inventory.path2id(tree_filename) is None and 
85
 
                    tree2.inventory.path2id(tree_filename) is None):
86
 
                    raise NotVersionedError(filename)
87
 
                raise BzrCommandError('No changes found for file "%s"' % 
88
 
                                      filename)
89
 
        window.show()
90
 
 
91
 
        gtk.main()
92
 
 
93
 
register_command(cmd_gdiff)
 
192
                tree2 = tree1.basis_tree()
 
193
 
 
194
            from diff import DiffWindow
 
195
            import gtk
 
196
            window = DiffWindow()
 
197
            window.connect("destroy", gtk.main_quit)
 
198
            window.set_diff("Working Tree", tree1, tree2)
 
199
            if filename is not None:
 
200
                tree_filename = wt.relpath(filename)
 
201
                try:
 
202
                    window.set_file(tree_filename)
 
203
                except NoSuchFile:
 
204
                    if (tree1.path2id(tree_filename) is None and 
 
205
                        tree2.path2id(tree_filename) is None):
 
206
                        raise NotVersionedError(filename)
 
207
                    raise BzrCommandError('No changes found for file "%s"' % 
 
208
                                          filename)
 
209
            window.show()
 
210
 
 
211
            gtk.main()
 
212
        finally:
 
213
            wt.unlock()
 
214
 
 
215
 
 
216
def start_viz_window(branch, revision, limit=None):
 
217
    """Start viz on branch with revision revision.
 
218
    
 
219
    :return: The viz window object.
 
220
    """
 
221
    from viz.branchwin import BranchWindow
 
222
    branch.lock_read()
 
223
    pp = BranchWindow()
 
224
    pp.set_branch(branch, revision, limit)
 
225
    # cleanup locks when the window is closed
 
226
    pp.connect("destroy", lambda w: branch.unlock())
 
227
    return pp
 
228
 
94
229
 
95
230
class cmd_visualise(Command):
96
231
    """Graphically visualise this branch.
103
238
    """
104
239
    takes_options = [
105
240
        "revision",
106
 
        Option('limit', "maximum number of revisions to display",
 
241
        Option('limit', "Maximum number of revisions to display.",
107
242
               int, 'count')]
108
243
    takes_args = [ "location?" ]
109
244
    aliases = [ "visualize", "vis", "viz" ]
110
245
 
111
246
    def run(self, location=".", revision=None, limit=None):
112
 
        (branch, path) = Branch.open_containing(location)
113
 
        branch.lock_read()
114
 
        branch.repository.lock_read()
 
247
        set_ui_factory()
 
248
        (br, path) = branch.Branch.open_containing(location)
 
249
        br.lock_read()
115
250
        try:
116
251
            if revision is None:
117
 
                revid = branch.last_revision()
 
252
                revid = br.last_revision()
118
253
                if revid is None:
119
254
                    return
120
255
            else:
121
 
                (revno, revid) = revision[0].in_history(branch)
 
256
                (revno, revid) = revision[0].in_history(br)
122
257
 
123
 
            from viz.bzrkapp import BzrkApp
124
 
                
125
 
            app = BzrkApp()
126
 
            app.show(branch, revid, limit)
 
258
            import gtk
 
259
            pp = start_viz_window(br, revid, limit)
 
260
            pp.connect("destroy", lambda w: gtk.main_quit())
 
261
            pp.show()
 
262
            gtk.main()
127
263
        finally:
128
 
            branch.repository.unlock()
129
 
            branch.unlock()
130
 
        app.main()
131
 
 
132
 
 
133
 
register_command(cmd_visualise)
134
 
 
135
 
class cmd_gannotate(Command):
 
264
            br.unlock()
 
265
 
 
266
 
 
267
class cmd_gannotate(GTKCommand):
136
268
    """GTK+ annotate.
137
269
    
138
270
    Browse changes to FILENAME line by line in a GTK+ window.
140
272
 
141
273
    takes_args = ["filename", "line?"]
142
274
    takes_options = [
143
 
        Option("all", help="show annotations on all lines"),
144
 
        Option("plain", help="don't highlight annotation lines"),
 
275
        Option("all", help="Show annotations on all lines."),
 
276
        Option("plain", help="Don't highlight annotation lines."),
145
277
        Option("line", type=int, argname="lineno",
146
 
               help="jump to specified line number")
 
278
               help="Jump to specified line number."),
 
279
        "revision",
147
280
    ]
148
281
    aliases = ["gblame", "gpraise"]
149
282
    
150
 
    def run(self, filename, all=False, plain=False, line='1'):
151
 
        import pygtk
152
 
        pygtk.require("2.0")
153
 
 
154
 
        try:
155
 
            import gtk
156
 
        except RuntimeError, e:
157
 
            if str(e) == "could not open display":
158
 
                raise NoDisplayError
 
283
    def run(self, filename, all=False, plain=False, line='1', revision=None):
 
284
        gtk = self.open_display()
159
285
 
160
286
        try:
161
287
            line = int(line)
165
291
 
166
292
        from annotate.gannotate import GAnnotateWindow
167
293
        from annotate.config import GAnnotateConfig
168
 
 
169
 
        (wt, path) = WorkingTree.open_containing(filename)
170
 
        branch = wt.branch
171
 
 
172
 
        file_id = wt.path2id(path)
 
294
        from bzrlib.bzrdir import BzrDir
 
295
 
 
296
        wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
 
297
        if wt is not None:
 
298
            tree = wt
 
299
        else:
 
300
            tree = br.basis_tree()
 
301
 
 
302
        file_id = tree.path2id(path)
173
303
 
174
304
        if file_id is None:
175
305
            raise NotVersionedError(filename)
 
306
        if revision is not None:
 
307
            if len(revision) != 1:
 
308
                raise BzrCommandError("Only 1 revion may be specified.")
 
309
            revision_id = revision[0].in_history(br).rev_id
 
310
            tree = br.repository.revision_tree(revision_id)
 
311
        else:
 
312
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
176
313
 
177
314
        window = GAnnotateWindow(all, plain)
178
315
        window.connect("destroy", lambda w: gtk.main_quit())
179
316
        window.set_title(path + " - gannotate")
180
317
        config = GAnnotateConfig(window)
181
318
        window.show()
182
 
        branch.lock_read()
 
319
        br.lock_read()
 
320
        if wt is not None:
 
321
            wt.lock_read()
183
322
        try:
184
 
            window.annotate(branch, file_id)
 
323
            window.annotate(tree, br, file_id)
 
324
            window.jump_to_line(line)
 
325
            gtk.main()
185
326
        finally:
186
 
            branch.unlock()
187
 
        window.jump_to_line(line)
188
 
        
189
 
        gtk.main()
190
 
 
191
 
register_command(cmd_gannotate)
192
 
 
193
 
class cmd_gcommit(Command):
 
327
            br.unlock()
 
328
            if wt is not None:
 
329
                wt.unlock()
 
330
 
 
331
 
 
332
 
 
333
class cmd_gcommit(GTKCommand):
194
334
    """GTK+ commit dialog
195
335
 
196
336
    Graphical user interface for committing revisions"""
197
337
    
 
338
    aliases = [ "gci" ]
198
339
    takes_args = []
199
340
    takes_options = []
200
341
 
201
342
    def run(self, filename=None):
202
 
        import pygtk
203
 
        pygtk.require("2.0")
204
 
 
 
343
        import os
 
344
        self.open_display()
 
345
        from commit import CommitDialog
 
346
        from bzrlib.errors import (BzrCommandError,
 
347
                                   NotBranchError,
 
348
                                   NoWorkingTree)
 
349
 
 
350
        wt = None
 
351
        br = None
 
352
        try:
 
353
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
 
354
            br = wt.branch
 
355
        except NoWorkingTree, e:
 
356
            path = e.base
 
357
            (br, path) = branch.Branch.open_containing(path)
 
358
 
 
359
        commit = CommitDialog(wt, path, not br)
 
360
        commit.run()
 
361
 
 
362
 
 
363
 
 
364
class cmd_gstatus(GTKCommand):
 
365
    """GTK+ status dialog
 
366
 
 
367
    Graphical user interface for showing status 
 
368
    information."""
 
369
    
 
370
    aliases = [ "gst" ]
 
371
    takes_args = ['PATH?']
 
372
    takes_options = []
 
373
 
 
374
    def run(self, path='.'):
 
375
        import os
 
376
        gtk = self.open_display()
 
377
        from status import StatusDialog
 
378
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
 
379
        status = StatusDialog(wt, wt_path)
 
380
        status.connect("destroy", gtk.main_quit)
 
381
        status.run()
 
382
 
 
383
 
 
384
 
 
385
class cmd_gconflicts(GTKCommand):
 
386
    """ GTK+ push.
 
387
    
 
388
    """
 
389
    def run(self):
 
390
        (wt, path) = workingtree.WorkingTree.open_containing('.')
 
391
        self.open_display()
 
392
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
 
393
        dialog = ConflictsDialog(wt)
 
394
        dialog.run()
 
395
 
 
396
 
 
397
 
 
398
class cmd_gpreferences(GTKCommand):
 
399
    """ GTK+ preferences dialog.
 
400
 
 
401
    """
 
402
    def run(self):
 
403
        self.open_display()
 
404
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
405
        dialog = PreferencesWindow()
 
406
        dialog.run()
 
407
 
 
408
 
 
409
 
 
410
class cmd_gmissing(Command):
 
411
    """ GTK+ missing revisions dialog.
 
412
 
 
413
    """
 
414
    takes_args = ["other_branch?"]
 
415
    def run(self, other_branch=None):
 
416
        pygtk = import_pygtk()
205
417
        try:
206
418
            import gtk
207
419
        except RuntimeError, e:
208
420
            if str(e) == "could not open display":
209
421
                raise NoDisplayError
210
422
 
211
 
        from olive.commit import CommitDialog
212
 
        from bzrlib.commit import Commit
213
 
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
214
 
           StrictCommitFailed)
215
 
 
216
 
        (wt, path) = WorkingTree.open_containing(filename)
217
 
 
218
 
        dialog = CommitDialog(wt, path)
219
 
        dialog.display()
220
 
        gtk.main()
221
 
 
222
 
register_command(cmd_gcommit)
 
423
        from bzrlib.plugins.gtk.missing import MissingWindow
 
424
        from bzrlib.branch import Branch
 
425
 
 
426
        local_branch = Branch.open_containing(".")[0]
 
427
        if other_branch is None:
 
428
            other_branch = local_branch.get_parent()
 
429
            
 
430
            if other_branch is None:
 
431
                raise errors.BzrCommandError("No peer location known or specified.")
 
432
        remote_branch = Branch.open_containing(other_branch)[0]
 
433
        set_ui_factory()
 
434
        local_branch.lock_read()
 
435
        try:
 
436
            remote_branch.lock_read()
 
437
            try:
 
438
                dialog = MissingWindow(local_branch, remote_branch)
 
439
                dialog.run()
 
440
            finally:
 
441
                remote_branch.unlock()
 
442
        finally:
 
443
            local_branch.unlock()
 
444
 
 
445
 
 
446
class cmd_ginit(GTKCommand):
 
447
    def run(self):
 
448
        self.open_display()
 
449
        from initialize import InitDialog
 
450
        dialog = InitDialog(os.path.abspath(os.path.curdir))
 
451
        dialog.run()
 
452
 
 
453
 
 
454
class cmd_gtags(GTKCommand):
 
455
    def run(self):
 
456
        br = branch.Branch.open_containing('.')[0]
 
457
        
 
458
        gtk = self.open_display()
 
459
        from tags import TagsWindow
 
460
        window = TagsWindow(br)
 
461
        window.show()
 
462
        gtk.main()
 
463
 
 
464
 
 
465
commands = [
 
466
    cmd_gmissing, 
 
467
    cmd_gpreferences, 
 
468
    cmd_gconflicts, 
 
469
    cmd_gstatus,
 
470
    cmd_gcommit, 
 
471
    cmd_gannotate, 
 
472
    cmd_visualise, 
 
473
    cmd_gdiff,
 
474
    cmd_gpush, 
 
475
    cmd_gcheckout, 
 
476
    cmd_gbranch,
 
477
    cmd_ginit,
 
478
    cmd_gtags
 
479
    ]
 
480
 
 
481
for cmd in commands:
 
482
    register_command(cmd)
 
483
 
 
484
 
 
485
class cmd_commit_notify(GTKCommand):
 
486
    """Run the bzr commit notifier.
 
487
 
 
488
    This is a background program which will pop up a notification on the users
 
489
    screen when a commit occurs.
 
490
    """
 
491
 
 
492
    def run(self):
 
493
        from notify import NotifyPopupMenu
 
494
        gtk = self.open_display()
 
495
        menu = NotifyPopupMenu()
 
496
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
497
        icon.connect('popup-menu', menu.display)
 
498
 
 
499
        import cgi
 
500
        import dbus
 
501
        import dbus.service
 
502
        import pynotify
 
503
        from bzrlib.bzrdir import BzrDir
 
504
        from bzrlib import errors
 
505
        from bzrlib.osutils import format_date
 
506
        from bzrlib.transport import get_transport
 
507
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
508
            import dbus.glib
 
509
        from bzrlib.plugins.dbus import activity
 
510
        bus = dbus.SessionBus()
 
511
        # get the object so we can subscribe to callbacks from it.
 
512
        broadcast_service = bus.get_object(
 
513
            activity.Broadcast.DBUS_NAME,
 
514
            activity.Broadcast.DBUS_PATH)
 
515
 
 
516
        def catch_branch(revision_id, urls):
 
517
            # TODO: show all the urls, or perhaps choose the 'best'.
 
518
            url = urls[0]
 
519
            try:
 
520
                if isinstance(revision_id, unicode):
 
521
                    revision_id = revision_id.encode('utf8')
 
522
                transport = get_transport(url)
 
523
                a_dir = BzrDir.open_from_transport(transport)
 
524
                branch = a_dir.open_branch()
 
525
                revno = branch.revision_id_to_revno(revision_id)
 
526
                revision = branch.repository.get_revision(revision_id)
 
527
                summary = 'New revision %d in %s' % (revno, url)
 
528
                body  = 'Committer: %s\n' % revision.committer
 
529
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
530
                    revision.timezone)
 
531
                body += '\n'
 
532
                body += revision.message
 
533
                body = cgi.escape(body)
 
534
                nw = pynotify.Notification(summary, body)
 
535
                def start_viz(notification=None, action=None, data=None):
 
536
                    """Start the viz program."""
 
537
                    pp = start_viz_window(branch, revision_id)
 
538
                    pp.show()
 
539
                def start_branch(notification=None, action=None, data=None):
 
540
                    """Start a Branch dialog"""
 
541
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
542
                    bd = BranchDialog(remote_path=url)
 
543
                    bd.run()
 
544
                nw.add_action("inspect", "Inspect", start_viz, None)
 
545
                nw.add_action("branch", "Branch", start_branch, None)
 
546
                nw.set_timeout(5000)
 
547
                nw.show()
 
548
            except Exception, e:
 
549
                print e
 
550
                raise
 
551
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
552
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
553
        pynotify.init("bzr commit-notify")
 
554
        gtk.main()
 
555
 
 
556
register_command(cmd_commit_notify)
 
557
 
 
558
 
 
559
import gettext
 
560
gettext.install('olive-gtk')
 
561
 
223
562
 
224
563
class NoDisplayError(BzrCommandError):
225
564
    """gtk could not find a proper display"""
226
565
 
227
566
    def __str__(self):
228
 
        return "No DISPLAY. gannotate is disabled."
 
567
        return "No DISPLAY. Unable to run GTK+ application."
 
568
 
 
569
 
 
570
def test_suite():
 
571
    from unittest import TestSuite
 
572
    import tests
 
573
    import sys
 
574
    default_encoding = sys.getdefaultencoding()
 
575
    try:
 
576
        result = TestSuite()
 
577
        result.addTest(tests.test_suite())
 
578
    finally:
 
579
        if sys.getdefaultencoding() != default_encoding:
 
580
            reload(sys)
 
581
            sys.setdefaultencoding(default_encoding)
 
582
    return result