/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-21 00:24:51 UTC
  • Revision ID: jelmer@samba.org-20070321002451-y75m5r289ul1dppb
Don't obtain handle to network manager until it's actually needed.

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.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_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
 
class GTKCommand(Command):
137
 
    """Abstract class providing GTK specific run commands."""
138
 
 
139
 
    def run(self):
140
 
        open_display()
141
 
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
 
        dialog.run()
143
 
 
144
 
 
145
 
class cmd_gbranch(GTKCommand):
 
90
class cmd_gbranch(Command):
146
91
    """GTK+ branching.
147
92
    
148
93
    """
149
94
 
150
 
    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
 
151
103
        from bzrlib.plugins.gtk.branch import BranchDialog
152
 
        return BranchDialog(path)
153
 
 
154
 
 
155
 
class cmd_gcheckout(GTKCommand):
 
104
 
 
105
        set_ui_factory()
 
106
        dialog = BranchDialog(os.path.abspath('.'))
 
107
        dialog.run()
 
108
 
 
109
class cmd_gcheckout(Command):
156
110
    """ GTK+ checkout.
157
111
    
158
112
    """
159
113
    
160
 
    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
 
161
122
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
162
 
        return CheckoutDialog(path)
163
 
 
164
 
 
165
 
 
166
 
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):
167
130
    """ GTK+ push.
168
131
    
169
132
    """
171
134
 
172
135
    def run(self, location="."):
173
136
        (br, path) = branch.Branch.open_containing(location)
174
 
        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
 
175
145
        from push import PushDialog
176
 
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
146
 
 
147
        set_ui_factory()
 
148
        dialog = PushDialog(br)
177
149
        dialog.run()
178
150
 
179
151
 
180
 
 
181
 
class cmd_gdiff(GTKCommand):
 
152
class cmd_gdiff(Command):
182
153
    """Show differences in working tree in a GTK+ Window.
183
154
    
184
155
    Otherwise, all changes for the tree are listed.
196
167
            if revision is not None:
197
168
                if len(revision) == 1:
198
169
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
170
                    revision_id = revision[0].in_history(branch).rev_id
200
171
                    tree2 = branch.repository.revision_tree(revision_id)
201
172
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
173
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
174
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
175
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
176
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
177
            else:
207
178
                tree1 = wt
217
188
                try:
218
189
                    window.set_file(tree_filename)
219
190
                except NoSuchFile:
220
 
                    if (tree1.path2id(tree_filename) is None and 
221
 
                        tree2.path2id(tree_filename) is None):
 
191
                    if (tree1.inventory.path2id(tree_filename) is None and 
 
192
                        tree2.inventory.path2id(tree_filename) is None):
222
193
                        raise NotVersionedError(filename)
223
194
                    raise BzrCommandError('No changes found for file "%s"' % 
224
195
                                          filename)
229
200
            wt.unlock()
230
201
 
231
202
 
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
203
class cmd_visualise(Command):
242
204
    """Graphically visualise this branch.
243
205
 
249
211
    """
250
212
    takes_options = [
251
213
        "revision",
252
 
        Option('limit', "Maximum number of revisions to display.",
 
214
        Option('limit', "maximum number of revisions to display",
253
215
               int, 'count')]
254
 
    takes_args = [ "locations*" ]
 
216
    takes_args = [ "location?" ]
255
217
    aliases = [ "visualize", "vis", "viz" ]
256
218
 
257
 
    def run(self, locations_list, revision=None, limit=None):
 
219
    def run(self, location=".", revision=None, limit=None):
258
220
        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)
 
221
        (br, path) = branch.Branch.open_containing(location)
 
222
        br.lock_read()
 
223
        br.repository.lock_read()
 
224
        try:
264
225
            if revision is None:
265
 
                revids.append(br.last_revision())
 
226
                revid = br.last_revision()
 
227
                if revid is None:
 
228
                    return
266
229
            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()
273
 
 
274
 
 
275
 
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):
276
246
    """GTK+ annotate.
277
247
    
278
248
    Browse changes to FILENAME line by line in a GTK+ window.
280
250
 
281
251
    takes_args = ["filename", "line?"]
282
252
    takes_options = [
283
 
        Option("all", help="Show annotations on all lines."),
284
 
        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"),
285
255
        Option("line", type=int, argname="lineno",
286
 
               help="Jump to specified line number."),
 
256
               help="jump to specified line number"),
287
257
        "revision",
288
258
    ]
289
259
    aliases = ["gblame", "gpraise"]
290
260
    
291
261
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        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()
293
270
 
294
271
        try:
295
272
            line = int(line)
314
291
        if revision is not None:
315
292
            if len(revision) != 1:
316
293
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
294
            revision_id = revision[0].in_history(br).rev_id
318
295
            tree = br.repository.revision_tree(revision_id)
319
296
        else:
320
297
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
298
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
299
        window = GAnnotateWindow(all, plain)
323
300
        window.connect("destroy", lambda w: gtk.main_quit())
 
301
        window.set_title(path + " - gannotate")
324
302
        config = GAnnotateConfig(window)
325
303
        window.show()
326
304
        br.lock_read()
336
314
                wt.unlock()
337
315
 
338
316
 
339
 
 
340
 
class cmd_gcommit(GTKCommand):
 
317
class cmd_gcommit(Command):
341
318
    """GTK+ commit dialog
342
319
 
343
320
    Graphical user interface for committing revisions"""
344
 
 
 
321
    
345
322
    aliases = [ "gci" ]
346
323
    takes_args = []
347
324
    takes_options = []
348
325
 
349
326
    def run(self, filename=None):
350
327
        import os
351
 
        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()
352
337
        from commit import CommitDialog
353
338
        from bzrlib.errors import (BzrCommandError,
354
339
                                   NotBranchError,
359
344
        try:
360
345
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
361
346
            br = wt.branch
 
347
        except NotBranchError, e:
 
348
            path = e.path
362
349
        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()
378
 
 
379
 
 
380
 
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):
381
361
    """GTK+ status dialog
382
362
 
383
363
    Graphical user interface for showing status 
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
        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()
393
381
        from status import StatusDialog
394
382
        (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)
 
383
        status = StatusDialog(wt, wt_path)
406
384
        status.connect("destroy", gtk.main_quit)
407
385
        status.run()
408
386
 
409
387
 
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
 
 
430
 
class cmd_gconflicts(GTKCommand):
431
 
    """GTK+ conflicts.
 
388
class cmd_gconflicts(Command):
 
389
    """ GTK+ push.
432
390
    
433
 
    Select files from the list of conflicts and run an external utility to
434
 
    resolve them.
435
391
    """
436
392
    def run(self):
437
393
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        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
 
439
402
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
 
403
 
 
404
        set_ui_factory()
440
405
        dialog = ConflictsDialog(wt)
441
406
        dialog.run()
442
407
 
443
408
 
444
 
class cmd_gpreferences(GTKCommand):
 
409
class cmd_gpreferences(Command):
445
410
    """ GTK+ preferences dialog.
446
411
 
447
412
    """
448
413
    def run(self):
449
 
        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
 
450
421
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
422
 
 
423
        set_ui_factory()
451
424
        dialog = PreferencesWindow()
452
425
        dialog.run()
453
426
 
454
427
 
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
428
 
478
429
class cmd_gmissing(Command):
479
430
    """ GTK+ missing revisions dialog.
511
462
            local_branch.unlock()
512
463
 
513
464
 
514
 
class cmd_ginit(GTKCommand):
515
 
    def run(self):
516
 
        open_display()
517
 
        from initialize import InitDialog
518
 
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
 
        dialog.run()
520
 
 
521
 
 
522
 
class cmd_gtags(GTKCommand):
523
 
    def run(self):
524
 
        br = branch.Branch.open_containing('.')[0]
525
 
        
526
 
        gtk = open_display()
527
 
        from tags import TagsWindow
528
 
        window = TagsWindow(br)
529
 
        window.show()
530
 
        gtk.main()
531
 
 
532
 
 
533
465
commands = [
 
466
    cmd_gmissing, 
 
467
    cmd_gpreferences, 
 
468
    cmd_gconflicts, 
 
469
    cmd_gstatus,
 
470
    cmd_gcommit, 
534
471
    cmd_gannotate, 
535
 
    cmd_gbranch,
536
 
    cmd_gcheckout, 
537
 
    cmd_gcommit, 
538
 
    cmd_gconflicts, 
 
472
    cmd_visualise, 
539
473
    cmd_gdiff,
540
 
    cmd_ginit,
541
 
    cmd_gmerge,
542
 
    cmd_gmissing, 
543
 
    cmd_gpreferences, 
544
474
    cmd_gpush, 
545
 
    cmd_gsend,
546
 
    cmd_gstatus,
547
 
    cmd_gtags,
548
 
    cmd_visualise
 
475
    cmd_gcheckout, 
 
476
    cmd_gbranch 
549
477
    ]
550
478
 
551
479
for cmd in commands:
552
480
    register_command(cmd)
553
481
 
554
 
 
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):
563
 
        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
569
 
        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
 
 
650
 
 
651
 
 
652
482
import gettext
653
483
gettext.install('olive-gtk')
654
484
 
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
 
 
659
485
class NoDisplayError(BzrCommandError):
660
486
    """gtk could not find a proper display"""
661
487
 
662
488
    def __str__(self):
663
489
        return "No DISPLAY. Unable to run GTK+ application."
664
490
 
665
 
 
666
491
def test_suite():
667
492
    from unittest import TestSuite
668
493
    import tests
670
495
    default_encoding = sys.getdefaultencoding()
671
496
    try:
672
497
        result = TestSuite()
673
 
        try:
674
 
            import_pygtk()
675
 
        except errors.BzrCommandError:
676
 
            return result
677
498
        result.addTest(tests.test_suite())
678
499
    finally:
679
500
        if sys.getdefaultencoding() != default_encoding: