/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-04-06 17:48:23 UTC
  • mto: (188.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 190.
  • Revision ID: szilveszter.farkas@gmail.com-20070406174823-bclt7vsgn2nkcas2
Implemented init functionality.

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
 
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+ conflicts. 
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
 
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.16.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_path():
108
 
    return os.path.dirname(__file__)
109
 
 
110
 
 
111
 
def icon_path(*args):
112
 
    basedirs = [os.path.join(data_path()),
113
 
             "/usr/share/bzr-gtk", 
114
 
             "/usr/local/share/bzr-gtk"]
115
 
    for basedir in basedirs:
116
 
        path = os.path.join(basedir, 'icons', *args)
117
 
        if os.path.exists(path):
118
 
            return path
119
 
    return None
120
 
 
121
 
 
122
 
def open_display():
123
 
    pygtk = import_pygtk()
124
 
    try:
125
 
        import gtk
126
 
    except RuntimeError, e:
127
 
        if str(e) == "could not open display":
128
 
            raise NoDisplayError
129
 
    set_ui_factory()
130
 
    return gtk
131
 
 
132
 
 
133
90
class GTKCommand(Command):
134
91
    """Abstract class providing GTK specific run commands."""
135
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
 
136
103
    def run(self):
137
 
        open_display()
 
104
        self.open_display()
138
105
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
139
106
        dialog.run()
140
107
 
168
135
 
169
136
    def run(self, location="."):
170
137
        (br, path) = branch.Branch.open_containing(location)
171
 
        open_display()
 
138
        self.open_display()
172
139
        from push import PushDialog
173
 
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
140
        dialog = PushDialog(br)
174
141
        dialog.run()
175
142
 
176
143
 
193
160
            if revision is not None:
194
161
                if len(revision) == 1:
195
162
                    tree1 = wt
196
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
163
                    revision_id = revision[0].in_history(branch).rev_id
197
164
                    tree2 = branch.repository.revision_tree(revision_id)
198
165
                elif len(revision) == 2:
199
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
166
                    revision_id_0 = revision[0].in_history(branch).rev_id
200
167
                    tree2 = branch.repository.revision_tree(revision_id_0)
201
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
168
                    revision_id_1 = revision[1].in_history(branch).rev_id
202
169
                    tree1 = branch.repository.revision_tree(revision_id_1)
203
170
            else:
204
171
                tree1 = wt
214
181
                try:
215
182
                    window.set_file(tree_filename)
216
183
                except NoSuchFile:
217
 
                    if (tree1.path2id(tree_filename) is None and 
218
 
                        tree2.path2id(tree_filename) is None):
 
184
                    if (tree1.inventory.path2id(tree_filename) is None and 
 
185
                        tree2.inventory.path2id(tree_filename) is None):
219
186
                        raise NotVersionedError(filename)
220
187
                    raise BzrCommandError('No changes found for file "%s"' % 
221
188
                                          filename)
226
193
            wt.unlock()
227
194
 
228
195
 
229
 
def start_viz_window(branch, revisions, limit=None):
230
 
    """Start viz on branch with revision revision.
231
 
    
232
 
    :return: The viz window object.
233
 
    """
234
 
    from viz import BranchWindow
235
 
    return BranchWindow(branch, revisions, limit)
236
 
 
237
 
 
238
196
class cmd_visualise(Command):
239
197
    """Graphically visualise this branch.
240
198
 
246
204
    """
247
205
    takes_options = [
248
206
        "revision",
249
 
        Option('limit', "Maximum number of revisions to display.",
 
207
        Option('limit', "maximum number of revisions to display",
250
208
               int, 'count')]
251
 
    takes_args = [ "locations*" ]
 
209
    takes_args = [ "location?" ]
252
210
    aliases = [ "visualize", "vis", "viz" ]
253
211
 
254
 
    def run(self, locations_list, revision=None, limit=None):
 
212
    def run(self, location=".", revision=None, limit=None):
255
213
        set_ui_factory()
256
 
        if locations_list is None:
257
 
            locations_list = ["."]
258
 
        revids = []
259
 
        for location in locations_list:
260
 
            (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:
261
218
            if revision is None:
262
 
                revids.append(br.last_revision())
 
219
                revid = br.last_revision()
 
220
                if revid is None:
 
221
                    return
263
222
            else:
264
 
                revids.append(revision[0].as_revision_id(br))
265
 
        import gtk
266
 
        pp = start_viz_window(br, revids, limit)
267
 
        pp.connect("destroy", lambda w: gtk.main_quit())
268
 
        pp.show()
269
 
        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()
270
236
 
271
237
 
272
238
class cmd_gannotate(GTKCommand):
277
243
 
278
244
    takes_args = ["filename", "line?"]
279
245
    takes_options = [
280
 
        Option("all", help="Show annotations on all lines."),
281
 
        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"),
282
248
        Option("line", type=int, argname="lineno",
283
 
               help="Jump to specified line number."),
 
249
               help="jump to specified line number"),
284
250
        "revision",
285
251
    ]
286
252
    aliases = ["gblame", "gpraise"]
287
253
    
288
254
    def run(self, filename, all=False, plain=False, line='1', revision=None):
289
 
        gtk = open_display()
 
255
        gtk = self.open_display()
290
256
 
291
257
        try:
292
258
            line = int(line)
311
277
        if revision is not None:
312
278
            if len(revision) != 1:
313
279
                raise BzrCommandError("Only 1 revion may be specified.")
314
 
            revision_id = revision[0].as_revision_id(br)
 
280
            revision_id = revision[0].in_history(br).rev_id
315
281
            tree = br.repository.revision_tree(revision_id)
316
282
        else:
317
283
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
318
284
 
319
 
        window = GAnnotateWindow(all, plain, branch=br)
 
285
        window = GAnnotateWindow(all, plain)
320
286
        window.connect("destroy", lambda w: gtk.main_quit())
 
287
        window.set_title(path + " - gannotate")
321
288
        config = GAnnotateConfig(window)
322
289
        window.show()
323
290
        br.lock_read()
338
305
    """GTK+ commit dialog
339
306
 
340
307
    Graphical user interface for committing revisions"""
341
 
 
 
308
    
342
309
    aliases = [ "gci" ]
343
310
    takes_args = []
344
311
    takes_options = []
345
312
 
346
313
    def run(self, filename=None):
347
314
        import os
348
 
        open_display()
 
315
        self.open_display()
349
316
        from commit import CommitDialog
350
317
        from bzrlib.errors import (BzrCommandError,
351
318
                                   NotBranchError,
356
323
        try:
357
324
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
358
325
            br = wt.branch
 
326
        except NotBranchError, e:
 
327
            path = e.path
359
328
        except NoWorkingTree, e:
360
 
            from dialog import error_dialog
361
 
            error_dialog(_i18n('Directory does not have a working tree'),
362
 
                         _i18n('Operation aborted.'))
363
 
            return 1 # should this be retval=3?
364
 
 
365
 
        # It is a good habit to keep things locked for the duration, but it
366
 
        # could cause difficulties if someone wants to do things in another
367
 
        # window... We could lock_read() until we actually go to commit
368
 
        # changes... Just a thought.
369
 
        wt.lock_write()
370
 
        try:
371
 
            dlg = CommitDialog(wt)
372
 
            return dlg.run()
373
 
        finally:
374
 
            wt.unlock()
 
329
            path = e.base
 
330
            try:
 
331
                (br, path) = branch.Branch.open_containing(path)
 
332
            except NotBranchError, e:
 
333
                path = e.path
 
334
 
 
335
        commit = CommitDialog(wt, path, not br)
 
336
        commit.run()
 
337
 
375
338
 
376
339
 
377
340
class cmd_gstatus(GTKCommand):
382
345
    
383
346
    aliases = [ "gst" ]
384
347
    takes_args = ['PATH?']
385
 
    takes_options = ['revision']
 
348
    takes_options = []
386
349
 
387
 
    def run(self, path='.', revision=None):
 
350
    def run(self, path='.'):
388
351
        import os
389
 
        gtk = open_display()
 
352
        gtk = self.open_display()
390
353
        from status import StatusDialog
391
354
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
392
 
        
393
 
        if revision is not None:
394
 
            try:
395
 
                revision_id = revision[0].as_revision_id(wt.branch)
396
 
            except:
397
 
                from bzrlib.errors import BzrError
398
 
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
399
 
        else:
400
 
            revision_id = None
401
 
 
402
 
        status = StatusDialog(wt, wt_path, revision_id)
 
355
        status = StatusDialog(wt, wt_path)
403
356
        status.connect("destroy", gtk.main_quit)
404
357
        status.run()
405
358
 
406
359
 
407
 
class cmd_gsend(GTKCommand):
408
 
    """GTK+ send merge directive.
409
 
 
410
 
    """
411
 
    def run(self):
412
 
        (br, path) = branch.Branch.open_containing(".")
413
 
        gtk = open_display()
414
 
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
415
 
        from StringIO import StringIO
416
 
        dialog = SendMergeDirectiveDialog(br)
417
 
        if dialog.run() == gtk.RESPONSE_OK:
418
 
            outf = StringIO()
419
 
            outf.writelines(dialog.get_merge_directive().to_lines())
420
 
            mail_client = br.get_config().get_mail_client()
421
 
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
422
 
                outf.getvalue())
423
 
 
424
 
            
425
 
 
426
360
 
427
361
class cmd_gconflicts(GTKCommand):
428
 
    """GTK+ conflicts.
 
362
    """ GTK+ push.
429
363
    
430
 
    Select files from the list of conflicts and run an external utility to
431
 
    resolve them.
432
364
    """
433
365
    def run(self):
434
366
        (wt, path) = workingtree.WorkingTree.open_containing('.')
435
 
        open_display()
 
367
        self.open_display()
436
368
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
437
369
        dialog = ConflictsDialog(wt)
438
370
        dialog.run()
439
371
 
440
372
 
 
373
 
441
374
class cmd_gpreferences(GTKCommand):
442
375
    """ GTK+ preferences dialog.
443
376
 
444
377
    """
445
378
    def run(self):
446
 
        open_display()
 
379
        self.open_display()
447
380
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
448
381
        dialog = PreferencesWindow()
449
382
        dialog.run()
450
383
 
451
384
 
 
385
 
452
386
class cmd_gmissing(Command):
453
387
    """ GTK+ missing revisions dialog.
454
388
 
487
421
 
488
422
class cmd_ginit(GTKCommand):
489
423
    def run(self):
490
 
        open_display()
 
424
        self.open_display()
491
425
        from initialize import InitDialog
492
426
        dialog = InitDialog(os.path.abspath(os.path.curdir))
493
427
        dialog.run()
494
428
 
495
429
 
496
 
class cmd_gtags(GTKCommand):
497
 
    def run(self):
498
 
        br = branch.Branch.open_containing('.')[0]
499
 
        
500
 
        gtk = open_display()
501
 
        from tags import TagsWindow
502
 
        window = TagsWindow(br)
503
 
        window.show()
504
 
        gtk.main()
505
 
 
506
 
 
507
430
commands = [
 
431
    cmd_gmissing, 
 
432
    cmd_gpreferences, 
 
433
    cmd_gconflicts, 
 
434
    cmd_gstatus,
 
435
    cmd_gcommit, 
508
436
    cmd_gannotate, 
509
 
    cmd_gbranch,
510
 
    cmd_gcheckout, 
511
 
    cmd_gcommit, 
512
 
    cmd_gconflicts, 
 
437
    cmd_visualise, 
513
438
    cmd_gdiff,
514
 
    cmd_ginit,
515
 
    cmd_gmissing, 
516
 
    cmd_gpreferences, 
517
439
    cmd_gpush, 
518
 
    cmd_gsend,
519
 
    cmd_gstatus,
520
 
    cmd_gtags,
521
 
    cmd_visualise
 
440
    cmd_gcheckout, 
 
441
    cmd_gbranch,
 
442
    cmd_ginit
522
443
    ]
523
444
 
524
445
for cmd in commands:
533
454
    """
534
455
 
535
456
    def run(self):
536
 
        from notify import NotifyPopupMenu
537
 
        gtk = open_display()
538
 
        menu = NotifyPopupMenu()
539
 
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
540
 
        icon.connect('popup-menu', menu.display)
541
 
 
 
457
        gtk = self.open_display()
542
458
        import cgi
543
459
        import dbus
544
460
        import dbus.service
549
465
        from bzrlib.transport import get_transport
550
466
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
551
467
            import dbus.glib
552
 
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
 
468
        from bzrlib.plugins.dbus import activity
553
469
        bus = dbus.SessionBus()
554
 
 
 
470
        # get the object so we can subscribe to callbacks from it.
 
471
        broadcast_service = bus.get_object(
 
472
            activity.Broadcast.DBUS_NAME,
 
473
            activity.Broadcast.DBUS_PATH)
555
474
        def catch_branch(revision_id, urls):
556
475
            # TODO: show all the urls, or perhaps choose the 'best'.
557
476
            url = urls[0]
571
490
                body += revision.message
572
491
                body = cgi.escape(body)
573
492
                nw = pynotify.Notification(summary, body)
574
 
                def start_viz(notification=None, action=None, data=None):
575
 
                    """Start the viz program."""
576
 
                    pp = start_viz_window(branch, revision_id)
577
 
                    pp.show()
578
 
                def start_branch(notification=None, action=None, data=None):
579
 
                    """Start a Branch dialog"""
580
 
                    from bzrlib.plugins.gtk.branch import BranchDialog
581
 
                    bd = BranchDialog(remote_path=url)
582
 
                    bd.run()
583
 
                nw.add_action("inspect", "Inspect", start_viz, None)
584
 
                nw.add_action("branch", "Branch", start_branch, None)
585
493
                nw.set_timeout(5000)
586
494
                nw.show()
587
495
            except Exception, e:
588
496
                print e
589
497
                raise
590
 
        bus.add_signal_receiver(catch_branch,
591
 
                                dbus_interface=BROADCAST_INTERFACE,
592
 
                                signal_name="Revision")
 
498
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
499
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
593
500
        pynotify.init("bzr commit-notify")
594
501
        gtk.main()
595
502
 
596
503
register_command(cmd_commit_notify)
597
504
 
598
505
 
599
 
class cmd_gselftest(GTKCommand):
600
 
    """Version of selftest that displays a notification at the end"""
601
 
 
602
 
    takes_args = builtins.cmd_selftest.takes_args
603
 
    takes_options = builtins.cmd_selftest.takes_options
604
 
    _see_also = ['selftest']
605
 
 
606
 
    def run(self, *args, **kwargs):
607
 
        import cgi
608
 
        import sys
609
 
        default_encoding = sys.getdefaultencoding()
610
 
        # prevent gtk from blowing up later
611
 
        gtk = import_pygtk()
612
 
        # prevent gtk from messing with default encoding
613
 
        import pynotify
614
 
        if sys.getdefaultencoding() != default_encoding:
615
 
            reload(sys)
616
 
            sys.setdefaultencoding(default_encoding)
617
 
        result = builtins.cmd_selftest().run(*args, **kwargs)
618
 
        if result == 0:
619
 
            summary = 'Success'
620
 
            body = 'Selftest succeeded in "%s"' % os.getcwd()
621
 
        if result == 1:
622
 
            summary = 'Failure'
623
 
            body = 'Selftest failed in "%s"' % os.getcwd()
624
 
        pynotify.init("bzr gselftest")
625
 
        note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
626
 
        note.set_timeout(pynotify.EXPIRES_NEVER)
627
 
        note.show()
628
 
 
629
 
 
630
 
register_command(cmd_gselftest)
631
 
 
632
 
 
633
 
class cmd_test_gtk(GTKCommand):
634
 
    """Version of selftest that just runs the gtk test suite."""
635
 
 
636
 
    takes_options = ['verbose',
637
 
                     Option('one', short_name='1',
638
 
                            help='Stop when one test fails.'),
639
 
                     Option('benchmark', help='Run the benchmarks.'),
640
 
                     Option('lsprof-timed',
641
 
                     help='Generate lsprof output for benchmarked'
642
 
                          ' sections of code.'),
643
 
                     Option('list-only',
644
 
                     help='List the tests instead of running them.'),
645
 
                     Option('randomize', type=str, argname="SEED",
646
 
                     help='Randomize the order of tests using the given'
647
 
                          ' seed or "now" for the current time.'),
648
 
                    ]
649
 
    takes_args = ['testspecs*']
650
 
 
651
 
    def run(self, verbose=None, one=False, benchmark=None,
652
 
            lsprof_timed=None, list_only=False, randomize=None,
653
 
            testspecs_list=None):
654
 
        from bzrlib import __path__ as bzrlib_path
655
 
        from bzrlib.tests import selftest
656
 
 
657
 
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
658
 
        if benchmark:
659
 
            print 'No benchmarks yet'
660
 
            return 3
661
 
 
662
 
            test_suite_factory = bench_suite
663
 
            if verbose is None:
664
 
                verbose = True
665
 
            # TODO: should possibly lock the history file...
666
 
            benchfile = open(".perf_history", "at", buffering=1)
667
 
        else:
668
 
            test_suite_factory = test_suite
669
 
            if verbose is None:
670
 
                verbose = False
671
 
            benchfile = None
672
 
 
673
 
        if testspecs_list is not None:
674
 
            pattern = '|'.join(testspecs_list)
675
 
        else:
676
 
            pattern = ".*"
677
 
 
678
 
        try:
679
 
            result = selftest(verbose=verbose,
680
 
                              pattern=pattern,
681
 
                              stop_on_failure=one,
682
 
                              test_suite_factory=test_suite_factory,
683
 
                              lsprof_timed=lsprof_timed,
684
 
                              bench_history=benchfile,
685
 
                              list_only=list_only,
686
 
                              random_seed=randomize,
687
 
                             )
688
 
        finally:
689
 
            if benchfile is not None:
690
 
                benchfile.close()
691
 
 
692
 
register_command(cmd_test_gtk)
693
 
 
694
 
 
695
 
 
696
506
import gettext
697
507
gettext.install('olive-gtk')
698
508
 
699
 
# Let's create a specialized alias to protect '_' from being erased by other
700
 
# uses of '_' as an anonymous variable (think pdb for one).
701
 
_i18n = gettext.gettext
702
509
 
703
510
class NoDisplayError(BzrCommandError):
704
511
    """gtk could not find a proper display"""
714
521
    default_encoding = sys.getdefaultencoding()
715
522
    try:
716
523
        result = TestSuite()
717
 
        try:
718
 
            import_pygtk()
719
 
        except errors.BzrCommandError:
720
 
            return result
721
524
        result.addTest(tests.test_suite())
722
525
    finally:
723
526
        if sys.getdefaultencoding() != default_encoding: