/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: 2008-06-29 19:07:23 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629190723-l8mzg9x4oec0lhsl
Return cleartext from seahorse module

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
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
16
36
 
17
37
import bzrlib
18
38
 
19
 
__version__ = '0.17.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
 
 
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
 
90
133
class GTKCommand(Command):
91
134
    """Abstract class providing GTK specific run commands."""
92
135
 
93
 
    def open_display(self):
94
 
        pygtk = import_pygtk()
95
 
        try:
96
 
            import gtk
97
 
        except RuntimeError, e:
98
 
            if str(e) == "could not open display":
99
 
                raise NoDisplayError
100
 
        set_ui_factory()
101
 
        return gtk
102
 
 
103
136
    def run(self):
104
 
        self.open_display()
 
137
        open_display()
105
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
106
139
        dialog.run()
107
140
 
135
168
 
136
169
    def run(self, location="."):
137
170
        (br, path) = branch.Branch.open_containing(location)
138
 
        self.open_display()
 
171
        open_display()
139
172
        from push import PushDialog
140
 
        dialog = PushDialog(br)
 
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
141
174
        dialog.run()
142
175
 
143
176
 
160
193
            if revision is not None:
161
194
                if len(revision) == 1:
162
195
                    tree1 = wt
163
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
164
197
                    tree2 = branch.repository.revision_tree(revision_id)
165
198
                elif len(revision) == 2:
166
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
167
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
168
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
169
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
170
203
            else:
171
204
                tree1 = wt
193
226
            wt.unlock()
194
227
 
195
228
 
 
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
 
196
238
class cmd_visualise(Command):
197
239
    """Graphically visualise this branch.
198
240
 
204
246
    """
205
247
    takes_options = [
206
248
        "revision",
207
 
        Option('limit', "maximum number of revisions to display",
 
249
        Option('limit', "Maximum number of revisions to display.",
208
250
               int, 'count')]
209
 
    takes_args = [ "location?" ]
 
251
    takes_args = [ "locations*" ]
210
252
    aliases = [ "visualize", "vis", "viz" ]
211
253
 
212
 
    def run(self, location=".", revision=None, limit=None):
 
254
    def run(self, locations_list, revision=None, limit=None):
213
255
        set_ui_factory()
214
 
        (br, path) = branch.Branch.open_containing(location)
215
 
        br.lock_read()
216
 
        br.repository.lock_read()
217
 
        try:
 
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)
218
261
            if revision is None:
219
 
                revid = br.last_revision()
220
 
                if revid is None:
221
 
                    return
 
262
                revids.append(br.last_revision())
222
263
            else:
223
 
                (revno, revid) = revision[0].in_history(br)
224
 
 
225
 
            from viz.branchwin import BranchWindow
226
 
            import gtk
227
 
                
228
 
            pp = BranchWindow()
229
 
            pp.set_branch(br, revid, limit)
230
 
            pp.connect("destroy", lambda w: gtk.main_quit())
231
 
            pp.show()
232
 
            gtk.main()
233
 
        finally:
234
 
            br.repository.unlock()
235
 
            br.unlock()
 
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()
236
270
 
237
271
 
238
272
class cmd_gannotate(GTKCommand):
243
277
 
244
278
    takes_args = ["filename", "line?"]
245
279
    takes_options = [
246
 
        Option("all", help="show annotations on all lines"),
247
 
        Option("plain", help="don't highlight annotation lines"),
 
280
        Option("all", help="Show annotations on all lines."),
 
281
        Option("plain", help="Don't highlight annotation lines."),
248
282
        Option("line", type=int, argname="lineno",
249
 
               help="jump to specified line number"),
 
283
               help="Jump to specified line number."),
250
284
        "revision",
251
285
    ]
252
286
    aliases = ["gblame", "gpraise"]
253
287
    
254
288
    def run(self, filename, all=False, plain=False, line='1', revision=None):
255
 
        gtk = self.open_display()
 
289
        gtk = open_display()
256
290
 
257
291
        try:
258
292
            line = int(line)
277
311
        if revision is not None:
278
312
            if len(revision) != 1:
279
313
                raise BzrCommandError("Only 1 revion may be specified.")
280
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
281
315
            tree = br.repository.revision_tree(revision_id)
282
316
        else:
283
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
284
318
 
285
 
        window = GAnnotateWindow(all, plain)
 
319
        window = GAnnotateWindow(all, plain, branch=br)
286
320
        window.connect("destroy", lambda w: gtk.main_quit())
287
 
        window.set_title(path + " - gannotate")
288
321
        config = GAnnotateConfig(window)
289
322
        window.show()
290
323
        br.lock_read()
305
338
    """GTK+ commit dialog
306
339
 
307
340
    Graphical user interface for committing revisions"""
308
 
    
 
341
 
309
342
    aliases = [ "gci" ]
310
343
    takes_args = []
311
344
    takes_options = []
312
345
 
313
346
    def run(self, filename=None):
314
347
        import os
315
 
        self.open_display()
 
348
        open_display()
316
349
        from commit import CommitDialog
317
350
        from bzrlib.errors import (BzrCommandError,
318
351
                                   NotBranchError,
324
357
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
325
358
            br = wt.branch
326
359
        except NoWorkingTree, e:
327
 
            path = e.base
328
 
            (br, path) = branch.Branch.open_containing(path)
329
 
 
330
 
        commit = CommitDialog(wt, path, not br)
331
 
        commit.run()
332
 
 
 
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()
333
375
 
334
376
 
335
377
class cmd_gstatus(GTKCommand):
340
382
    
341
383
    aliases = [ "gst" ]
342
384
    takes_args = ['PATH?']
343
 
    takes_options = []
 
385
    takes_options = ['revision']
344
386
 
345
 
    def run(self, path='.'):
 
387
    def run(self, path='.', revision=None):
346
388
        import os
347
 
        gtk = self.open_display()
 
389
        gtk = open_display()
348
390
        from status import StatusDialog
349
391
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
350
 
        status = StatusDialog(wt, wt_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)
351
403
        status.connect("destroy", gtk.main_quit)
352
404
        status.run()
353
405
 
354
406
 
 
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
 
355
426
 
356
427
class cmd_gconflicts(GTKCommand):
357
 
    """ GTK+ push.
 
428
    """GTK+ conflicts.
358
429
    
 
430
    Select files from the list of conflicts and run an external utility to
 
431
    resolve them.
359
432
    """
360
433
    def run(self):
361
434
        (wt, path) = workingtree.WorkingTree.open_containing('.')
362
 
        self.open_display()
 
435
        open_display()
363
436
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
364
437
        dialog = ConflictsDialog(wt)
365
438
        dialog.run()
366
439
 
367
440
 
368
 
 
369
441
class cmd_gpreferences(GTKCommand):
370
442
    """ GTK+ preferences dialog.
371
443
 
372
444
    """
373
445
    def run(self):
374
 
        self.open_display()
 
446
        open_display()
375
447
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
376
448
        dialog = PreferencesWindow()
377
449
        dialog.run()
378
450
 
379
451
 
380
 
 
381
452
class cmd_gmissing(Command):
382
453
    """ GTK+ missing revisions dialog.
383
454
 
416
487
 
417
488
class cmd_ginit(GTKCommand):
418
489
    def run(self):
419
 
        self.open_display()
 
490
        open_display()
420
491
        from initialize import InitDialog
421
492
        dialog = InitDialog(os.path.abspath(os.path.curdir))
422
493
        dialog.run()
426
497
    def run(self):
427
498
        br = branch.Branch.open_containing('.')[0]
428
499
        
429
 
        gtk = self.open_display()
 
500
        gtk = open_display()
430
501
        from tags import TagsWindow
431
502
        window = TagsWindow(br)
432
503
        window.show()
434
505
 
435
506
 
436
507
commands = [
 
508
    cmd_gannotate, 
 
509
    cmd_gbranch,
 
510
    cmd_gcheckout, 
 
511
    cmd_gcommit, 
 
512
    cmd_gconflicts, 
 
513
    cmd_gdiff,
 
514
    cmd_ginit,
437
515
    cmd_gmissing, 
438
516
    cmd_gpreferences, 
439
 
    cmd_gconflicts, 
 
517
    cmd_gpush, 
 
518
    cmd_gsend,
440
519
    cmd_gstatus,
441
 
    cmd_gcommit, 
442
 
    cmd_gannotate, 
443
 
    cmd_visualise, 
444
 
    cmd_gdiff,
445
 
    cmd_gpush, 
446
 
    cmd_gcheckout, 
447
 
    cmd_gbranch,
448
 
    cmd_ginit,
449
 
    cmd_gtags
 
520
    cmd_gtags,
 
521
    cmd_visualise
450
522
    ]
451
523
 
452
524
for cmd in commands:
461
533
    """
462
534
 
463
535
    def run(self):
464
 
        gtk = self.open_display()
 
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
 
465
542
        import cgi
466
543
        import dbus
467
544
        import dbus.service
472
549
        from bzrlib.transport import get_transport
473
550
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
474
551
            import dbus.glib
475
 
        from bzrlib.plugins.dbus import activity
 
552
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
476
553
        bus = dbus.SessionBus()
477
 
        # get the object so we can subscribe to callbacks from it.
478
 
        broadcast_service = bus.get_object(
479
 
            activity.Broadcast.DBUS_NAME,
480
 
            activity.Broadcast.DBUS_PATH)
 
554
 
481
555
        def catch_branch(revision_id, urls):
482
556
            # TODO: show all the urls, or perhaps choose the 'best'.
483
557
            url = urls[0]
497
571
                body += revision.message
498
572
                body = cgi.escape(body)
499
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)
500
585
                nw.set_timeout(5000)
501
586
                nw.show()
502
587
            except Exception, e:
503
588
                print e
504
589
                raise
505
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
506
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
590
        bus.add_signal_receiver(catch_branch,
 
591
                                dbus_interface=BROADCAST_INTERFACE,
 
592
                                signal_name="Revision")
507
593
        pynotify.init("bzr commit-notify")
508
594
        gtk.main()
509
595
 
510
596
register_command(cmd_commit_notify)
511
597
 
512
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
 
513
696
import gettext
514
697
gettext.install('olive-gtk')
515
698
 
 
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
516
702
 
517
703
class NoDisplayError(BzrCommandError):
518
704
    """gtk could not find a proper display"""
528
714
    default_encoding = sys.getdefaultencoding()
529
715
    try:
530
716
        result = TestSuite()
 
717
        try:
 
718
            import_pygtk()
 
719
        except errors.BzrCommandError:
 
720
            return result
531
721
        result.addTest(tests.test_suite())
532
722
    finally:
533
723
        if sys.getdefaultencoding() != default_encoding: