/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: Robert Collins
  • Date: 2007-03-23 12:46:47 UTC
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: robertc@robertcollins.net-20070323124647-207i76uksk65l622
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.

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
""")
84
67
 
85
68
from bzrlib.commands import Command, register_command, display_command
86
69
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
 
70
from bzrlib.commands import Command, register_command
87
71
from bzrlib.option import Option
 
72
from bzrlib.bzrdir import BzrDir
88
73
 
89
74
import os.path
90
75
 
98
83
 
99
84
 
100
85
def set_ui_factory():
101
 
    import_pygtk()
 
86
    pygtk = import_pygtk()
102
87
    from ui import GtkUIFactory
103
88
    import bzrlib.ui
104
89
    bzrlib.ui.ui_factory = GtkUIFactory()
105
90
 
106
91
 
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
92
class GTKCommand(Command):
137
93
    """Abstract class providing GTK specific run commands."""
138
94
 
 
95
    def open_display(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
        set_ui_factory()
 
103
        return gtk
 
104
 
139
105
    def run(self):
140
 
        open_display()
 
106
        self.open_display()
141
107
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
108
        dialog.run()
143
109
 
152
118
        return BranchDialog(path)
153
119
 
154
120
 
 
121
register_command(cmd_gbranch)
 
122
 
155
123
class cmd_gcheckout(GTKCommand):
156
124
    """ GTK+ checkout.
157
125
    
161
129
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
162
130
        return CheckoutDialog(path)
163
131
 
 
132
register_command(cmd_gcheckout)
164
133
 
165
134
 
166
135
class cmd_gpush(GTKCommand):
171
140
 
172
141
    def run(self, location="."):
173
142
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
143
        self.open_display()
175
144
        from push import PushDialog
176
 
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
145
        dialog = PushDialog(br)
177
146
        dialog.run()
178
147
 
 
148
register_command(cmd_gpush)
179
149
 
180
150
 
181
151
class cmd_gdiff(GTKCommand):
196
166
            if revision is not None:
197
167
                if len(revision) == 1:
198
168
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
169
                    revision_id = revision[0].in_history(branch).rev_id
200
170
                    tree2 = branch.repository.revision_tree(revision_id)
201
171
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
172
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
173
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
174
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
175
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
176
            else:
207
177
                tree1 = wt
217
187
                try:
218
188
                    window.set_file(tree_filename)
219
189
                except NoSuchFile:
220
 
                    if (tree1.path2id(tree_filename) is None and 
221
 
                        tree2.path2id(tree_filename) is None):
 
190
                    if (tree1.inventory.path2id(tree_filename) is None and 
 
191
                        tree2.inventory.path2id(tree_filename) is None):
222
192
                        raise NotVersionedError(filename)
223
193
                    raise BzrCommandError('No changes found for file "%s"' % 
224
194
                                          filename)
228
198
        finally:
229
199
            wt.unlock()
230
200
 
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
 
 
 
201
register_command(cmd_gdiff)
240
202
 
241
203
class cmd_visualise(Command):
242
204
    """Graphically visualise this branch.
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()
 
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
register_command(cmd_visualise)
273
246
 
274
247
 
275
248
class cmd_gannotate(GTKCommand):
280
253
 
281
254
    takes_args = ["filename", "line?"]
282
255
    takes_options = [
283
 
        Option("all", help="Show annotations on all lines."),
284
 
        Option("plain", help="Don't highlight annotation lines."),
 
256
        Option("all", help="show annotations on all lines"),
 
257
        Option("plain", help="don't highlight annotation lines"),
285
258
        Option("line", type=int, argname="lineno",
286
 
               help="Jump to specified line number."),
 
259
               help="jump to specified line number"),
287
260
        "revision",
288
261
    ]
289
262
    aliases = ["gblame", "gpraise"]
290
263
    
291
264
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
265
        self.open_display()
293
266
 
294
267
        try:
295
268
            line = int(line)
299
272
 
300
273
        from annotate.gannotate import GAnnotateWindow
301
274
        from annotate.config import GAnnotateConfig
302
 
        from bzrlib.bzrdir import BzrDir
303
275
 
304
276
        wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
305
277
        if wt is not None:
314
286
        if revision is not None:
315
287
            if len(revision) != 1:
316
288
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
289
            revision_id = revision[0].in_history(br).rev_id
318
290
            tree = br.repository.revision_tree(revision_id)
319
291
        else:
320
292
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
293
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
294
        window = GAnnotateWindow(all, plain)
323
295
        window.connect("destroy", lambda w: gtk.main_quit())
 
296
        window.set_title(path + " - gannotate")
324
297
        config = GAnnotateConfig(window)
325
298
        window.show()
326
299
        br.lock_read()
335
308
            if wt is not None:
336
309
                wt.unlock()
337
310
 
 
311
register_command(cmd_gannotate)
338
312
 
339
313
 
340
314
class cmd_gcommit(GTKCommand):
341
315
    """GTK+ commit dialog
342
316
 
343
317
    Graphical user interface for committing revisions"""
344
 
 
 
318
    
345
319
    aliases = [ "gci" ]
346
320
    takes_args = []
347
321
    takes_options = []
348
322
 
349
323
    def run(self, filename=None):
350
324
        import os
351
 
        open_display()
 
325
        self.open_display()
352
326
        from commit import CommitDialog
 
327
        from bzrlib.commit import Commit
353
328
        from bzrlib.errors import (BzrCommandError,
354
329
                                   NotBranchError,
355
 
                                   NoWorkingTree)
 
330
                                   NoWorkingTree,
 
331
                                   PointlessCommit,
 
332
                                   ConflictsInTree,
 
333
                                   StrictCommitFailed)
356
334
 
357
335
        wt = None
358
336
        br = None
359
337
        try:
360
338
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
361
339
            br = wt.branch
 
340
        except NotBranchError, e:
 
341
            path = e.path
362
342
        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()
 
343
            path = e.base
 
344
            try:
 
345
                (br, path) = branch.Branch.open_containing(path)
 
346
            except NotBranchError, e:
 
347
                path = e.path
 
348
 
 
349
 
 
350
        commit = CommitDialog(wt, path, not br)
 
351
        commit.run()
 
352
 
 
353
register_command(cmd_gcommit)
378
354
 
379
355
 
380
356
class cmd_gstatus(GTKCommand):
385
361
    
386
362
    aliases = [ "gst" ]
387
363
    takes_args = ['PATH?']
388
 
    takes_options = ['revision']
 
364
    takes_options = []
389
365
 
390
 
    def run(self, path='.', revision=None):
 
366
    def run(self, path='.'):
391
367
        import os
392
 
        gtk = open_display()
 
368
        self.open_display()
393
369
        from status import StatusDialog
394
370
        (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)
 
371
        status = StatusDialog(wt, wt_path)
406
372
        status.connect("destroy", gtk.main_quit)
407
373
        status.run()
408
374
 
409
 
 
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
 
            
 
375
register_command(cmd_gstatus)
428
376
 
429
377
 
430
378
class cmd_gconflicts(GTKCommand):
431
 
    """GTK+ conflicts.
 
379
    """ GTK+ push.
432
380
    
433
 
    Select files from the list of conflicts and run an external utility to
434
 
    resolve them.
435
381
    """
436
382
    def run(self):
437
383
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
384
        self.open_display()
439
385
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
386
        dialog = ConflictsDialog(wt)
441
387
        dialog.run()
442
388
 
 
389
register_command(cmd_gconflicts)
 
390
 
443
391
 
444
392
class cmd_gpreferences(GTKCommand):
445
393
    """ GTK+ preferences dialog.
446
394
 
447
395
    """
448
396
    def run(self):
449
 
        open_display()
 
397
        self.open_display()
450
398
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
399
        dialog = PreferencesWindow()
452
400
        dialog.run()
453
401
 
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
 
 
477
 
 
478
 
class cmd_gmissing(Command):
479
 
    """ GTK+ missing revisions dialog.
480
 
 
481
 
    """
482
 
    takes_args = ["other_branch?"]
483
 
    def run(self, other_branch=None):
484
 
        pygtk = import_pygtk()
485
 
        try:
486
 
            import gtk
487
 
        except RuntimeError, e:
488
 
            if str(e) == "could not open display":
489
 
                raise NoDisplayError
490
 
 
491
 
        from bzrlib.plugins.gtk.missing import MissingWindow
492
 
        from bzrlib.branch import Branch
493
 
 
494
 
        local_branch = Branch.open_containing(".")[0]
495
 
        if other_branch is None:
496
 
            other_branch = local_branch.get_parent()
497
 
            
498
 
            if other_branch is None:
499
 
                raise errors.BzrCommandError("No peer location known or specified.")
500
 
        remote_branch = Branch.open_containing(other_branch)[0]
501
 
        set_ui_factory()
502
 
        local_branch.lock_read()
503
 
        try:
504
 
            remote_branch.lock_read()
505
 
            try:
506
 
                dialog = MissingWindow(local_branch, remote_branch)
507
 
                dialog.run()
508
 
            finally:
509
 
                remote_branch.unlock()
510
 
        finally:
511
 
            local_branch.unlock()
512
 
 
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
 
 
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,
542
 
    cmd_gmissing, 
543
 
    cmd_gpreferences, 
544
 
    cmd_gpush, 
545
 
    cmd_gsend,
546
 
    cmd_gstatus,
547
 
    cmd_gtags,
548
 
    cmd_visualise
549
 
    ]
550
 
 
551
 
for cmd in commands:
552
 
    register_command(cmd)
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):
 
402
register_command(cmd_gpreferences)
 
403
 
 
404
 
 
405
class cmd_commit_notify(GTKCommand):
 
406
    """Run the bzr commit notifier.
 
407
 
 
408
    This is a background program which will pop up a notification on the users
 
409
    screen when a commit occurs.
 
410
    """
 
411
 
 
412
    def run(self):
 
413
        gtk = self.open_display()
563
414
        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
 
415
        import dbus
 
416
        import dbus.service
569
417
        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
 
 
 
418
        from bzrlib.bzrdir import BzrDir
 
419
        from bzrlib import errors
 
420
        from bzrlib.osutils import format_date
 
421
        from bzrlib.transport import get_transport
 
422
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
423
            import dbus.glib
 
424
        from bzrlib.plugins.dbus import activity
 
425
        bus = dbus.SessionBus()
 
426
        # get the object so we can subscribe to callbacks from it.
 
427
        broadcast_service = bus.get_object(
 
428
            activity.Broadcast.DBUS_NAME,
 
429
            activity.Broadcast.DBUS_PATH)
 
430
        def catch_branch(revision_id, url):
 
431
            try:
 
432
                if isinstance(revision_id, unicode):
 
433
                    revision_id = revision_id.encode('utf8')
 
434
                transport = get_transport(url)
 
435
                try:
 
436
                    transport.local_abspath('.')
 
437
                except errors.TransportNotPossible:
 
438
                    # dont show remote urls for now.
 
439
                    return
 
440
                # here we should:
 
441
                a_dir = BzrDir.open_from_transport(transport)
 
442
                branch = a_dir.open_branch()
 
443
                revno = branch.revision_id_to_revno(revision_id)
 
444
                revision = branch.repository.get_revision(revision_id)
 
445
                summary = 'New revision %d in %s' % (revno, url)
 
446
                body  = 'Committer: %s\n' % revision.committer
 
447
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
448
                    revision.timezone)
 
449
                body += '\n'
 
450
                body += revision.message
 
451
                body = cgi.escape(body)
 
452
                #print repr(body)
 
453
                nw = pynotify.Notification(summary, body)
 
454
                nw.set_timeout(5000)
 
455
                nw.show()
 
456
            except Exception, e:
 
457
                print e
 
458
                raise
 
459
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
460
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
461
        pynotify.init("bzr commit-notify")
 
462
        gtk.main()
 
463
 
 
464
register_command(cmd_commit_notify)
650
465
 
651
466
 
652
467
import gettext
653
468
gettext.install('olive-gtk')
654
469
 
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
470
 
659
471
class NoDisplayError(BzrCommandError):
660
472
    """gtk could not find a proper display"""
670
482
    default_encoding = sys.getdefaultencoding()
671
483
    try:
672
484
        result = TestSuite()
673
 
        try:
674
 
            import_pygtk()
675
 
        except errors.BzrCommandError:
676
 
            return result
677
485
        result.addTest(tests.test_suite())
678
486
    finally:
679
487
        if sys.getdefaultencoding() != default_encoding: