/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-05-04 18:16:01 UTC
  • Revision ID: jelmer@samba.org-20080504181601-u5gh89q8l2we201l
https://launchpad.net/bugs/224914
Fix display of children in branchview.

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
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
16
37
 
17
38
import bzrlib
18
39
 
19
 
__version__ = '0.17.0'
20
 
version_info = tuple(int(n) for n in __version__.split('.'))
21
 
 
 
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)
22
49
 
23
50
def check_bzrlib_version(desired):
24
51
    """Check that bzrlib is compatible.
25
52
 
26
53
    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
54
    """
31
 
    desired_plus = (desired[0], desired[1]+1)
32
55
    bzrlib_version = bzrlib.version_info[:2]
33
 
    if bzrlib_version == desired:
34
 
        return
35
56
    try:
36
57
        from bzrlib.trace import warning
37
58
    except ImportError:
38
59
        # get the message out any way we can
39
60
        from warnings import warn as warning
40
61
    if bzrlib_version < desired:
41
 
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
 
62
        from bzrlib.errors import BzrError
 
63
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
42
64
                ' %s.' % (bzrlib.__version__, __version__))
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])
 
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)
53
70
 
54
71
from bzrlib.trace import warning
55
72
if __name__ != 'bzrlib.plugins.gtk':
59
76
lazy_import(globals(), """
60
77
from bzrlib import (
61
78
    branch,
 
79
    builtins,
62
80
    errors,
 
81
    merge_directive,
63
82
    workingtree,
64
83
    )
65
84
""")
86
105
    bzrlib.ui.ui_factory = GtkUIFactory()
87
106
 
88
107
 
 
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
 
89
123
class GTKCommand(Command):
90
124
    """Abstract class providing GTK specific run commands."""
91
125
 
136
170
        (br, path) = branch.Branch.open_containing(location)
137
171
        self.open_display()
138
172
        from push import PushDialog
139
 
        dialog = PushDialog(br)
 
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
140
174
        dialog.run()
141
175
 
142
176
 
192
226
            wt.unlock()
193
227
 
194
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
 
195
238
class cmd_visualise(Command):
196
239
    """Graphically visualise this branch.
197
240
 
203
246
    """
204
247
    takes_options = [
205
248
        "revision",
206
 
        Option('limit', "maximum number of revisions to display",
 
249
        Option('limit', "Maximum number of revisions to display.",
207
250
               int, 'count')]
208
 
    takes_args = [ "location?" ]
 
251
    takes_args = [ "locations*" ]
209
252
    aliases = [ "visualize", "vis", "viz" ]
210
253
 
211
 
    def run(self, location=".", revision=None, limit=None):
 
254
    def run(self, locations_list, revision=None, limit=None):
212
255
        set_ui_factory()
213
 
        (br, path) = branch.Branch.open_containing(location)
214
 
        br.lock_read()
215
 
        br.repository.lock_read()
216
 
        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)
217
261
            if revision is None:
218
 
                revid = br.last_revision()
219
 
                if revid is None:
220
 
                    return
 
262
                revids.append(br.last_revision())
221
263
            else:
222
264
                (revno, revid) = revision[0].in_history(br)
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()
 
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()
235
271
 
236
272
 
237
273
class cmd_gannotate(GTKCommand):
242
278
 
243
279
    takes_args = ["filename", "line?"]
244
280
    takes_options = [
245
 
        Option("all", help="show annotations on all lines"),
246
 
        Option("plain", help="don't highlight annotation lines"),
 
281
        Option("all", help="Show annotations on all lines."),
 
282
        Option("plain", help="Don't highlight annotation lines."),
247
283
        Option("line", type=int, argname="lineno",
248
 
               help="jump to specified line number"),
 
284
               help="Jump to specified line number."),
249
285
        "revision",
250
286
    ]
251
287
    aliases = ["gblame", "gpraise"]
281
317
        else:
282
318
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
283
319
 
284
 
        window = GAnnotateWindow(all, plain)
 
320
        window = GAnnotateWindow(all, plain, branch=br)
285
321
        window.connect("destroy", lambda w: gtk.main_quit())
286
 
        window.set_title(path + " - gannotate")
287
322
        config = GAnnotateConfig(window)
288
323
        window.show()
289
324
        br.lock_read()
304
339
    """GTK+ commit dialog
305
340
 
306
341
    Graphical user interface for committing revisions"""
307
 
    
 
342
 
308
343
    aliases = [ "gci" ]
309
344
    takes_args = []
310
345
    takes_options = []
323
358
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
324
359
            br = wt.branch
325
360
        except NoWorkingTree, e:
326
 
            path = e.base
327
 
            (br, path) = branch.Branch.open_containing(path)
328
 
 
329
 
        commit = CommitDialog(wt, path, not br)
330
 
        commit.run()
331
 
 
 
361
            from dialog import error_dialog
 
362
            error_dialog(_('Directory does not have a working tree'),
 
363
                         _('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()
332
376
 
333
377
 
334
378
class cmd_gstatus(GTKCommand):
339
383
    
340
384
    aliases = [ "gst" ]
341
385
    takes_args = ['PATH?']
342
 
    takes_options = []
 
386
    takes_options = ['revision']
343
387
 
344
 
    def run(self, path='.'):
 
388
    def run(self, path='.', revision=None):
345
389
        import os
346
390
        gtk = self.open_display()
347
391
        from status import StatusDialog
348
392
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
349
 
        status = StatusDialog(wt, wt_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)
350
404
        status.connect("destroy", gtk.main_quit)
351
405
        status.run()
352
406
 
353
407
 
 
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
 
354
427
 
355
428
class cmd_gconflicts(GTKCommand):
356
 
    """ GTK+ push.
 
429
    """GTK+ conflicts.
357
430
    
 
431
    Select files from the list of conflicts and run an external utility to
 
432
    resolve them.
358
433
    """
359
434
    def run(self):
360
435
        (wt, path) = workingtree.WorkingTree.open_containing('.')
364
439
        dialog.run()
365
440
 
366
441
 
367
 
 
368
442
class cmd_gpreferences(GTKCommand):
369
443
    """ GTK+ preferences dialog.
370
444
 
376
450
        dialog.run()
377
451
 
378
452
 
379
 
 
380
453
class cmd_gmissing(Command):
381
454
    """ GTK+ missing revisions dialog.
382
455
 
433
506
 
434
507
 
435
508
commands = [
 
509
    cmd_gannotate, 
 
510
    cmd_gbranch,
 
511
    cmd_gcheckout, 
 
512
    cmd_gcommit, 
 
513
    cmd_gconflicts, 
 
514
    cmd_gdiff,
 
515
    cmd_ginit,
436
516
    cmd_gmissing, 
437
517
    cmd_gpreferences, 
438
 
    cmd_gconflicts, 
 
518
    cmd_gpush, 
 
519
    cmd_gsend,
439
520
    cmd_gstatus,
440
 
    cmd_gcommit, 
441
 
    cmd_gannotate, 
442
 
    cmd_visualise, 
443
 
    cmd_gdiff,
444
 
    cmd_gpush, 
445
 
    cmd_gcheckout, 
446
 
    cmd_gbranch,
447
 
    cmd_ginit,
448
 
    cmd_gtags
 
521
    cmd_gtags,
 
522
    cmd_visualise
449
523
    ]
450
524
 
451
525
for cmd in commands:
460
534
    """
461
535
 
462
536
    def run(self):
 
537
        from notify import NotifyPopupMenu
463
538
        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
 
464
543
        import cgi
465
544
        import dbus
466
545
        import dbus.service
471
550
        from bzrlib.transport import get_transport
472
551
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
473
552
            import dbus.glib
474
 
        from bzrlib.plugins.dbus import activity
 
553
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
475
554
        bus = dbus.SessionBus()
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)
 
555
 
480
556
        def catch_branch(revision_id, urls):
481
557
            # TODO: show all the urls, or perhaps choose the 'best'.
482
558
            url = urls[0]
496
572
                body += revision.message
497
573
                body = cgi.escape(body)
498
574
                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)
499
586
                nw.set_timeout(5000)
500
587
                nw.show()
501
588
            except Exception, e:
502
589
                print e
503
590
                raise
504
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
505
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
591
        bus.add_signal_receiver(catch_branch,
 
592
                                dbus_interface=BROADCAST_INTERFACE,
 
593
                                signal_name="Revision")
506
594
        pynotify.init("bzr commit-notify")
507
595
        gtk.main()
508
596
 
509
597
register_command(cmd_commit_notify)
510
598
 
511
599
 
 
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
 
512
733
import gettext
513
734
gettext.install('olive-gtk')
514
735
 
527
748
    default_encoding = sys.getdefaultencoding()
528
749
    try:
529
750
        result = TestSuite()
 
751
        try:
 
752
            import_pygtk()
 
753
        except errors.BzrCommandError:
 
754
            return result
530
755
        result.addTest(tests.test_suite())
531
756
    finally:
532
757
        if sys.getdefaultencoding() != default_encoding: