/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: matkor at laptop-hp
  • Date: 2008-08-05 13:56:46 UTC
  • mto: This revision was merged to the branch mainline in revision 601.
  • Revision ID: matkor@laptop-hp-20080805135646-7463836pvyp5dn01
Detection of error opening dbus when python-dbus-0.62 is used.

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.
19
18
gannotate         GTK+ annotate. 
20
19
gbranch           GTK+ branching. 
21
20
gcheckout         GTK+ checkout. 
23
22
gconflicts        GTK+ conflicts. 
24
23
gdiff             Show differences in working tree in a GTK+ Window. 
25
24
ginit             Initialise a new branch.
 
25
ginfo             GTK+ branch info dialog
 
26
gloom             GTK+ loom browse dialog
 
27
gmerge            GTK+ merge dialog
26
28
gmissing          GTK+ missing revisions dialog. 
27
29
gpreferences      GTK+ preferences dialog. 
28
30
gpush             GTK+ push.
36
38
 
37
39
import bzrlib
38
40
 
39
 
version_info = (0, 95, 0, 'dev', 1)
 
41
version_info = (0, 96, 0, 'dev', 1)
40
42
 
41
43
if version_info[3] == 'final':
42
44
    version_string = '%d.%d.%d' % version_info[:3]
44
46
    version_string = '%d.%d.%d%s%d' % version_info
45
47
__version__ = version_string
46
48
 
47
 
required_bzrlib = (1, 3)
 
49
required_bzrlib = (1, 6)
48
50
 
49
51
def check_bzrlib_version(desired):
50
52
    """Check that bzrlib is compatible.
104
106
    bzrlib.ui.ui_factory = GtkUIFactory()
105
107
 
106
108
 
107
 
def data_path():
108
 
    return os.path.dirname(__file__)
109
 
 
110
 
 
111
 
def icon_path(*args):
112
 
    basedirs = [os.path.join(data_path()),
 
109
def data_basedirs():
 
110
    return [os.path.dirname(__file__),
113
111
             "/usr/share/bzr-gtk", 
114
112
             "/usr/local/share/bzr-gtk"]
115
 
    for basedir in basedirs:
116
 
        path = os.path.join(basedir, 'icons', *args)
 
113
 
 
114
 
 
115
def data_path(*args):
 
116
    for basedir in data_basedirs():
 
117
        path = os.path.join(basedir, *args)
117
118
        if os.path.exists(path):
118
119
            return path
119
120
    return None
120
121
 
121
122
 
 
123
def icon_path(*args):
 
124
    return data_path(os.path.join('icons', *args))
 
125
 
 
126
 
122
127
def open_display():
123
128
    pygtk = import_pygtk()
124
129
    try:
169
174
    def run(self, location="."):
170
175
        (br, path) = branch.Branch.open_containing(location)
171
176
        open_display()
172
 
        from push import PushDialog
 
177
        from bzrlib.plugins.gtk.push import PushDialog
173
178
        dialog = PushDialog(br.repository, br.last_revision(), br)
174
179
        dialog.run()
175
180
 
176
181
 
 
182
class cmd_gloom(GTKCommand):
 
183
    """ GTK+ loom.
 
184
    
 
185
    """
 
186
    takes_args = [ "location?" ]
 
187
 
 
188
    def run(self, location="."):
 
189
        try:
 
190
            (tree, path) = workingtree.WorkingTree.open_containing(location)
 
191
            br = tree.branch
 
192
        except NoWorkingTree, e:
 
193
            (br, path) = branch.Branch.open_containing(location)
 
194
            tree = None
 
195
        open_display()
 
196
        from bzrlib.plugins.gtk.loom import LoomDialog
 
197
        dialog = LoomDialog(br, tree)
 
198
        dialog.run()
 
199
 
177
200
 
178
201
class cmd_gdiff(GTKCommand):
179
202
    """Show differences in working tree in a GTK+ Window.
231
254
    
232
255
    :return: The viz window object.
233
256
    """
234
 
    from viz import BranchWindow
 
257
    from bzrlib.plugins.gtk.viz import BranchWindow
235
258
    return BranchWindow(branch, revisions, limit)
236
259
 
237
260
 
449
472
        dialog.run()
450
473
 
451
474
 
 
475
class cmd_ginfo(Command):
 
476
    """ GTK+ info dialog
 
477
    
 
478
    """
 
479
    def run(self):
 
480
        from bzrlib import workingtree
 
481
        from bzrlib.plugins.gtk.olive.info import InfoDialog
 
482
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
483
        info = InfoDialog(wt.branch)
 
484
        info.display()
 
485
        info.window.run()
 
486
 
 
487
 
 
488
class cmd_gmerge(Command):
 
489
    """ GTK+ merge dialog
 
490
    
 
491
    """
 
492
    takes_args = ["merge_from_path?"]
 
493
    def run(self, merge_from_path=None):
 
494
        from bzrlib import workingtree
 
495
        from bzrlib.plugins.gtk.dialog import error_dialog
 
496
        from bzrlib.plugins.gtk.merge import MergeDialog
 
497
        
 
498
        (wt, path) = workingtree.WorkingTree.open_containing('.')
 
499
        old_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
500
        delta = wt.changes_from(old_tree)
 
501
        if len(delta.added) or len(delta.removed) or len(delta.renamed) or len(delta.modified):
 
502
            error_dialog(_i18n('There are local changes in the branch'),
 
503
                         _i18n('Please commit or revert the changes before merging.'))
 
504
        else:
 
505
            parent_branch_path = wt.branch.get_parent()
 
506
            merge = MergeDialog(wt, path, parent_branch_path)
 
507
            response = merge.run()
 
508
            merge.destroy()
 
509
 
 
510
 
452
511
class cmd_gmissing(Command):
453
512
    """ GTK+ missing revisions dialog.
454
513
 
512
571
    cmd_gconflicts, 
513
572
    cmd_gdiff,
514
573
    cmd_ginit,
 
574
    cmd_ginfo,
 
575
    cmd_gmerge,
515
576
    cmd_gmissing, 
516
577
    cmd_gpreferences, 
517
578
    cmd_gpush, 
521
582
    cmd_visualise
522
583
    ]
523
584
 
 
585
try:
 
586
    from bzrlib.plugins import loom
 
587
except ImportError:
 
588
    pass # Loom plugin doesn't appear to be present
 
589
else:
 
590
    commands.append(cmd_gloom)
 
591
 
524
592
for cmd in commands:
525
593
    register_command(cmd)
526
594
 
527
595
 
528
 
class cmd_commit_notify(GTKCommand):
529
 
    """Run the bzr commit notifier.
530
 
 
531
 
    This is a background program which will pop up a notification on the users
532
 
    screen when a commit occurs.
533
 
    """
534
 
 
535
 
    def run(self):
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
 
 
542
 
        import cgi
543
 
        import dbus
544
 
        import dbus.service
545
 
        import pynotify
546
 
        from bzrlib.bzrdir import BzrDir
547
 
        from bzrlib import errors
548
 
        from bzrlib.osutils import format_date
549
 
        from bzrlib.transport import get_transport
550
 
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
551
 
            import dbus.glib
552
 
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
553
 
        bus = dbus.SessionBus()
554
 
 
555
 
        def catch_branch(revision_id, urls):
556
 
            # TODO: show all the urls, or perhaps choose the 'best'.
557
 
            url = urls[0]
558
 
            try:
559
 
                if isinstance(revision_id, unicode):
560
 
                    revision_id = revision_id.encode('utf8')
561
 
                transport = get_transport(url)
562
 
                a_dir = BzrDir.open_from_transport(transport)
563
 
                branch = a_dir.open_branch()
564
 
                revno = branch.revision_id_to_revno(revision_id)
565
 
                revision = branch.repository.get_revision(revision_id)
566
 
                summary = 'New revision %d in %s' % (revno, url)
567
 
                body  = 'Committer: %s\n' % revision.committer
568
 
                body += 'Date: %s\n' % format_date(revision.timestamp,
569
 
                    revision.timezone)
570
 
                body += '\n'
571
 
                body += revision.message
572
 
                body = cgi.escape(body)
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)
585
 
                nw.set_timeout(5000)
586
 
                nw.show()
587
 
            except Exception, e:
588
 
                print e
589
 
                raise
590
 
        bus.add_signal_receiver(catch_branch,
591
 
                                dbus_interface=BROADCAST_INTERFACE,
592
 
                                signal_name="Revision")
593
 
        pynotify.init("bzr commit-notify")
594
 
        gtk.main()
595
 
 
596
 
register_command(cmd_commit_notify)
597
 
 
598
 
 
599
596
class cmd_gselftest(GTKCommand):
600
597
    """Version of selftest that displays a notification at the end"""
601
598