/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-03-23 13:41:56 UTC
  • Revision ID: jelmer@samba.org-20070323134156-6f00hd1a3j38gl74
Add two TODO items

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
 
class GTKCommand(Command):
134
 
    """Abstract class providing GTK specific run commands."""
135
 
 
136
 
    def run(self):
137
 
        open_display()
138
 
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
139
 
        dialog.run()
140
 
 
141
 
 
142
 
class cmd_gbranch(GTKCommand):
 
90
class cmd_gbranch(Command):
143
91
    """GTK+ branching.
144
92
    
145
93
    """
146
94
 
147
 
    def get_gtk_dialog(self, path):
 
95
    def run(self):
 
96
        pygtk = import_pygtk()
 
97
        try:
 
98
            import gtk
 
99
        except RuntimeError, e:
 
100
            if str(e) == "could not open display":
 
101
                raise NoDisplayError
 
102
 
148
103
        from bzrlib.plugins.gtk.branch import BranchDialog
149
 
        return BranchDialog(path)
150
 
 
151
 
 
152
 
class cmd_gcheckout(GTKCommand):
 
104
 
 
105
        set_ui_factory()
 
106
        dialog = BranchDialog(os.path.abspath('.'))
 
107
        dialog.run()
 
108
 
 
109
class cmd_gcheckout(Command):
153
110
    """ GTK+ checkout.
154
111
    
155
112
    """
156
113
    
157
 
    def get_gtk_dialog(self, path):
 
114
    def run(self):
 
115
        pygtk = import_pygtk()
 
116
        try:
 
117
            import gtk
 
118
        except RuntimeError, e:
 
119
            if str(e) == "could not open display":
 
120
                raise NoDisplayError
 
121
 
158
122
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
159
 
        return CheckoutDialog(path)
160
 
 
161
 
 
162
 
 
163
 
class cmd_gpush(GTKCommand):
 
123
 
 
124
        set_ui_factory()
 
125
        dialog = CheckoutDialog(os.path.abspath('.'))
 
126
        dialog.run()
 
127
 
 
128
 
 
129
class cmd_gpush(Command):
164
130
    """ GTK+ push.
165
131
    
166
132
    """
168
134
 
169
135
    def run(self, location="."):
170
136
        (br, path) = branch.Branch.open_containing(location)
171
 
        open_display()
 
137
 
 
138
        pygtk = import_pygtk()
 
139
        try:
 
140
            import gtk
 
141
        except RuntimeError, e:
 
142
            if str(e) == "could not open display":
 
143
                raise NoDisplayError
 
144
 
172
145
        from push import PushDialog
173
 
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
146
 
 
147
        set_ui_factory()
 
148
        dialog = PushDialog(br)
174
149
        dialog.run()
175
150
 
176
151
 
177
 
 
178
 
class cmd_gdiff(GTKCommand):
 
152
class cmd_gdiff(Command):
179
153
    """Show differences in working tree in a GTK+ Window.
180
154
    
181
155
    Otherwise, all changes for the tree are listed.
193
167
            if revision is not None:
194
168
                if len(revision) == 1:
195
169
                    tree1 = wt
196
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
170
                    revision_id = revision[0].in_history(branch).rev_id
197
171
                    tree2 = branch.repository.revision_tree(revision_id)
198
172
                elif len(revision) == 2:
199
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
173
                    revision_id_0 = revision[0].in_history(branch).rev_id
200
174
                    tree2 = branch.repository.revision_tree(revision_id_0)
201
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
175
                    revision_id_1 = revision[1].in_history(branch).rev_id
202
176
                    tree1 = branch.repository.revision_tree(revision_id_1)
203
177
            else:
204
178
                tree1 = wt
214
188
                try:
215
189
                    window.set_file(tree_filename)
216
190
                except NoSuchFile:
217
 
                    if (tree1.path2id(tree_filename) is None and 
218
 
                        tree2.path2id(tree_filename) is None):
 
191
                    if (tree1.inventory.path2id(tree_filename) is None and 
 
192
                        tree2.inventory.path2id(tree_filename) is None):
219
193
                        raise NotVersionedError(filename)
220
194
                    raise BzrCommandError('No changes found for file "%s"' % 
221
195
                                          filename)
226
200
            wt.unlock()
227
201
 
228
202
 
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
203
class cmd_visualise(Command):
239
204
    """Graphically visualise this branch.
240
205
 
246
211
    """
247
212
    takes_options = [
248
213
        "revision",
249
 
        Option('limit', "Maximum number of revisions to display.",
 
214
        Option('limit', "maximum number of revisions to display",
250
215
               int, 'count')]
251
 
    takes_args = [ "locations*" ]
 
216
    takes_args = [ "location?" ]
252
217
    aliases = [ "visualize", "vis", "viz" ]
253
218
 
254
 
    def run(self, locations_list, revision=None, limit=None):
 
219
    def run(self, location=".", revision=None, limit=None):
255
220
        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)
 
221
        (br, path) = branch.Branch.open_containing(location)
 
222
        br.lock_read()
 
223
        br.repository.lock_read()
 
224
        try:
261
225
            if revision is None:
262
 
                revids.append(br.last_revision())
 
226
                revid = br.last_revision()
 
227
                if revid is None:
 
228
                    return
263
229
            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()
270
 
 
271
 
 
272
 
class cmd_gannotate(GTKCommand):
 
230
                (revno, revid) = revision[0].in_history(br)
 
231
 
 
232
            from viz.branchwin import BranchWindow
 
233
            import gtk
 
234
                
 
235
            pp = BranchWindow()
 
236
            pp.set_branch(br, revid, limit)
 
237
            pp.connect("destroy", lambda w: gtk.main_quit())
 
238
            pp.show()
 
239
            gtk.main()
 
240
        finally:
 
241
            br.repository.unlock()
 
242
            br.unlock()
 
243
 
 
244
 
 
245
class cmd_gannotate(Command):
273
246
    """GTK+ annotate.
274
247
    
275
248
    Browse changes to FILENAME line by line in a GTK+ window.
277
250
 
278
251
    takes_args = ["filename", "line?"]
279
252
    takes_options = [
280
 
        Option("all", help="Show annotations on all lines."),
281
 
        Option("plain", help="Don't highlight annotation lines."),
 
253
        Option("all", help="show annotations on all lines"),
 
254
        Option("plain", help="don't highlight annotation lines"),
282
255
        Option("line", type=int, argname="lineno",
283
 
               help="Jump to specified line number."),
 
256
               help="jump to specified line number"),
284
257
        "revision",
285
258
    ]
286
259
    aliases = ["gblame", "gpraise"]
287
260
    
288
261
    def run(self, filename, all=False, plain=False, line='1', revision=None):
289
 
        gtk = open_display()
 
262
        pygtk = import_pygtk()
 
263
 
 
264
        try:
 
265
            import gtk
 
266
        except RuntimeError, e:
 
267
            if str(e) == "could not open display":
 
268
                raise NoDisplayError
 
269
        set_ui_factory()
290
270
 
291
271
        try:
292
272
            line = int(line)
311
291
        if revision is not None:
312
292
            if len(revision) != 1:
313
293
                raise BzrCommandError("Only 1 revion may be specified.")
314
 
            revision_id = revision[0].as_revision_id(br)
 
294
            revision_id = revision[0].in_history(br).rev_id
315
295
            tree = br.repository.revision_tree(revision_id)
316
296
        else:
317
297
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
318
298
 
319
 
        window = GAnnotateWindow(all, plain, branch=br)
 
299
        window = GAnnotateWindow(all, plain)
320
300
        window.connect("destroy", lambda w: gtk.main_quit())
 
301
        window.set_title(path + " - gannotate")
321
302
        config = GAnnotateConfig(window)
322
303
        window.show()
323
304
        br.lock_read()
333
314
                wt.unlock()
334
315
 
335
316
 
336
 
 
337
 
class cmd_gcommit(GTKCommand):
 
317
class cmd_gcommit(Command):
338
318
    """GTK+ commit dialog
339
319
 
340
320
    Graphical user interface for committing revisions"""
341
 
 
 
321
    
342
322
    aliases = [ "gci" ]
343
323
    takes_args = []
344
324
    takes_options = []
345
325
 
346
326
    def run(self, filename=None):
347
327
        import os
348
 
        open_display()
 
328
        pygtk = import_pygtk()
 
329
 
 
330
        try:
 
331
            import gtk
 
332
        except RuntimeError, e:
 
333
            if str(e) == "could not open display":
 
334
                raise NoDisplayError
 
335
 
 
336
        set_ui_factory()
349
337
        from commit import CommitDialog
350
338
        from bzrlib.errors import (BzrCommandError,
351
339
                                   NotBranchError,
356
344
        try:
357
345
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
358
346
            br = wt.branch
 
347
        except NotBranchError, e:
 
348
            path = e.path
359
349
        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()
375
 
 
376
 
 
377
 
class cmd_gstatus(GTKCommand):
 
350
            path = e.base
 
351
            try:
 
352
                (br, path) = branch.Branch.open_containing(path)
 
353
            except NotBranchError, e:
 
354
                path = e.path
 
355
 
 
356
        commit = CommitDialog(wt, path, not br)
 
357
        commit.run()
 
358
 
 
359
 
 
360
class cmd_gstatus(Command):
378
361
    """GTK+ status dialog
379
362
 
380
363
    Graphical user interface for showing status 
382
365
    
383
366
    aliases = [ "gst" ]
384
367
    takes_args = ['PATH?']
385
 
    takes_options = ['revision']
 
368
    takes_options = []
386
369
 
387
 
    def run(self, path='.', revision=None):
 
370
    def run(self, path='.'):
388
371
        import os
389
 
        gtk = open_display()
 
372
        pygtk = import_pygtk()
 
373
 
 
374
        try:
 
375
            import gtk
 
376
        except RuntimeError, e:
 
377
            if str(e) == "could not open display":
 
378
                raise NoDisplayError
 
379
 
 
380
        set_ui_factory()
390
381
        from status import StatusDialog
391
382
        (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)
 
383
        status = StatusDialog(wt, wt_path)
403
384
        status.connect("destroy", gtk.main_quit)
404
385
        status.run()
405
386
 
406
387
 
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
 
 
427
 
class cmd_gconflicts(GTKCommand):
428
 
    """GTK+ conflicts.
 
388
class cmd_gconflicts(Command):
 
389
    """ GTK+ push.
429
390
    
430
 
    Select files from the list of conflicts and run an external utility to
431
 
    resolve them.
432
391
    """
433
392
    def run(self):
434
393
        (wt, path) = workingtree.WorkingTree.open_containing('.')
435
 
        open_display()
 
394
        
 
395
        pygtk = import_pygtk()
 
396
        try:
 
397
            import gtk
 
398
        except RuntimeError, e:
 
399
            if str(e) == "could not open display":
 
400
                raise NoDisplayError
 
401
 
436
402
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
 
403
 
 
404
        set_ui_factory()
437
405
        dialog = ConflictsDialog(wt)
438
406
        dialog.run()
439
407
 
440
408
 
441
 
class cmd_gpreferences(GTKCommand):
 
409
class cmd_gpreferences(Command):
442
410
    """ GTK+ preferences dialog.
443
411
 
444
412
    """
445
413
    def run(self):
446
 
        open_display()
 
414
        pygtk = import_pygtk()
 
415
        try:
 
416
            import gtk
 
417
        except RuntimeError, e:
 
418
            if str(e) == "could not open display":
 
419
                raise NoDisplayError
 
420
 
447
421
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
422
 
 
423
        set_ui_factory()
448
424
        dialog = PreferencesWindow()
449
425
        dialog.run()
450
426
 
451
427
 
 
428
 
452
429
class cmd_gmissing(Command):
453
430
    """ GTK+ missing revisions dialog.
454
431
 
485
462
            local_branch.unlock()
486
463
 
487
464
 
488
 
class cmd_ginit(GTKCommand):
489
 
    def run(self):
490
 
        open_display()
491
 
        from initialize import InitDialog
492
 
        dialog = InitDialog(os.path.abspath(os.path.curdir))
493
 
        dialog.run()
494
 
 
495
 
 
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
465
commands = [
 
466
    cmd_gmissing, 
 
467
    cmd_gpreferences, 
 
468
    cmd_gconflicts, 
 
469
    cmd_gstatus,
 
470
    cmd_gcommit, 
508
471
    cmd_gannotate, 
509
 
    cmd_gbranch,
510
 
    cmd_gcheckout, 
511
 
    cmd_gcommit, 
512
 
    cmd_gconflicts, 
 
472
    cmd_visualise, 
513
473
    cmd_gdiff,
514
 
    cmd_ginit,
515
 
    cmd_gmissing, 
516
 
    cmd_gpreferences, 
517
474
    cmd_gpush, 
518
 
    cmd_gsend,
519
 
    cmd_gstatus,
520
 
    cmd_gtags,
521
 
    cmd_visualise
 
475
    cmd_gcheckout, 
 
476
    cmd_gbranch 
522
477
    ]
523
478
 
524
479
for cmd in commands:
525
480
    register_command(cmd)
526
481
 
527
 
 
528
 
class cmd_commit_notify(GTKCommand):
529
 
    """Run the bzr commit notifier.
530
 
 
531
 
    This is a background program which will pop up a notification on the users
532
 
    screen when a commit occurs.
533
 
    """
534
 
 
535
 
    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
 
 
542
 
        import cgi
543
 
        import dbus
544
 
        import dbus.service
545
 
        import pynotify
546
 
        from bzrlib.bzrdir import BzrDir
547
 
        from bzrlib import errors
548
 
        from bzrlib.osutils import format_date
549
 
        from bzrlib.transport import get_transport
550
 
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
551
 
            import dbus.glib
552
 
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
553
 
        bus = dbus.SessionBus()
554
 
 
555
 
        def catch_branch(revision_id, urls):
556
 
            # TODO: show all the urls, or perhaps choose the 'best'.
557
 
            url = urls[0]
558
 
            try:
559
 
                if isinstance(revision_id, unicode):
560
 
                    revision_id = revision_id.encode('utf8')
561
 
                transport = get_transport(url)
562
 
                a_dir = BzrDir.open_from_transport(transport)
563
 
                branch = a_dir.open_branch()
564
 
                revno = branch.revision_id_to_revno(revision_id)
565
 
                revision = branch.repository.get_revision(revision_id)
566
 
                summary = 'New revision %d in %s' % (revno, url)
567
 
                body  = 'Committer: %s\n' % revision.committer
568
 
                body += 'Date: %s\n' % format_date(revision.timestamp,
569
 
                    revision.timezone)
570
 
                body += '\n'
571
 
                body += revision.message
572
 
                body = cgi.escape(body)
573
 
                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
 
                nw.set_timeout(5000)
586
 
                nw.show()
587
 
            except Exception, e:
588
 
                print e
589
 
                raise
590
 
        bus.add_signal_receiver(catch_branch,
591
 
                                dbus_interface=BROADCAST_INTERFACE,
592
 
                                signal_name="Revision")
593
 
        pynotify.init("bzr commit-notify")
594
 
        gtk.main()
595
 
 
596
 
register_command(cmd_commit_notify)
597
 
 
598
 
 
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
482
import gettext
697
483
gettext.install('olive-gtk')
698
484
 
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
 
 
703
485
class NoDisplayError(BzrCommandError):
704
486
    """gtk could not find a proper display"""
705
487
 
706
488
    def __str__(self):
707
489
        return "No DISPLAY. Unable to run GTK+ application."
708
490
 
709
 
 
710
491
def test_suite():
711
492
    from unittest import TestSuite
712
493
    import tests
714
495
    default_encoding = sys.getdefaultencoding()
715
496
    try:
716
497
        result = TestSuite()
717
 
        try:
718
 
            import_pygtk()
719
 
        except errors.BzrCommandError:
720
 
            return result
721
498
        result.addTest(tests.test_suite())
722
499
    finally:
723
500
        if sys.getdefaultencoding() != default_encoding: