/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-05-18 16:01:10 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070518160110-curir2hdf024r2e2
The History feature kinda works now, but still needs some polishing.

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
 
"""Graphical support for Bazaar using GTK.
16
 
 
17
 
This plugin includes:
18
 
gannotate         GTK+ annotate. 
19
 
gbranch           GTK+ branching. 
20
 
gcheckout         GTK+ checkout. 
21
 
gcommit           GTK+ commit dialog.
22
 
gconflicts        GTK+ conflicts. 
23
 
gdiff             Show differences in working tree in a GTK+ Window. 
24
 
ginit             Initialise a new branch.
25
 
gmerge            GTK+ merge dialog
26
 
gmissing          GTK+ missing revisions dialog. 
27
 
gpreferences      GTK+ preferences dialog. 
28
 
gpush             GTK+ push.
29
 
gsend             GTK+ send merge directive.
30
 
gstatus           GTK+ status dialog.
31
 
gtags             Manage branch tags.
32
 
visualise         Graphically visualise this branch. 
33
 
"""
34
 
 
35
 
import sys
 
15
"""GTK+ frontends to Bazaar commands """
36
16
 
37
17
import bzrlib
38
18
 
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)
 
19
__version__ = '0.17.0'
 
20
version_info = tuple(int(n) for n in __version__.split('.'))
 
21
 
48
22
 
49
23
def check_bzrlib_version(desired):
50
24
    """Check that bzrlib is compatible.
51
25
 
52
26
    If version is < bzr-gtk version, assume incompatible.
 
27
    If version == bzr-gtk version, assume completely compatible
 
28
    If version == bzr-gtk version + 1, assume compatible, with deprecations
 
29
    Otherwise, assume incompatible.
53
30
    """
 
31
    desired_plus = (desired[0], desired[1]+1)
54
32
    bzrlib_version = bzrlib.version_info[:2]
 
33
    if bzrlib_version == desired:
 
34
        return
55
35
    try:
56
36
        from bzrlib.trace import warning
57
37
    except ImportError:
58
38
        # get the message out any way we can
59
39
        from warnings import warn as warning
60
40
    if bzrlib_version < desired:
61
 
        from bzrlib.errors import BzrError
62
 
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
 
41
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
63
42
                ' %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)
 
43
        # Not using BzrNewError, because it may not exist.
 
44
        raise Exception, ('Version mismatch', version_info)
 
45
    else:
 
46
        warning('bzr-gtk is not up to date with installed bzr version %s.'
 
47
                ' \nThere should be a newer version available, e.g. %i.%i.' 
 
48
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
 
49
        if bzrlib_version != desired_plus:
 
50
            raise Exception, 'Version mismatch'
 
51
 
 
52
 
 
53
check_bzrlib_version(version_info[:2])
69
54
 
70
55
from bzrlib.trace import warning
71
56
if __name__ != 'bzrlib.plugins.gtk':
75
60
lazy_import(globals(), """
76
61
from bzrlib import (
77
62
    branch,
78
 
    builtins,
79
63
    errors,
80
 
    merge_directive,
81
64
    workingtree,
82
65
    )
83
66
""")
104
87
    bzrlib.ui.ui_factory = GtkUIFactory()
105
88
 
106
89
 
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
90
class GTKCommand(Command):
137
91
    """Abstract class providing GTK specific run commands."""
138
92
 
 
93
    def open_display(self):
 
94
        pygtk = import_pygtk()
 
95
        try:
 
96
            import gtk
 
97
        except RuntimeError, e:
 
98
            if str(e) == "could not open display":
 
99
                raise NoDisplayError
 
100
        set_ui_factory()
 
101
        return gtk
 
102
 
139
103
    def run(self):
140
 
        open_display()
 
104
        self.open_display()
141
105
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
106
        dialog.run()
143
107
 
171
135
 
172
136
    def run(self, location="."):
173
137
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
138
        self.open_display()
175
139
        from push import PushDialog
176
 
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
140
        dialog = PushDialog(br)
177
141
        dialog.run()
178
142
 
179
143
 
196
160
            if revision is not None:
197
161
                if len(revision) == 1:
198
162
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
163
                    revision_id = revision[0].in_history(branch).rev_id
200
164
                    tree2 = branch.repository.revision_tree(revision_id)
201
165
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
166
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
167
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
168
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
169
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
170
            else:
207
171
                tree1 = wt
229
193
            wt.unlock()
230
194
 
231
195
 
232
 
def start_viz_window(branch, revisions, limit=None):
233
 
    """Start viz on branch with revision revision.
234
 
    
235
 
    :return: The viz window object.
236
 
    """
237
 
    from viz import BranchWindow
238
 
    return BranchWindow(branch, revisions, limit)
239
 
 
240
 
 
241
196
class cmd_visualise(Command):
242
197
    """Graphically visualise this branch.
243
198
 
249
204
    """
250
205
    takes_options = [
251
206
        "revision",
252
 
        Option('limit', "Maximum number of revisions to display.",
 
207
        Option('limit', "maximum number of revisions to display",
253
208
               int, 'count')]
254
 
    takes_args = [ "locations*" ]
 
209
    takes_args = [ "location?" ]
255
210
    aliases = [ "visualize", "vis", "viz" ]
256
211
 
257
 
    def run(self, locations_list, revision=None, limit=None):
 
212
    def run(self, location=".", revision=None, limit=None):
258
213
        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)
 
214
        (br, path) = branch.Branch.open_containing(location)
 
215
        br.lock_read()
 
216
        br.repository.lock_read()
 
217
        try:
264
218
            if revision is None:
265
 
                revids.append(br.last_revision())
 
219
                revid = br.last_revision()
 
220
                if revid is None:
 
221
                    return
266
222
            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()
 
223
                (revno, revid) = revision[0].in_history(br)
 
224
 
 
225
            from viz.branchwin import BranchWindow
 
226
            import gtk
 
227
                
 
228
            pp = BranchWindow()
 
229
            pp.set_branch(br, revid, limit)
 
230
            pp.connect("destroy", lambda w: gtk.main_quit())
 
231
            pp.show()
 
232
            gtk.main()
 
233
        finally:
 
234
            br.repository.unlock()
 
235
            br.unlock()
273
236
 
274
237
 
275
238
class cmd_gannotate(GTKCommand):
280
243
 
281
244
    takes_args = ["filename", "line?"]
282
245
    takes_options = [
283
 
        Option("all", help="Show annotations on all lines."),
284
 
        Option("plain", help="Don't highlight annotation lines."),
 
246
        Option("all", help="show annotations on all lines"),
 
247
        Option("plain", help="don't highlight annotation lines"),
285
248
        Option("line", type=int, argname="lineno",
286
 
               help="Jump to specified line number."),
 
249
               help="jump to specified line number"),
287
250
        "revision",
288
251
    ]
289
252
    aliases = ["gblame", "gpraise"]
290
253
    
291
254
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
255
        gtk = self.open_display()
293
256
 
294
257
        try:
295
258
            line = int(line)
314
277
        if revision is not None:
315
278
            if len(revision) != 1:
316
279
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
280
            revision_id = revision[0].in_history(br).rev_id
318
281
            tree = br.repository.revision_tree(revision_id)
319
282
        else:
320
283
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
284
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
285
        window = GAnnotateWindow(all, plain)
323
286
        window.connect("destroy", lambda w: gtk.main_quit())
 
287
        window.set_title(path + " - gannotate")
324
288
        config = GAnnotateConfig(window)
325
289
        window.show()
326
290
        br.lock_read()
341
305
    """GTK+ commit dialog
342
306
 
343
307
    Graphical user interface for committing revisions"""
344
 
 
 
308
    
345
309
    aliases = [ "gci" ]
346
310
    takes_args = []
347
311
    takes_options = []
348
312
 
349
313
    def run(self, filename=None):
350
314
        import os
351
 
        open_display()
 
315
        self.open_display()
352
316
        from commit import CommitDialog
353
317
        from bzrlib.errors import (BzrCommandError,
354
318
                                   NotBranchError,
360
324
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
361
325
            br = wt.branch
362
326
        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()
 
327
            path = e.base
 
328
            (br, path) = branch.Branch.open_containing(path)
 
329
 
 
330
        commit = CommitDialog(wt, path, not br)
 
331
        commit.run()
 
332
 
378
333
 
379
334
 
380
335
class cmd_gstatus(GTKCommand):
385
340
    
386
341
    aliases = [ "gst" ]
387
342
    takes_args = ['PATH?']
388
 
    takes_options = ['revision']
 
343
    takes_options = []
389
344
 
390
 
    def run(self, path='.', revision=None):
 
345
    def run(self, path='.'):
391
346
        import os
392
 
        gtk = open_display()
 
347
        gtk = self.open_display()
393
348
        from status import StatusDialog
394
349
        (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)
 
350
        status = StatusDialog(wt, wt_path)
406
351
        status.connect("destroy", gtk.main_quit)
407
352
        status.run()
408
353
 
409
354
 
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
355
 
430
356
class cmd_gconflicts(GTKCommand):
431
 
    """GTK+ conflicts.
 
357
    """ GTK+ push.
432
358
    
433
 
    Select files from the list of conflicts and run an external utility to
434
 
    resolve them.
435
359
    """
436
360
    def run(self):
437
361
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
362
        self.open_display()
439
363
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
364
        dialog = ConflictsDialog(wt)
441
365
        dialog.run()
442
366
 
443
367
 
 
368
 
444
369
class cmd_gpreferences(GTKCommand):
445
370
    """ GTK+ preferences dialog.
446
371
 
447
372
    """
448
373
    def run(self):
449
 
        open_display()
 
374
        self.open_display()
450
375
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
376
        dialog = PreferencesWindow()
452
377
        dialog.run()
453
378
 
454
379
 
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
380
 
478
381
class cmd_gmissing(Command):
479
382
    """ GTK+ missing revisions dialog.
513
416
 
514
417
class cmd_ginit(GTKCommand):
515
418
    def run(self):
516
 
        open_display()
 
419
        self.open_display()
517
420
        from initialize import InitDialog
518
421
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
422
        dialog.run()
523
426
    def run(self):
524
427
        br = branch.Branch.open_containing('.')[0]
525
428
        
526
 
        gtk = open_display()
 
429
        gtk = self.open_display()
527
430
        from tags import TagsWindow
528
431
        window = TagsWindow(br)
529
432
        window.show()
531
434
 
532
435
 
533
436
commands = [
 
437
    cmd_gmissing, 
 
438
    cmd_gpreferences, 
 
439
    cmd_gconflicts, 
 
440
    cmd_gstatus,
 
441
    cmd_gcommit, 
534
442
    cmd_gannotate, 
 
443
    cmd_visualise, 
 
444
    cmd_gdiff,
 
445
    cmd_gpush, 
 
446
    cmd_gcheckout, 
535
447
    cmd_gbranch,
536
 
    cmd_gcheckout, 
537
 
    cmd_gcommit, 
538
 
    cmd_gconflicts, 
539
 
    cmd_gdiff,
540
448
    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
 
449
    cmd_gtags
549
450
    ]
550
451
 
551
452
for cmd in commands:
552
453
    register_command(cmd)
553
454
 
554
455
 
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):
 
456
class cmd_commit_notify(GTKCommand):
 
457
    """Run the bzr commit notifier.
 
458
 
 
459
    This is a background program which will pop up a notification on the users
 
460
    screen when a commit occurs.
 
461
    """
 
462
 
 
463
    def run(self):
 
464
        gtk = self.open_display()
563
465
        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
 
466
        import dbus
 
467
        import dbus.service
569
468
        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
 
 
 
469
        from bzrlib.bzrdir import BzrDir
 
470
        from bzrlib import errors
 
471
        from bzrlib.osutils import format_date
 
472
        from bzrlib.transport import get_transport
 
473
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
474
            import dbus.glib
 
475
        from bzrlib.plugins.dbus import activity
 
476
        bus = dbus.SessionBus()
 
477
        # get the object so we can subscribe to callbacks from it.
 
478
        broadcast_service = bus.get_object(
 
479
            activity.Broadcast.DBUS_NAME,
 
480
            activity.Broadcast.DBUS_PATH)
 
481
        def catch_branch(revision_id, urls):
 
482
            # TODO: show all the urls, or perhaps choose the 'best'.
 
483
            url = urls[0]
 
484
            try:
 
485
                if isinstance(revision_id, unicode):
 
486
                    revision_id = revision_id.encode('utf8')
 
487
                transport = get_transport(url)
 
488
                a_dir = BzrDir.open_from_transport(transport)
 
489
                branch = a_dir.open_branch()
 
490
                revno = branch.revision_id_to_revno(revision_id)
 
491
                revision = branch.repository.get_revision(revision_id)
 
492
                summary = 'New revision %d in %s' % (revno, url)
 
493
                body  = 'Committer: %s\n' % revision.committer
 
494
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
495
                    revision.timezone)
 
496
                body += '\n'
 
497
                body += revision.message
 
498
                body = cgi.escape(body)
 
499
                nw = pynotify.Notification(summary, body)
 
500
                nw.set_timeout(5000)
 
501
                nw.show()
 
502
            except Exception, e:
 
503
                print e
 
504
                raise
 
505
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
506
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
507
        pynotify.init("bzr commit-notify")
 
508
        gtk.main()
 
509
 
 
510
register_command(cmd_commit_notify)
650
511
 
651
512
 
652
513
import gettext
653
514
gettext.install('olive-gtk')
654
515
 
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
516
 
659
517
class NoDisplayError(BzrCommandError):
660
518
    """gtk could not find a proper display"""
670
528
    default_encoding = sys.getdefaultencoding()
671
529
    try:
672
530
        result = TestSuite()
673
 
        try:
674
 
            import_pygtk()
675
 
        except errors.BzrCommandError:
676
 
            return result
677
531
        result.addTest(tests.test_suite())
678
532
    finally:
679
533
        if sys.getdefaultencoding() != default_encoding: