/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

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
 
"""GTK+ frontends to Bazaar commands """
 
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
16
36
 
17
37
import bzrlib
18
38
 
19
 
__version__ = '0.16.0'
20
 
version_info = tuple(int(n) for n in __version__.split('.'))
21
 
 
 
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)
22
48
 
23
49
def check_bzrlib_version(desired):
24
50
    """Check that bzrlib is compatible.
25
51
 
26
52
    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.
30
53
    """
31
 
    desired_plus = (desired[0], desired[1]+1)
32
54
    bzrlib_version = bzrlib.version_info[:2]
33
 
    if bzrlib_version == desired:
34
 
        return
35
55
    try:
36
56
        from bzrlib.trace import warning
37
57
    except ImportError:
38
58
        # get the message out any way we can
39
59
        from warnings import warn as warning
40
60
    if bzrlib_version < desired:
41
 
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
 
61
        from bzrlib.errors import BzrError
 
62
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
42
63
                ' %s.' % (bzrlib.__version__, __version__))
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])
 
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)
54
69
 
55
70
from bzrlib.trace import warning
56
71
if __name__ != 'bzrlib.plugins.gtk':
60
75
lazy_import(globals(), """
61
76
from bzrlib import (
62
77
    branch,
 
78
    builtins,
63
79
    errors,
 
80
    merge_directive,
64
81
    workingtree,
65
82
    )
66
83
""")
87
104
    bzrlib.ui.ui_factory = GtkUIFactory()
88
105
 
89
106
 
90
 
class cmd_gbranch(Command):
 
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):
91
146
    """GTK+ branching.
92
147
    
93
148
    """
94
149
 
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
 
 
 
150
    def get_gtk_dialog(self, path):
103
151
        from bzrlib.plugins.gtk.branch import BranchDialog
104
 
 
105
 
        set_ui_factory()
106
 
        dialog = BranchDialog(os.path.abspath('.'))
107
 
        dialog.run()
108
 
 
109
 
class cmd_gcheckout(Command):
 
152
        return BranchDialog(path)
 
153
 
 
154
 
 
155
class cmd_gcheckout(GTKCommand):
110
156
    """ GTK+ checkout.
111
157
    
112
158
    """
113
159
    
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
 
 
 
160
    def get_gtk_dialog(self, path):
122
161
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
123
 
 
124
 
        set_ui_factory()
125
 
        dialog = CheckoutDialog(os.path.abspath('.'))
126
 
        dialog.run()
127
 
 
128
 
 
129
 
class cmd_gpush(Command):
 
162
        return CheckoutDialog(path)
 
163
 
 
164
 
 
165
 
 
166
class cmd_gpush(GTKCommand):
130
167
    """ GTK+ push.
131
168
    
132
169
    """
134
171
 
135
172
    def run(self, location="."):
136
173
        (br, path) = branch.Branch.open_containing(location)
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
 
 
 
174
        open_display()
145
175
        from push import PushDialog
146
 
 
147
 
        set_ui_factory()
148
 
        dialog = PushDialog(br)
 
176
        dialog = PushDialog(br.repository, br.last_revision(), br)
149
177
        dialog.run()
150
178
 
151
179
 
152
 
class cmd_gdiff(Command):
 
180
 
 
181
class cmd_gdiff(GTKCommand):
153
182
    """Show differences in working tree in a GTK+ Window.
154
183
    
155
184
    Otherwise, all changes for the tree are listed.
167
196
            if revision is not None:
168
197
                if len(revision) == 1:
169
198
                    tree1 = wt
170
 
                    revision_id = revision[0].in_history(branch).rev_id
 
199
                    revision_id = revision[0].as_revision_id(tree1.branch)
171
200
                    tree2 = branch.repository.revision_tree(revision_id)
172
201
                elif len(revision) == 2:
173
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
202
                    revision_id_0 = revision[0].as_revision_id(branch)
174
203
                    tree2 = branch.repository.revision_tree(revision_id_0)
175
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
204
                    revision_id_1 = revision[1].as_revision_id(branch)
176
205
                    tree1 = branch.repository.revision_tree(revision_id_1)
177
206
            else:
178
207
                tree1 = wt
188
217
                try:
189
218
                    window.set_file(tree_filename)
190
219
                except NoSuchFile:
191
 
                    if (tree1.inventory.path2id(tree_filename) is None and 
192
 
                        tree2.inventory.path2id(tree_filename) is None):
 
220
                    if (tree1.path2id(tree_filename) is None and 
 
221
                        tree2.path2id(tree_filename) is None):
193
222
                        raise NotVersionedError(filename)
194
223
                    raise BzrCommandError('No changes found for file "%s"' % 
195
224
                                          filename)
200
229
            wt.unlock()
201
230
 
202
231
 
 
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
 
203
241
class cmd_visualise(Command):
204
242
    """Graphically visualise this branch.
205
243
 
211
249
    """
212
250
    takes_options = [
213
251
        "revision",
214
 
        Option('limit', "maximum number of revisions to display",
 
252
        Option('limit', "Maximum number of revisions to display.",
215
253
               int, 'count')]
216
 
    takes_args = [ "location?" ]
 
254
    takes_args = [ "locations*" ]
217
255
    aliases = [ "visualize", "vis", "viz" ]
218
256
 
219
 
    def run(self, location=".", revision=None, limit=None):
 
257
    def run(self, locations_list, revision=None, limit=None):
220
258
        set_ui_factory()
221
 
        (br, path) = branch.Branch.open_containing(location)
222
 
        br.lock_read()
223
 
        br.repository.lock_read()
224
 
        try:
 
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)
225
264
            if revision is None:
226
 
                revid = br.last_revision()
227
 
                if revid is None:
228
 
                    return
 
265
                revids.append(br.last_revision())
229
266
            else:
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):
 
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):
246
276
    """GTK+ annotate.
247
277
    
248
278
    Browse changes to FILENAME line by line in a GTK+ window.
250
280
 
251
281
    takes_args = ["filename", "line?"]
252
282
    takes_options = [
253
 
        Option("all", help="show annotations on all lines"),
254
 
        Option("plain", help="don't highlight annotation lines"),
 
283
        Option("all", help="Show annotations on all lines."),
 
284
        Option("plain", help="Don't highlight annotation lines."),
255
285
        Option("line", type=int, argname="lineno",
256
 
               help="jump to specified line number"),
 
286
               help="Jump to specified line number."),
257
287
        "revision",
258
288
    ]
259
289
    aliases = ["gblame", "gpraise"]
260
290
    
261
291
    def run(self, filename, all=False, plain=False, line='1', revision=None):
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()
 
292
        gtk = open_display()
270
293
 
271
294
        try:
272
295
            line = int(line)
291
314
        if revision is not None:
292
315
            if len(revision) != 1:
293
316
                raise BzrCommandError("Only 1 revion may be specified.")
294
 
            revision_id = revision[0].in_history(br).rev_id
 
317
            revision_id = revision[0].as_revision_id(br)
295
318
            tree = br.repository.revision_tree(revision_id)
296
319
        else:
297
320
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
298
321
 
299
 
        window = GAnnotateWindow(all, plain)
 
322
        window = GAnnotateWindow(all, plain, branch=br)
300
323
        window.connect("destroy", lambda w: gtk.main_quit())
301
 
        window.set_title(path + " - gannotate")
302
324
        config = GAnnotateConfig(window)
303
325
        window.show()
304
326
        br.lock_read()
314
336
                wt.unlock()
315
337
 
316
338
 
317
 
class cmd_gcommit(Command):
 
339
 
 
340
class cmd_gcommit(GTKCommand):
318
341
    """GTK+ commit dialog
319
342
 
320
343
    Graphical user interface for committing revisions"""
321
 
    
 
344
 
322
345
    aliases = [ "gci" ]
323
346
    takes_args = []
324
347
    takes_options = []
325
348
 
326
349
    def run(self, filename=None):
327
350
        import os
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()
 
351
        open_display()
337
352
        from commit import CommitDialog
338
353
        from bzrlib.errors import (BzrCommandError,
339
354
                                   NotBranchError,
344
359
        try:
345
360
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
346
361
            br = wt.branch
347
 
        except NotBranchError, e:
348
 
            path = e.path
349
362
        except NoWorkingTree, e:
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):
 
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):
361
381
    """GTK+ status dialog
362
382
 
363
383
    Graphical user interface for showing status 
365
385
    
366
386
    aliases = [ "gst" ]
367
387
    takes_args = ['PATH?']
368
 
    takes_options = []
 
388
    takes_options = ['revision']
369
389
 
370
 
    def run(self, path='.'):
 
390
    def run(self, path='.', revision=None):
371
391
        import os
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()
 
392
        gtk = open_display()
381
393
        from status import StatusDialog
382
394
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
383
 
        status = StatusDialog(wt, wt_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)
384
406
        status.connect("destroy", gtk.main_quit)
385
407
        status.run()
386
408
 
387
409
 
388
 
class cmd_gconflicts(Command):
389
 
    """ GTK+ push.
 
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.
390
432
    
 
433
    Select files from the list of conflicts and run an external utility to
 
434
    resolve them.
391
435
    """
392
436
    def run(self):
393
437
        (wt, path) = workingtree.WorkingTree.open_containing('.')
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
 
 
 
438
        open_display()
402
439
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
403
 
 
404
 
        set_ui_factory()
405
440
        dialog = ConflictsDialog(wt)
406
441
        dialog.run()
407
442
 
408
443
 
409
 
class cmd_gpreferences(Command):
 
444
class cmd_gpreferences(GTKCommand):
410
445
    """ GTK+ preferences dialog.
411
446
 
412
447
    """
413
448
    def run(self):
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
 
 
 
449
        open_display()
421
450
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
422
 
 
423
 
        set_ui_factory()
424
451
        dialog = PreferencesWindow()
425
452
        dialog.run()
426
453
 
427
454
 
 
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
 
428
477
 
429
478
class cmd_gmissing(Command):
430
479
    """ GTK+ missing revisions dialog.
462
511
            local_branch.unlock()
463
512
 
464
513
 
 
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
 
465
533
commands = [
 
534
    cmd_gannotate, 
 
535
    cmd_gbranch,
 
536
    cmd_gcheckout, 
 
537
    cmd_gcommit, 
 
538
    cmd_gconflicts, 
 
539
    cmd_gdiff,
 
540
    cmd_ginit,
 
541
    cmd_gmerge,
466
542
    cmd_gmissing, 
467
543
    cmd_gpreferences, 
468
 
    cmd_gconflicts, 
 
544
    cmd_gpush, 
 
545
    cmd_gsend,
469
546
    cmd_gstatus,
470
 
    cmd_gcommit, 
471
 
    cmd_gannotate, 
472
 
    cmd_visualise, 
473
 
    cmd_gdiff,
474
 
    cmd_gpush, 
475
 
    cmd_gcheckout, 
476
 
    cmd_gbranch 
 
547
    cmd_gtags,
 
548
    cmd_visualise
477
549
    ]
478
550
 
479
551
for cmd in commands:
480
552
    register_command(cmd)
481
553
 
 
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
 
482
652
import gettext
483
653
gettext.install('olive-gtk')
484
654
 
 
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
 
485
659
class NoDisplayError(BzrCommandError):
486
660
    """gtk could not find a proper display"""
487
661
 
488
662
    def __str__(self):
489
663
        return "No DISPLAY. Unable to run GTK+ application."
490
664
 
 
665
 
491
666
def test_suite():
492
667
    from unittest import TestSuite
493
668
    import tests
495
670
    default_encoding = sys.getdefaultencoding()
496
671
    try:
497
672
        result = TestSuite()
 
673
        try:
 
674
            import_pygtk()
 
675
        except errors.BzrCommandError:
 
676
            return result
498
677
        result.addTest(tests.test_suite())
499
678
    finally:
500
679
        if sys.getdefaultencoding() != default_encoding: