/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: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
15
15
"""Graphical support for Bazaar using GTK.
16
16
 
17
17
This plugin includes:
 
18
commit-notify     Start the graphical notifier of commits.
18
19
gannotate         GTK+ annotate. 
19
20
gbranch           GTK+ branching. 
20
21
gcheckout         GTK+ checkout. 
21
22
gcommit           GTK+ commit dialog.
22
23
gconflicts        GTK+ conflicts. 
23
24
gdiff             Show differences in working tree in a GTK+ Window. 
 
25
ghandle-patch     Display and optionally merge a merge directive or patch.
24
26
ginit             Initialise a new branch.
25
 
gmerge            GTK+ merge dialog
26
27
gmissing          GTK+ missing revisions dialog. 
27
28
gpreferences      GTK+ preferences dialog. 
28
29
gpush             GTK+ push.
36
37
 
37
38
import bzrlib
38
39
 
39
 
version_info = (0, 95, 0, 'dev', 1)
 
40
version_info = (0, 94, 0, 'dev', 0)
40
41
 
41
42
if version_info[3] == 'final':
42
43
    version_string = '%d.%d.%d' % version_info[:3]
104
105
    bzrlib.ui.ui_factory = GtkUIFactory()
105
106
 
106
107
 
107
 
def data_basedirs():
108
 
    return [os.path.dirname(__file__),
 
108
def data_path():
 
109
    return os.path.dirname(__file__)
 
110
 
 
111
 
 
112
def icon_path(*args):
 
113
    basedirs = [os.path.join(data_path()),
109
114
             "/usr/share/bzr-gtk", 
110
115
             "/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
    for basedir in basedirs:
 
117
        path = os.path.join(basedir, 'icons', *args)
116
118
        if os.path.exists(path):
117
119
            return path
118
120
    return None
119
121
 
120
122
 
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
123
class GTKCommand(Command):
137
124
    """Abstract class providing GTK specific run commands."""
138
125
 
 
126
    def open_display(self):
 
127
        pygtk = import_pygtk()
 
128
        try:
 
129
            import gtk
 
130
        except RuntimeError, e:
 
131
            if str(e) == "could not open display":
 
132
                raise NoDisplayError
 
133
        set_ui_factory()
 
134
        return gtk
 
135
 
139
136
    def run(self):
140
 
        open_display()
 
137
        self.open_display()
141
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
139
        dialog.run()
143
140
 
171
168
 
172
169
    def run(self, location="."):
173
170
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
171
        self.open_display()
175
172
        from push import PushDialog
176
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
177
174
        dialog.run()
196
193
            if revision is not None:
197
194
                if len(revision) == 1:
198
195
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
196
                    revision_id = revision[0].in_history(branch).rev_id
200
197
                    tree2 = branch.repository.revision_tree(revision_id)
201
198
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
199
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
201
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
203
            else:
207
204
                tree1 = wt
264
261
            if revision is None:
265
262
                revids.append(br.last_revision())
266
263
            else:
267
 
                revids.append(revision[0].as_revision_id(br))
 
264
                (revno, revid) = revision[0].in_history(br)
 
265
                revids.append(revid)
268
266
        import gtk
269
267
        pp = start_viz_window(br, revids, limit)
270
268
        pp.connect("destroy", lambda w: gtk.main_quit())
289
287
    aliases = ["gblame", "gpraise"]
290
288
    
291
289
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
290
        gtk = self.open_display()
293
291
 
294
292
        try:
295
293
            line = int(line)
314
312
        if revision is not None:
315
313
            if len(revision) != 1:
316
314
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
315
            revision_id = revision[0].in_history(br).rev_id
318
316
            tree = br.repository.revision_tree(revision_id)
319
317
        else:
320
318
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
319
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
320
        window = GAnnotateWindow(all, plain)
323
321
        window.connect("destroy", lambda w: gtk.main_quit())
324
322
        config = GAnnotateConfig(window)
325
323
        window.show()
348
346
 
349
347
    def run(self, filename=None):
350
348
        import os
351
 
        open_display()
 
349
        self.open_display()
352
350
        from commit import CommitDialog
353
351
        from bzrlib.errors import (BzrCommandError,
354
352
                                   NotBranchError,
361
359
            br = wt.branch
362
360
        except NoWorkingTree, e:
363
361
            from dialog import error_dialog
364
 
            error_dialog(_i18n('Directory does not have a working tree'),
365
 
                         _i18n('Operation aborted.'))
 
362
            error_dialog(_('Directory does not have a working tree'),
 
363
                         _('Operation aborted.'))
366
364
            return 1 # should this be retval=3?
367
365
 
368
366
        # It is a good habit to keep things locked for the duration, but it
389
387
 
390
388
    def run(self, path='.', revision=None):
391
389
        import os
392
 
        gtk = open_display()
 
390
        gtk = self.open_display()
393
391
        from status import StatusDialog
394
392
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
395
393
        
396
394
        if revision is not None:
397
395
            try:
398
 
                revision_id = revision[0].as_revision_id(wt.branch)
 
396
                revision_id = revision[0].in_history(wt.branch).rev_id
399
397
            except:
400
398
                from bzrlib.errors import BzrError
401
399
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
413
411
    """
414
412
    def run(self):
415
413
        (br, path) = branch.Branch.open_containing(".")
416
 
        gtk = open_display()
 
414
        gtk = self.open_display()
417
415
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
418
416
        from StringIO import StringIO
419
417
        dialog = SendMergeDirectiveDialog(br)
435
433
    """
436
434
    def run(self):
437
435
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
436
        self.open_display()
439
437
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
438
        dialog = ConflictsDialog(wt)
441
439
        dialog.run()
446
444
 
447
445
    """
448
446
    def run(self):
449
 
        open_display()
 
447
        self.open_display()
450
448
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
449
        dialog = PreferencesWindow()
452
450
        dialog.run()
453
451
 
454
452
 
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
453
class cmd_gmissing(Command):
479
454
    """ GTK+ missing revisions dialog.
480
455
 
513
488
 
514
489
class cmd_ginit(GTKCommand):
515
490
    def run(self):
516
 
        open_display()
 
491
        self.open_display()
517
492
        from initialize import InitDialog
518
493
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
494
        dialog.run()
523
498
    def run(self):
524
499
        br = branch.Branch.open_containing('.')[0]
525
500
        
526
 
        gtk = open_display()
 
501
        gtk = self.open_display()
527
502
        from tags import TagsWindow
528
503
        window = TagsWindow(br)
529
504
        window.show()
538
513
    cmd_gconflicts, 
539
514
    cmd_gdiff,
540
515
    cmd_ginit,
541
 
    cmd_gmerge,
542
516
    cmd_gmissing, 
543
517
    cmd_gpreferences, 
544
518
    cmd_gpush, 
552
526
    register_command(cmd)
553
527
 
554
528
 
 
529
class cmd_commit_notify(GTKCommand):
 
530
    """Run the bzr commit notifier.
 
531
 
 
532
    This is a background program which will pop up a notification on the users
 
533
    screen when a commit occurs.
 
534
    """
 
535
 
 
536
    def run(self):
 
537
        from notify import NotifyPopupMenu
 
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
 
 
543
        import cgi
 
544
        import dbus
 
545
        import dbus.service
 
546
        import pynotify
 
547
        from bzrlib.bzrdir import BzrDir
 
548
        from bzrlib import errors
 
549
        from bzrlib.osutils import format_date
 
550
        from bzrlib.transport import get_transport
 
551
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
552
            import dbus.glib
 
553
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
 
554
        bus = dbus.SessionBus()
 
555
 
 
556
        def catch_branch(revision_id, urls):
 
557
            # TODO: show all the urls, or perhaps choose the 'best'.
 
558
            url = urls[0]
 
559
            try:
 
560
                if isinstance(revision_id, unicode):
 
561
                    revision_id = revision_id.encode('utf8')
 
562
                transport = get_transport(url)
 
563
                a_dir = BzrDir.open_from_transport(transport)
 
564
                branch = a_dir.open_branch()
 
565
                revno = branch.revision_id_to_revno(revision_id)
 
566
                revision = branch.repository.get_revision(revision_id)
 
567
                summary = 'New revision %d in %s' % (revno, url)
 
568
                body  = 'Committer: %s\n' % revision.committer
 
569
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
570
                    revision.timezone)
 
571
                body += '\n'
 
572
                body += revision.message
 
573
                body = cgi.escape(body)
 
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)
 
586
                nw.set_timeout(5000)
 
587
                nw.show()
 
588
            except Exception, e:
 
589
                print e
 
590
                raise
 
591
        bus.add_signal_receiver(catch_branch,
 
592
                                dbus_interface=BROADCAST_INTERFACE,
 
593
                                signal_name="Revision")
 
594
        pynotify.init("bzr commit-notify")
 
595
        gtk.main()
 
596
 
 
597
register_command(cmd_commit_notify)
 
598
 
 
599
 
555
600
class cmd_gselftest(GTKCommand):
556
601
    """Version of selftest that displays a notification at the end"""
557
602
 
648
693
register_command(cmd_test_gtk)
649
694
 
650
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
 
651
732
 
652
733
import gettext
653
734
gettext.install('olive-gtk')
654
735
 
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
736
 
659
737
class NoDisplayError(BzrCommandError):
660
738
    """gtk could not find a proper display"""