/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-06-10 15:50:23 UTC
  • mfrom: (195.1.26 browse-remote-branches)
  • Revision ID: szilveszter.farkas@gmail.com-20070610155023-o3moy5a3wrp9o412
Merge browse-remote-branches branch (experimental).

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
12
12
# along with this program; if not, write to the Free Software
13
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
14
14
 
15
 
"""Graphical support for Bazaar using GTK.
16
 
 
17
 
This plugin includes:
18
 
commit-notify     Start the graphical notifier of commits.
19
 
gannotate         GTK+ annotate. 
20
 
gbranch           GTK+ branching. 
21
 
gcheckout         GTK+ checkout. 
22
 
gcommit           GTK+ commit dialog.
23
 
gconflicts        GTK+ conflicts. 
24
 
gdiff             Show differences in working tree in a GTK+ Window. 
25
 
ghandle-patch     Display and optionally merge a merge directive or patch.
26
 
ginit             Initialise a new branch.
27
 
gmissing          GTK+ missing revisions dialog. 
28
 
gpreferences      GTK+ preferences dialog. 
29
 
gpush             GTK+ push.
30
 
gsend             GTK+ send merge directive.
31
 
gstatus           GTK+ status dialog.
32
 
gtags             Manage branch tags.
33
 
visualise         Graphically visualise this branch. 
34
 
"""
35
 
 
36
 
import sys
 
15
"""GTK+ frontends to Bazaar commands """
37
16
 
38
17
import bzrlib
39
18
 
40
 
version_info = (0, 94, 0, 'rc', 1)
41
 
 
42
 
if version_info[3] == 'final':
43
 
    version_string = '%d.%d.%d' % version_info[:3]
44
 
else:
45
 
    version_string = '%d.%d.%d%s%d' % version_info
46
 
__version__ = version_string
47
 
 
48
 
required_bzrlib = (1, 3)
 
19
__version__ = '0.17.0'
 
20
version_info = tuple(int(n) for n in __version__.split('.'))
 
21
 
49
22
 
50
23
def check_bzrlib_version(desired):
51
24
    """Check that bzrlib is compatible.
52
25
 
53
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.
54
30
    """
 
31
    desired_plus = (desired[0], desired[1]+1)
55
32
    bzrlib_version = bzrlib.version_info[:2]
 
33
    if bzrlib_version == desired:
 
34
        return
56
35
    try:
57
36
        from bzrlib.trace import warning
58
37
    except ImportError:
59
38
        # get the message out any way we can
60
39
        from warnings import warn as warning
61
40
    if bzrlib_version < desired:
62
 
        from bzrlib.errors import BzrError
63
 
        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'
64
42
                ' %s.' % (bzrlib.__version__, __version__))
65
 
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
66
 
 
67
 
 
68
 
if version_info[2] == "final":
69
 
    check_bzrlib_version(required_bzrlib)
 
43
        raise BzrError('Version mismatch: %r' % version_info)
 
44
    else:
 
45
        warning('bzr-gtk is not up to date with installed bzr version %s.'
 
46
                ' \nThere should be a newer version available, e.g. %i.%i.' 
 
47
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
 
48
        if bzrlib_version != desired_plus:
 
49
            raise Exception, 'Version mismatch'
 
50
 
 
51
 
 
52
check_bzrlib_version(version_info[:2])
70
53
 
71
54
from bzrlib.trace import warning
72
55
if __name__ != 'bzrlib.plugins.gtk':
76
59
lazy_import(globals(), """
77
60
from bzrlib import (
78
61
    branch,
79
 
    builtins,
80
62
    errors,
81
 
    merge_directive,
82
63
    workingtree,
83
64
    )
84
65
""")
105
86
    bzrlib.ui.ui_factory = GtkUIFactory()
106
87
 
107
88
 
108
 
def data_path():
109
 
    return os.path.dirname(__file__)
110
 
 
111
 
 
112
 
def icon_path(*args):
113
 
    basedirs = [os.path.join(data_path()),
114
 
             "/usr/share/bzr-gtk", 
115
 
             "/usr/local/share/bzr-gtk"]
116
 
    for basedir in basedirs:
117
 
        path = os.path.join(basedir, 'icons', *args)
118
 
        if os.path.exists(path):
119
 
            return path
120
 
    return None
121
 
 
122
 
 
123
89
class GTKCommand(Command):
124
90
    """Abstract class providing GTK specific run commands."""
125
91
 
170
136
        (br, path) = branch.Branch.open_containing(location)
171
137
        self.open_display()
172
138
        from push import PushDialog
173
 
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
139
        dialog = PushDialog(br)
174
140
        dialog.run()
175
141
 
176
142
 
226
192
            wt.unlock()
227
193
 
228
194
 
229
 
def start_viz_window(branch, revisions, limit=None):
230
 
    """Start viz on branch with revision revision.
231
 
    
232
 
    :return: The viz window object.
233
 
    """
234
 
    from viz import BranchWindow
235
 
    return BranchWindow(branch, revisions, limit)
236
 
 
237
 
 
238
195
class cmd_visualise(Command):
239
196
    """Graphically visualise this branch.
240
197
 
246
203
    """
247
204
    takes_options = [
248
205
        "revision",
249
 
        Option('limit', "Maximum number of revisions to display.",
 
206
        Option('limit', "maximum number of revisions to display",
250
207
               int, 'count')]
251
 
    takes_args = [ "locations*" ]
 
208
    takes_args = [ "location?" ]
252
209
    aliases = [ "visualize", "vis", "viz" ]
253
210
 
254
 
    def run(self, locations_list, revision=None, limit=None):
 
211
    def run(self, location=".", revision=None, limit=None):
255
212
        set_ui_factory()
256
 
        if locations_list is None:
257
 
            locations_list = ["."]
258
 
        revids = []
259
 
        for location in locations_list:
260
 
            (br, path) = branch.Branch.open_containing(location)
 
213
        (br, path) = branch.Branch.open_containing(location)
 
214
        br.lock_read()
 
215
        br.repository.lock_read()
 
216
        try:
261
217
            if revision is None:
262
 
                revids.append(br.last_revision())
 
218
                revid = br.last_revision()
 
219
                if revid is None:
 
220
                    return
263
221
            else:
264
222
                (revno, revid) = revision[0].in_history(br)
265
 
                revids.append(revid)
266
 
        import gtk
267
 
        pp = start_viz_window(br, revids, limit)
268
 
        pp.connect("destroy", lambda w: gtk.main_quit())
269
 
        pp.show()
270
 
        gtk.main()
 
223
 
 
224
            from viz.branchwin import BranchWindow
 
225
            import gtk
 
226
                
 
227
            pp = BranchWindow()
 
228
            pp.set_branch(br, revid, limit)
 
229
            pp.connect("destroy", lambda w: gtk.main_quit())
 
230
            pp.show()
 
231
            gtk.main()
 
232
        finally:
 
233
            br.repository.unlock()
 
234
            br.unlock()
271
235
 
272
236
 
273
237
class cmd_gannotate(GTKCommand):
278
242
 
279
243
    takes_args = ["filename", "line?"]
280
244
    takes_options = [
281
 
        Option("all", help="Show annotations on all lines."),
282
 
        Option("plain", help="Don't highlight annotation lines."),
 
245
        Option("all", help="show annotations on all lines"),
 
246
        Option("plain", help="don't highlight annotation lines"),
283
247
        Option("line", type=int, argname="lineno",
284
 
               help="Jump to specified line number."),
 
248
               help="jump to specified line number"),
285
249
        "revision",
286
250
    ]
287
251
    aliases = ["gblame", "gpraise"]
319
283
 
320
284
        window = GAnnotateWindow(all, plain)
321
285
        window.connect("destroy", lambda w: gtk.main_quit())
 
286
        window.set_title(path + " - gannotate")
322
287
        config = GAnnotateConfig(window)
323
288
        window.show()
324
289
        br.lock_read()
339
304
    """GTK+ commit dialog
340
305
 
341
306
    Graphical user interface for committing revisions"""
342
 
 
 
307
    
343
308
    aliases = [ "gci" ]
344
309
    takes_args = []
345
310
    takes_options = []
358
323
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
359
324
            br = wt.branch
360
325
        except NoWorkingTree, e:
361
 
            from dialog import error_dialog
362
 
            error_dialog(_i18n('Directory does not have a working tree'),
363
 
                         _i18n('Operation aborted.'))
364
 
            return 1 # should this be retval=3?
365
 
 
366
 
        # It is a good habit to keep things locked for the duration, but it
367
 
        # could cause difficulties if someone wants to do things in another
368
 
        # window... We could lock_read() until we actually go to commit
369
 
        # changes... Just a thought.
370
 
        wt.lock_write()
371
 
        try:
372
 
            dlg = CommitDialog(wt)
373
 
            return dlg.run()
374
 
        finally:
375
 
            wt.unlock()
 
326
            path = e.base
 
327
            (br, path) = branch.Branch.open_containing(path)
 
328
 
 
329
        commit = CommitDialog(wt, path, not br)
 
330
        commit.run()
 
331
 
376
332
 
377
333
 
378
334
class cmd_gstatus(GTKCommand):
383
339
    
384
340
    aliases = [ "gst" ]
385
341
    takes_args = ['PATH?']
386
 
    takes_options = ['revision']
 
342
    takes_options = []
387
343
 
388
 
    def run(self, path='.', revision=None):
 
344
    def run(self, path='.'):
389
345
        import os
390
346
        gtk = self.open_display()
391
347
        from status import StatusDialog
392
348
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
393
 
        
394
 
        if revision is not None:
395
 
            try:
396
 
                revision_id = revision[0].in_history(wt.branch).rev_id
397
 
            except:
398
 
                from bzrlib.errors import BzrError
399
 
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
400
 
        else:
401
 
            revision_id = None
402
 
 
403
 
        status = StatusDialog(wt, wt_path, revision_id)
 
349
        status = StatusDialog(wt, wt_path)
404
350
        status.connect("destroy", gtk.main_quit)
405
351
        status.run()
406
352
 
407
353
 
408
 
class cmd_gsend(GTKCommand):
409
 
    """GTK+ send merge directive.
410
 
 
411
 
    """
412
 
    def run(self):
413
 
        (br, path) = branch.Branch.open_containing(".")
414
 
        gtk = self.open_display()
415
 
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
416
 
        from StringIO import StringIO
417
 
        dialog = SendMergeDirectiveDialog(br)
418
 
        if dialog.run() == gtk.RESPONSE_OK:
419
 
            outf = StringIO()
420
 
            outf.writelines(dialog.get_merge_directive().to_lines())
421
 
            mail_client = br.get_config().get_mail_client()
422
 
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
423
 
                outf.getvalue())
424
 
 
425
 
            
426
 
 
427
354
 
428
355
class cmd_gconflicts(GTKCommand):
429
 
    """GTK+ conflicts.
 
356
    """ GTK+ push.
430
357
    
431
 
    Select files from the list of conflicts and run an external utility to
432
 
    resolve them.
433
358
    """
434
359
    def run(self):
435
360
        (wt, path) = workingtree.WorkingTree.open_containing('.')
439
364
        dialog.run()
440
365
 
441
366
 
 
367
 
442
368
class cmd_gpreferences(GTKCommand):
443
369
    """ GTK+ preferences dialog.
444
370
 
450
376
        dialog.run()
451
377
 
452
378
 
 
379
 
453
380
class cmd_gmissing(Command):
454
381
    """ GTK+ missing revisions dialog.
455
382
 
506
433
 
507
434
 
508
435
commands = [
 
436
    cmd_gmissing, 
 
437
    cmd_gpreferences, 
 
438
    cmd_gconflicts, 
 
439
    cmd_gstatus,
 
440
    cmd_gcommit, 
509
441
    cmd_gannotate, 
 
442
    cmd_visualise, 
 
443
    cmd_gdiff,
 
444
    cmd_gpush, 
 
445
    cmd_gcheckout, 
510
446
    cmd_gbranch,
511
 
    cmd_gcheckout, 
512
 
    cmd_gcommit, 
513
 
    cmd_gconflicts, 
514
 
    cmd_gdiff,
515
447
    cmd_ginit,
516
 
    cmd_gmissing, 
517
 
    cmd_gpreferences, 
518
 
    cmd_gpush, 
519
 
    cmd_gsend,
520
 
    cmd_gstatus,
521
 
    cmd_gtags,
522
 
    cmd_visualise
 
448
    cmd_gtags
523
449
    ]
524
450
 
525
451
for cmd in commands:
534
460
    """
535
461
 
536
462
    def run(self):
537
 
        from notify import NotifyPopupMenu
538
463
        gtk = self.open_display()
539
 
        menu = NotifyPopupMenu()
540
 
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
541
 
        icon.connect('popup-menu', menu.display)
542
 
 
543
464
        import cgi
544
465
        import dbus
545
466
        import dbus.service
550
471
        from bzrlib.transport import get_transport
551
472
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
552
473
            import dbus.glib
553
 
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
 
474
        from bzrlib.plugins.dbus import activity
554
475
        bus = dbus.SessionBus()
555
 
 
 
476
        # get the object so we can subscribe to callbacks from it.
 
477
        broadcast_service = bus.get_object(
 
478
            activity.Broadcast.DBUS_NAME,
 
479
            activity.Broadcast.DBUS_PATH)
556
480
        def catch_branch(revision_id, urls):
557
481
            # TODO: show all the urls, or perhaps choose the 'best'.
558
482
            url = urls[0]
572
496
                body += revision.message
573
497
                body = cgi.escape(body)
574
498
                nw = pynotify.Notification(summary, body)
575
 
                def start_viz(notification=None, action=None, data=None):
576
 
                    """Start the viz program."""
577
 
                    pp = start_viz_window(branch, revision_id)
578
 
                    pp.show()
579
 
                def start_branch(notification=None, action=None, data=None):
580
 
                    """Start a Branch dialog"""
581
 
                    from bzrlib.plugins.gtk.branch import BranchDialog
582
 
                    bd = BranchDialog(remote_path=url)
583
 
                    bd.run()
584
 
                nw.add_action("inspect", "Inspect", start_viz, None)
585
 
                nw.add_action("branch", "Branch", start_branch, None)
586
499
                nw.set_timeout(5000)
587
500
                nw.show()
588
501
            except Exception, e:
589
502
                print e
590
503
                raise
591
 
        bus.add_signal_receiver(catch_branch,
592
 
                                dbus_interface=BROADCAST_INTERFACE,
593
 
                                signal_name="Revision")
 
504
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
505
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
594
506
        pynotify.init("bzr commit-notify")
595
507
        gtk.main()
596
508
 
597
509
register_command(cmd_commit_notify)
598
510
 
599
511
 
600
 
class cmd_gselftest(GTKCommand):
601
 
    """Version of selftest that displays a notification at the end"""
602
 
 
603
 
    takes_args = builtins.cmd_selftest.takes_args
604
 
    takes_options = builtins.cmd_selftest.takes_options
605
 
    _see_also = ['selftest']
606
 
 
607
 
    def run(self, *args, **kwargs):
608
 
        import cgi
609
 
        import sys
610
 
        default_encoding = sys.getdefaultencoding()
611
 
        # prevent gtk from blowing up later
612
 
        gtk = import_pygtk()
613
 
        # prevent gtk from messing with default encoding
614
 
        import pynotify
615
 
        if sys.getdefaultencoding() != default_encoding:
616
 
            reload(sys)
617
 
            sys.setdefaultencoding(default_encoding)
618
 
        result = builtins.cmd_selftest().run(*args, **kwargs)
619
 
        if result == 0:
620
 
            summary = 'Success'
621
 
            body = 'Selftest succeeded in "%s"' % os.getcwd()
622
 
        if result == 1:
623
 
            summary = 'Failure'
624
 
            body = 'Selftest failed in "%s"' % os.getcwd()
625
 
        pynotify.init("bzr gselftest")
626
 
        note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
627
 
        note.set_timeout(pynotify.EXPIRES_NEVER)
628
 
        note.show()
629
 
 
630
 
 
631
 
register_command(cmd_gselftest)
632
 
 
633
 
 
634
 
class cmd_test_gtk(GTKCommand):
635
 
    """Version of selftest that just runs the gtk test suite."""
636
 
 
637
 
    takes_options = ['verbose',
638
 
                     Option('one', short_name='1',
639
 
                            help='Stop when one test fails.'),
640
 
                     Option('benchmark', help='Run the benchmarks.'),
641
 
                     Option('lsprof-timed',
642
 
                     help='Generate lsprof output for benchmarked'
643
 
                          ' sections of code.'),
644
 
                     Option('list-only',
645
 
                     help='List the tests instead of running them.'),
646
 
                     Option('randomize', type=str, argname="SEED",
647
 
                     help='Randomize the order of tests using the given'
648
 
                          ' seed or "now" for the current time.'),
649
 
                    ]
650
 
    takes_args = ['testspecs*']
651
 
 
652
 
    def run(self, verbose=None, one=False, benchmark=None,
653
 
            lsprof_timed=None, list_only=False, randomize=None,
654
 
            testspecs_list=None):
655
 
        from bzrlib import __path__ as bzrlib_path
656
 
        from bzrlib.tests import selftest
657
 
 
658
 
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
659
 
        if benchmark:
660
 
            print 'No benchmarks yet'
661
 
            return 3
662
 
 
663
 
            test_suite_factory = bench_suite
664
 
            if verbose is None:
665
 
                verbose = True
666
 
            # TODO: should possibly lock the history file...
667
 
            benchfile = open(".perf_history", "at", buffering=1)
668
 
        else:
669
 
            test_suite_factory = test_suite
670
 
            if verbose is None:
671
 
                verbose = False
672
 
            benchfile = None
673
 
 
674
 
        if testspecs_list is not None:
675
 
            pattern = '|'.join(testspecs_list)
676
 
        else:
677
 
            pattern = ".*"
678
 
 
679
 
        try:
680
 
            result = selftest(verbose=verbose,
681
 
                              pattern=pattern,
682
 
                              stop_on_failure=one,
683
 
                              test_suite_factory=test_suite_factory,
684
 
                              lsprof_timed=lsprof_timed,
685
 
                              bench_history=benchfile,
686
 
                              list_only=list_only,
687
 
                              random_seed=randomize,
688
 
                             )
689
 
        finally:
690
 
            if benchfile is not None:
691
 
                benchfile.close()
692
 
 
693
 
register_command(cmd_test_gtk)
694
 
 
695
 
 
696
 
class cmd_ghandle_patch(GTKCommand):
697
 
    """Display a patch or merge directive, possibly merging.
698
 
 
699
 
    This is a helper, meant to be launched from other programs like browsers
700
 
    or email clients.  Since these programs often do not allow parameters to
701
 
    be provided, a "handle-patch" script is included.
702
 
    """
703
 
 
704
 
    takes_args = ['path']
705
 
 
706
 
    def run(self, path):
707
 
        try:
708
 
            from bzrlib.plugins.gtk.diff import (DiffWindow,
709
 
                                                 MergeDirectiveWindow)
710
 
            lines = open(path, 'rb').readlines()
711
 
            lines = [l.replace('\r\n', '\n') for l in lines]
712
 
            try:
713
 
                directive = merge_directive.MergeDirective.from_lines(lines)
714
 
            except errors.NotAMergeDirective:
715
 
                window = DiffWindow()
716
 
                window.set_diff_text(path, lines)
717
 
            else:
718
 
                window = MergeDirectiveWindow(directive, path)
719
 
                window.set_diff_text(path, directive.patch.splitlines(True))
720
 
            window.show()
721
 
            gtk = self.open_display()
722
 
            window.connect("destroy", gtk.main_quit)
723
 
        except Exception, e:
724
 
            from dialog import error_dialog
725
 
            error_dialog('Error', str(e))
726
 
            raise
727
 
        gtk.main()
728
 
 
729
 
 
730
 
register_command(cmd_ghandle_patch)
731
 
 
732
 
 
733
512
import gettext
734
513
gettext.install('olive-gtk')
735
514
 
736
 
# Let's create a specialized alias to protect '_' from being erased by other
737
 
# uses of '_' as an anonymous variable (think pdb for one).
738
 
_i18n = gettext.gettext
739
515
 
740
516
class NoDisplayError(BzrCommandError):
741
517
    """gtk could not find a proper display"""
751
527
    default_encoding = sys.getdefaultencoding()
752
528
    try:
753
529
        result = TestSuite()
754
 
        try:
755
 
            import_pygtk()
756
 
        except errors.BzrCommandError:
757
 
            return result
758
530
        result.addTest(tests.test_suite())
759
531
    finally:
760
532
        if sys.getdefaultencoding() != default_encoding: