/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-19 13:09:18 UTC
  • Revision ID: jelmer@samba.org-20070719130918-s11nskqrwfdp32xe
Add note about what should and should not be in the preferences dialog.

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
commit-notify     Start the graphical notifier of commits.
18
19
gannotate         GTK+ annotate. 
19
20
gbranch           GTK+ branching. 
20
21
gcheckout         GTK+ checkout. 
21
 
gcommit           GTK+ commit dialog.
22
 
gconflicts        GTK+ conflicts. 
 
22
gcommit           GTK+ commit dialog 
 
23
gconflicts        GTK+ push. 
23
24
gdiff             Show differences in working tree in a GTK+ Window. 
24
25
ginit             Initialise a new branch.
25
 
gmerge            GTK+ merge dialog
26
26
gmissing          GTK+ missing revisions dialog. 
27
27
gpreferences      GTK+ preferences dialog. 
28
 
gpush             GTK+ push.
29
 
gsend             GTK+ send merge directive.
30
 
gstatus           GTK+ status dialog.
 
28
gpush             GTK+ push. 
 
29
gstatus           GTK+ status dialog 
31
30
gtags             Manage branch tags.
32
31
visualise         Graphically visualise this branch. 
33
32
"""
34
33
 
35
 
import sys
36
 
 
37
34
import bzrlib
38
35
 
39
 
version_info = (0, 95, 0, 'dev', 1)
40
 
 
41
 
if version_info[3] == 'final':
42
 
    version_string = '%d.%d.%d' % version_info[:3]
43
 
else:
44
 
    version_string = '%d.%d.%d%s%d' % version_info
45
 
__version__ = version_string
46
 
 
47
 
required_bzrlib = (1, 3)
 
36
__version__ = '0.19.0'
 
37
version_info = tuple(int(n) for n in __version__.split('.'))
 
38
 
48
39
 
49
40
def check_bzrlib_version(desired):
50
41
    """Check that bzrlib is compatible.
51
42
 
52
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.
53
47
    """
 
48
    desired_plus = (desired[0], desired[1]+1)
54
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
55
53
    try:
56
54
        from bzrlib.trace import warning
57
55
    except ImportError:
59
57
        from warnings import warn as warning
60
58
    if bzrlib_version < desired:
61
59
        from bzrlib.errors import BzrError
62
 
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
 
60
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
63
61
                ' %s.' % (bzrlib.__version__, __version__))
64
 
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
65
 
 
66
 
 
67
 
if version_info[2] == "final":
68
 
    check_bzrlib_version(required_bzrlib)
 
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])
69
70
 
70
71
from bzrlib.trace import warning
71
72
if __name__ != 'bzrlib.plugins.gtk':
75
76
lazy_import(globals(), """
76
77
from bzrlib import (
77
78
    branch,
78
 
    builtins,
79
79
    errors,
80
 
    merge_directive,
81
80
    workingtree,
82
81
    )
83
82
""")
104
103
    bzrlib.ui.ui_factory = GtkUIFactory()
105
104
 
106
105
 
107
 
def data_basedirs():
108
 
    return [os.path.dirname(__file__),
109
 
             "/usr/share/bzr-gtk", 
110
 
             "/usr/local/share/bzr-gtk"]
111
 
 
112
 
 
113
 
def data_path(*args):
114
 
    for basedir in data_basedirs():
115
 
        path = os.path.join(basedir, *args)
116
 
        if os.path.exists(path):
117
 
            return path
118
 
    return None
119
 
 
120
 
 
121
 
def icon_path(*args):
122
 
    return data_path(os.path.join('icons', *args))
123
 
 
124
 
 
125
 
def open_display():
126
 
    pygtk = import_pygtk()
127
 
    try:
128
 
        import gtk
129
 
    except RuntimeError, e:
130
 
        if str(e) == "could not open display":
131
 
            raise NoDisplayError
132
 
    set_ui_factory()
133
 
    return gtk
134
 
 
135
 
 
136
106
class GTKCommand(Command):
137
107
    """Abstract class providing GTK specific run commands."""
138
108
 
 
109
    def open_display(self):
 
110
        pygtk = import_pygtk()
 
111
        try:
 
112
            import gtk
 
113
        except RuntimeError, e:
 
114
            if str(e) == "could not open display":
 
115
                raise NoDisplayError
 
116
        set_ui_factory()
 
117
        return gtk
 
118
 
139
119
    def run(self):
140
 
        open_display()
 
120
        self.open_display()
141
121
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
122
        dialog.run()
143
123
 
171
151
 
172
152
    def run(self, location="."):
173
153
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
154
        self.open_display()
175
155
        from push import PushDialog
176
156
        dialog = PushDialog(br.repository, br.last_revision(), br)
177
157
        dialog.run()
196
176
            if revision is not None:
197
177
                if len(revision) == 1:
198
178
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
179
                    revision_id = revision[0].in_history(branch).rev_id
200
180
                    tree2 = branch.repository.revision_tree(revision_id)
201
181
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
182
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
183
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
184
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
185
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
186
            else:
207
187
                tree1 = wt
229
209
            wt.unlock()
230
210
 
231
211
 
232
 
def start_viz_window(branch, revisions, limit=None):
 
212
def start_viz_window(branch, revision, limit=None):
233
213
    """Start viz on branch with revision revision.
234
214
    
235
215
    :return: The viz window object.
236
216
    """
237
 
    from viz import BranchWindow
238
 
    return BranchWindow(branch, revisions, limit)
 
217
    from viz.branchwin import BranchWindow
 
218
    branch.lock_read()
 
219
    pp = BranchWindow()
 
220
    pp.set_branch(branch, revision, limit)
 
221
    # cleanup locks when the window is closed
 
222
    pp.connect("destroy", lambda w: branch.unlock())
 
223
    return pp
239
224
 
240
225
 
241
226
class cmd_visualise(Command):
251
236
        "revision",
252
237
        Option('limit', "Maximum number of revisions to display.",
253
238
               int, 'count')]
254
 
    takes_args = [ "locations*" ]
 
239
    takes_args = [ "location?" ]
255
240
    aliases = [ "visualize", "vis", "viz" ]
256
241
 
257
 
    def run(self, locations_list, revision=None, limit=None):
 
242
    def run(self, location=".", revision=None, limit=None):
258
243
        set_ui_factory()
259
 
        if locations_list is None:
260
 
            locations_list = ["."]
261
 
        revids = []
262
 
        for location in locations_list:
263
 
            (br, path) = branch.Branch.open_containing(location)
 
244
        (br, path) = branch.Branch.open_containing(location)
 
245
        br.lock_read()
 
246
        try:
264
247
            if revision is None:
265
 
                revids.append(br.last_revision())
 
248
                revid = br.last_revision()
 
249
                if revid is None:
 
250
                    return
266
251
            else:
267
 
                revids.append(revision[0].as_revision_id(br))
268
 
        import gtk
269
 
        pp = start_viz_window(br, revids, limit)
270
 
        pp.connect("destroy", lambda w: gtk.main_quit())
271
 
        pp.show()
272
 
        gtk.main()
 
252
                (revno, revid) = revision[0].in_history(br)
 
253
 
 
254
            import gtk
 
255
            pp = start_viz_window(br, revid, limit)
 
256
            pp.connect("destroy", lambda w: gtk.main_quit())
 
257
            pp.show()
 
258
            gtk.main()
 
259
        finally:
 
260
            br.unlock()
273
261
 
274
262
 
275
263
class cmd_gannotate(GTKCommand):
289
277
    aliases = ["gblame", "gpraise"]
290
278
    
291
279
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
280
        gtk = self.open_display()
293
281
 
294
282
        try:
295
283
            line = int(line)
314
302
        if revision is not None:
315
303
            if len(revision) != 1:
316
304
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
305
            revision_id = revision[0].in_history(br).rev_id
318
306
            tree = br.repository.revision_tree(revision_id)
319
307
        else:
320
308
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
309
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
310
        window = GAnnotateWindow(all, plain)
323
311
        window.connect("destroy", lambda w: gtk.main_quit())
 
312
        window.set_title(path + " - gannotate")
324
313
        config = GAnnotateConfig(window)
325
314
        window.show()
326
315
        br.lock_read()
341
330
    """GTK+ commit dialog
342
331
 
343
332
    Graphical user interface for committing revisions"""
344
 
 
 
333
    
345
334
    aliases = [ "gci" ]
346
335
    takes_args = []
347
336
    takes_options = []
348
337
 
349
338
    def run(self, filename=None):
350
339
        import os
351
 
        open_display()
 
340
        self.open_display()
352
341
        from commit import CommitDialog
353
342
        from bzrlib.errors import (BzrCommandError,
354
343
                                   NotBranchError,
360
349
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
361
350
            br = wt.branch
362
351
        except NoWorkingTree, e:
363
 
            from dialog import error_dialog
364
 
            error_dialog(_i18n('Directory does not have a working tree'),
365
 
                         _i18n('Operation aborted.'))
366
 
            return 1 # should this be retval=3?
367
 
 
368
 
        # It is a good habit to keep things locked for the duration, but it
369
 
        # could cause difficulties if someone wants to do things in another
370
 
        # window... We could lock_read() until we actually go to commit
371
 
        # changes... Just a thought.
372
 
        wt.lock_write()
373
 
        try:
374
 
            dlg = CommitDialog(wt)
375
 
            return dlg.run()
376
 
        finally:
377
 
            wt.unlock()
 
352
            path = e.base
 
353
            (br, path) = branch.Branch.open_containing(path)
 
354
 
 
355
        commit = CommitDialog(wt, path, not br)
 
356
        commit.run()
 
357
 
378
358
 
379
359
 
380
360
class cmd_gstatus(GTKCommand):
385
365
    
386
366
    aliases = [ "gst" ]
387
367
    takes_args = ['PATH?']
388
 
    takes_options = ['revision']
 
368
    takes_options = []
389
369
 
390
 
    def run(self, path='.', revision=None):
 
370
    def run(self, path='.'):
391
371
        import os
392
 
        gtk = open_display()
 
372
        gtk = self.open_display()
393
373
        from status import StatusDialog
394
374
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
395
 
        
396
 
        if revision is not None:
397
 
            try:
398
 
                revision_id = revision[0].as_revision_id(wt.branch)
399
 
            except:
400
 
                from bzrlib.errors import BzrError
401
 
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
402
 
        else:
403
 
            revision_id = None
404
 
 
405
 
        status = StatusDialog(wt, wt_path, revision_id)
 
375
        status = StatusDialog(wt, wt_path)
406
376
        status.connect("destroy", gtk.main_quit)
407
377
        status.run()
408
378
 
409
379
 
410
 
class cmd_gsend(GTKCommand):
411
 
    """GTK+ send merge directive.
412
 
 
413
 
    """
414
 
    def run(self):
415
 
        (br, path) = branch.Branch.open_containing(".")
416
 
        gtk = open_display()
417
 
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
418
 
        from StringIO import StringIO
419
 
        dialog = SendMergeDirectiveDialog(br)
420
 
        if dialog.run() == gtk.RESPONSE_OK:
421
 
            outf = StringIO()
422
 
            outf.writelines(dialog.get_merge_directive().to_lines())
423
 
            mail_client = br.get_config().get_mail_client()
424
 
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
425
 
                outf.getvalue())
426
 
 
427
 
            
428
 
 
429
380
 
430
381
class cmd_gconflicts(GTKCommand):
431
 
    """GTK+ conflicts.
 
382
    """ GTK+ push.
432
383
    
433
 
    Select files from the list of conflicts and run an external utility to
434
 
    resolve them.
435
384
    """
436
385
    def run(self):
437
386
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
387
        self.open_display()
439
388
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
389
        dialog = ConflictsDialog(wt)
441
390
        dialog.run()
442
391
 
443
392
 
 
393
 
444
394
class cmd_gpreferences(GTKCommand):
445
395
    """ GTK+ preferences dialog.
446
396
 
447
397
    """
448
398
    def run(self):
449
 
        open_display()
 
399
        self.open_display()
450
400
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
401
        dialog = PreferencesWindow()
452
402
        dialog.run()
453
403
 
454
404
 
455
 
class cmd_gmerge(Command):
456
 
    """ GTK+ merge dialog
457
 
    
458
 
    """
459
 
    takes_args = ["merge_from_path?"]
460
 
    def run(self, merge_from_path=None):
461
 
        from bzrlib import workingtree
462
 
        from bzrlib.plugins.gtk.dialog import error_dialog
463
 
        from bzrlib.plugins.gtk.merge import MergeDialog
464
 
        
465
 
        (wt, path) = workingtree.WorkingTree.open_containing('.')
466
 
        old_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
467
 
        delta = wt.changes_from(old_tree)
468
 
        if len(delta.added) or len(delta.removed) or len(delta.renamed) or len(delta.modified):
469
 
            error_dialog(_i18n('There are local changes in the branch'),
470
 
                         _i18n('Please commit or revert the changes before merging.'))
471
 
        else:
472
 
            parent_branch_path = wt.branch.get_parent()
473
 
            merge = MergeDialog(wt, path, parent_branch_path)
474
 
            response = merge.run()
475
 
            merge.destroy()
476
 
 
477
405
 
478
406
class cmd_gmissing(Command):
479
407
    """ GTK+ missing revisions dialog.
513
441
 
514
442
class cmd_ginit(GTKCommand):
515
443
    def run(self):
516
 
        open_display()
 
444
        self.open_display()
517
445
        from initialize import InitDialog
518
446
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
447
        dialog.run()
523
451
    def run(self):
524
452
        br = branch.Branch.open_containing('.')[0]
525
453
        
526
 
        gtk = open_display()
 
454
        gtk = self.open_display()
527
455
        from tags import TagsWindow
528
456
        window = TagsWindow(br)
529
457
        window.show()
531
459
 
532
460
 
533
461
commands = [
 
462
    cmd_gmissing, 
 
463
    cmd_gpreferences, 
 
464
    cmd_gconflicts, 
 
465
    cmd_gstatus,
 
466
    cmd_gcommit, 
534
467
    cmd_gannotate, 
 
468
    cmd_visualise, 
 
469
    cmd_gdiff,
 
470
    cmd_gpush, 
 
471
    cmd_gcheckout, 
535
472
    cmd_gbranch,
536
 
    cmd_gcheckout, 
537
 
    cmd_gcommit, 
538
 
    cmd_gconflicts, 
539
 
    cmd_gdiff,
540
473
    cmd_ginit,
541
 
    cmd_gmerge,
542
 
    cmd_gmissing, 
543
 
    cmd_gpreferences, 
544
 
    cmd_gpush, 
545
 
    cmd_gsend,
546
 
    cmd_gstatus,
547
 
    cmd_gtags,
548
 
    cmd_visualise
 
474
    cmd_gtags
549
475
    ]
550
476
 
551
477
for cmd in commands:
552
478
    register_command(cmd)
553
479
 
554
480
 
555
 
class cmd_gselftest(GTKCommand):
556
 
    """Version of selftest that displays a notification at the end"""
557
 
 
558
 
    takes_args = builtins.cmd_selftest.takes_args
559
 
    takes_options = builtins.cmd_selftest.takes_options
560
 
    _see_also = ['selftest']
561
 
 
562
 
    def run(self, *args, **kwargs):
 
481
class cmd_commit_notify(GTKCommand):
 
482
    """Run the bzr commit notifier.
 
483
 
 
484
    This is a background program which will pop up a notification on the users
 
485
    screen when a commit occurs.
 
486
    """
 
487
 
 
488
    def run(self):
 
489
        from notify import NotifyPopupMenu
 
490
        gtk = self.open_display()
 
491
        menu = NotifyPopupMenu()
 
492
        icon = gtk.status_icon_new_from_file("bzr-icon-64.png")
 
493
        icon.connect('popup-menu', menu.display)
 
494
 
563
495
        import cgi
564
 
        import sys
565
 
        default_encoding = sys.getdefaultencoding()
566
 
        # prevent gtk from blowing up later
567
 
        gtk = import_pygtk()
568
 
        # prevent gtk from messing with default encoding
 
496
        import dbus
 
497
        import dbus.service
569
498
        import pynotify
570
 
        if sys.getdefaultencoding() != default_encoding:
571
 
            reload(sys)
572
 
            sys.setdefaultencoding(default_encoding)
573
 
        result = builtins.cmd_selftest().run(*args, **kwargs)
574
 
        if result == 0:
575
 
            summary = 'Success'
576
 
            body = 'Selftest succeeded in "%s"' % os.getcwd()
577
 
        if result == 1:
578
 
            summary = 'Failure'
579
 
            body = 'Selftest failed in "%s"' % os.getcwd()
580
 
        pynotify.init("bzr gselftest")
581
 
        note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
582
 
        note.set_timeout(pynotify.EXPIRES_NEVER)
583
 
        note.show()
584
 
 
585
 
 
586
 
register_command(cmd_gselftest)
587
 
 
588
 
 
589
 
class cmd_test_gtk(GTKCommand):
590
 
    """Version of selftest that just runs the gtk test suite."""
591
 
 
592
 
    takes_options = ['verbose',
593
 
                     Option('one', short_name='1',
594
 
                            help='Stop when one test fails.'),
595
 
                     Option('benchmark', help='Run the benchmarks.'),
596
 
                     Option('lsprof-timed',
597
 
                     help='Generate lsprof output for benchmarked'
598
 
                          ' sections of code.'),
599
 
                     Option('list-only',
600
 
                     help='List the tests instead of running them.'),
601
 
                     Option('randomize', type=str, argname="SEED",
602
 
                     help='Randomize the order of tests using the given'
603
 
                          ' seed or "now" for the current time.'),
604
 
                    ]
605
 
    takes_args = ['testspecs*']
606
 
 
607
 
    def run(self, verbose=None, one=False, benchmark=None,
608
 
            lsprof_timed=None, list_only=False, randomize=None,
609
 
            testspecs_list=None):
610
 
        from bzrlib import __path__ as bzrlib_path
611
 
        from bzrlib.tests import selftest
612
 
 
613
 
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
614
 
        if benchmark:
615
 
            print 'No benchmarks yet'
616
 
            return 3
617
 
 
618
 
            test_suite_factory = bench_suite
619
 
            if verbose is None:
620
 
                verbose = True
621
 
            # TODO: should possibly lock the history file...
622
 
            benchfile = open(".perf_history", "at", buffering=1)
623
 
        else:
624
 
            test_suite_factory = test_suite
625
 
            if verbose is None:
626
 
                verbose = False
627
 
            benchfile = None
628
 
 
629
 
        if testspecs_list is not None:
630
 
            pattern = '|'.join(testspecs_list)
631
 
        else:
632
 
            pattern = ".*"
633
 
 
634
 
        try:
635
 
            result = selftest(verbose=verbose,
636
 
                              pattern=pattern,
637
 
                              stop_on_failure=one,
638
 
                              test_suite_factory=test_suite_factory,
639
 
                              lsprof_timed=lsprof_timed,
640
 
                              bench_history=benchfile,
641
 
                              list_only=list_only,
642
 
                              random_seed=randomize,
643
 
                             )
644
 
        finally:
645
 
            if benchfile is not None:
646
 
                benchfile.close()
647
 
 
648
 
register_command(cmd_test_gtk)
649
 
 
 
499
        from bzrlib.bzrdir import BzrDir
 
500
        from bzrlib import errors
 
501
        from bzrlib.osutils import format_date
 
502
        from bzrlib.transport import get_transport
 
503
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
504
            import dbus.glib
 
505
        from bzrlib.plugins.dbus import activity
 
506
        bus = dbus.SessionBus()
 
507
        # get the object so we can subscribe to callbacks from it.
 
508
        broadcast_service = bus.get_object(
 
509
            activity.Broadcast.DBUS_NAME,
 
510
            activity.Broadcast.DBUS_PATH)
 
511
 
 
512
        def catch_branch(revision_id, urls):
 
513
            # TODO: show all the urls, or perhaps choose the 'best'.
 
514
            url = urls[0]
 
515
            try:
 
516
                if isinstance(revision_id, unicode):
 
517
                    revision_id = revision_id.encode('utf8')
 
518
                transport = get_transport(url)
 
519
                a_dir = BzrDir.open_from_transport(transport)
 
520
                branch = a_dir.open_branch()
 
521
                revno = branch.revision_id_to_revno(revision_id)
 
522
                revision = branch.repository.get_revision(revision_id)
 
523
                summary = 'New revision %d in %s' % (revno, url)
 
524
                body  = 'Committer: %s\n' % revision.committer
 
525
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
526
                    revision.timezone)
 
527
                body += '\n'
 
528
                body += revision.message
 
529
                body = cgi.escape(body)
 
530
                nw = pynotify.Notification(summary, body)
 
531
                def start_viz(notification=None, action=None, data=None):
 
532
                    """Start the viz program."""
 
533
                    pp = start_viz_window(branch, revision_id)
 
534
                    pp.show()
 
535
                def start_branch(notification=None, action=None, data=None):
 
536
                    """Start a Branch dialog"""
 
537
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
538
                    bd = BranchDialog(remote_path=url)
 
539
                    bd.run()
 
540
                nw.add_action("inspect", "Inspect", start_viz, None)
 
541
                nw.add_action("branch", "Branch", start_branch, None)
 
542
                nw.set_timeout(5000)
 
543
                nw.show()
 
544
            except Exception, e:
 
545
                print e
 
546
                raise
 
547
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
548
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
549
        pynotify.init("bzr commit-notify")
 
550
        gtk.main()
 
551
 
 
552
register_command(cmd_commit_notify)
650
553
 
651
554
 
652
555
import gettext
653
556
gettext.install('olive-gtk')
654
557
 
655
 
# Let's create a specialized alias to protect '_' from being erased by other
656
 
# uses of '_' as an anonymous variable (think pdb for one).
657
 
_i18n = gettext.gettext
658
558
 
659
559
class NoDisplayError(BzrCommandError):
660
560
    """gtk could not find a proper display"""
670
570
    default_encoding = sys.getdefaultencoding()
671
571
    try:
672
572
        result = TestSuite()
673
 
        try:
674
 
            import_pygtk()
675
 
        except errors.BzrCommandError:
676
 
            return result
677
573
        result.addTest(tests.test_suite())
678
574
    finally:
679
575
        if sys.getdefaultencoding() != default_encoding: