/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

Merged an approved request (single clicking bookmark).

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__),
109
 
             "/usr/share/bzr-gtk", 
110
 
             "/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
 
        if os.path.exists(path):
117
 
            return path
118
 
    return None
119
 
 
120
 
 
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
 
 
 
108
def data_path():
 
109
    return os.path.dirname(__file__)
 
110
 
135
111
 
136
112
class GTKCommand(Command):
137
113
    """Abstract class providing GTK specific run commands."""
138
114
 
 
115
    def open_display(self):
 
116
        pygtk = import_pygtk()
 
117
        try:
 
118
            import gtk
 
119
        except RuntimeError, e:
 
120
            if str(e) == "could not open display":
 
121
                raise NoDisplayError
 
122
        set_ui_factory()
 
123
        return gtk
 
124
 
139
125
    def run(self):
140
 
        open_display()
 
126
        self.open_display()
141
127
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
128
        dialog.run()
143
129
 
171
157
 
172
158
    def run(self, location="."):
173
159
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
160
        self.open_display()
175
161
        from push import PushDialog
176
162
        dialog = PushDialog(br.repository, br.last_revision(), br)
177
163
        dialog.run()
196
182
            if revision is not None:
197
183
                if len(revision) == 1:
198
184
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
185
                    revision_id = revision[0].in_history(branch).rev_id
200
186
                    tree2 = branch.repository.revision_tree(revision_id)
201
187
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
188
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
189
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
190
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
191
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
192
            else:
207
193
                tree1 = wt
264
250
            if revision is None:
265
251
                revids.append(br.last_revision())
266
252
            else:
267
 
                revids.append(revision[0].as_revision_id(br))
 
253
                (revno, revid) = revision[0].in_history(br)
 
254
                revids.append(revid)
268
255
        import gtk
269
256
        pp = start_viz_window(br, revids, limit)
270
257
        pp.connect("destroy", lambda w: gtk.main_quit())
289
276
    aliases = ["gblame", "gpraise"]
290
277
    
291
278
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
279
        gtk = self.open_display()
293
280
 
294
281
        try:
295
282
            line = int(line)
314
301
        if revision is not None:
315
302
            if len(revision) != 1:
316
303
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
304
            revision_id = revision[0].in_history(br).rev_id
318
305
            tree = br.repository.revision_tree(revision_id)
319
306
        else:
320
307
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
308
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
309
        window = GAnnotateWindow(all, plain)
323
310
        window.connect("destroy", lambda w: gtk.main_quit())
324
311
        config = GAnnotateConfig(window)
325
312
        window.show()
348
335
 
349
336
    def run(self, filename=None):
350
337
        import os
351
 
        open_display()
 
338
        self.open_display()
352
339
        from commit import CommitDialog
353
340
        from bzrlib.errors import (BzrCommandError,
354
341
                                   NotBranchError,
361
348
            br = wt.branch
362
349
        except NoWorkingTree, e:
363
350
            from dialog import error_dialog
364
 
            error_dialog(_i18n('Directory does not have a working tree'),
365
 
                         _i18n('Operation aborted.'))
 
351
            error_dialog(_('Directory does not have a working tree'),
 
352
                         _('Operation aborted.'))
366
353
            return 1 # should this be retval=3?
367
354
 
368
355
        # It is a good habit to keep things locked for the duration, but it
385
372
    
386
373
    aliases = [ "gst" ]
387
374
    takes_args = ['PATH?']
388
 
    takes_options = ['revision']
 
375
    takes_options = []
389
376
 
390
 
    def run(self, path='.', revision=None):
 
377
    def run(self, path='.'):
391
378
        import os
392
 
        gtk = open_display()
 
379
        gtk = self.open_display()
393
380
        from status import StatusDialog
394
381
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
395
 
        
396
 
        if revision is not None:
397
 
            try:
398
 
                revision_id = revision[0].as_revision_id(wt.branch)
399
 
            except:
400
 
                from bzrlib.errors import BzrError
401
 
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
402
 
        else:
403
 
            revision_id = None
404
 
 
405
 
        status = StatusDialog(wt, wt_path, revision_id)
 
382
        status = StatusDialog(wt, wt_path)
406
383
        status.connect("destroy", gtk.main_quit)
407
384
        status.run()
408
385
 
413
390
    """
414
391
    def run(self):
415
392
        (br, path) = branch.Branch.open_containing(".")
416
 
        gtk = open_display()
 
393
        gtk = self.open_display()
417
394
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
418
395
        from StringIO import StringIO
419
396
        dialog = SendMergeDirectiveDialog(br)
435
412
    """
436
413
    def run(self):
437
414
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
415
        self.open_display()
439
416
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
417
        dialog = ConflictsDialog(wt)
441
418
        dialog.run()
446
423
 
447
424
    """
448
425
    def run(self):
449
 
        open_display()
 
426
        self.open_display()
450
427
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
428
        dialog = PreferencesWindow()
452
429
        dialog.run()
453
430
 
454
431
 
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
432
class cmd_gmissing(Command):
479
433
    """ GTK+ missing revisions dialog.
480
434
 
513
467
 
514
468
class cmd_ginit(GTKCommand):
515
469
    def run(self):
516
 
        open_display()
 
470
        self.open_display()
517
471
        from initialize import InitDialog
518
472
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
473
        dialog.run()
523
477
    def run(self):
524
478
        br = branch.Branch.open_containing('.')[0]
525
479
        
526
 
        gtk = open_display()
 
480
        gtk = self.open_display()
527
481
        from tags import TagsWindow
528
482
        window = TagsWindow(br)
529
483
        window.show()
538
492
    cmd_gconflicts, 
539
493
    cmd_gdiff,
540
494
    cmd_ginit,
541
 
    cmd_gmerge,
542
495
    cmd_gmissing, 
543
496
    cmd_gpreferences, 
544
497
    cmd_gpush, 
552
505
    register_command(cmd)
553
506
 
554
507
 
 
508
class cmd_commit_notify(GTKCommand):
 
509
    """Run the bzr commit notifier.
 
510
 
 
511
    This is a background program which will pop up a notification on the users
 
512
    screen when a commit occurs.
 
513
    """
 
514
 
 
515
    def run(self):
 
516
        from notify import NotifyPopupMenu
 
517
        gtk = self.open_display()
 
518
        menu = NotifyPopupMenu()
 
519
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
520
        icon.connect('popup-menu', menu.display)
 
521
 
 
522
        import cgi
 
523
        import dbus
 
524
        import dbus.service
 
525
        import pynotify
 
526
        from bzrlib.bzrdir import BzrDir
 
527
        from bzrlib import errors
 
528
        from bzrlib.osutils import format_date
 
529
        from bzrlib.transport import get_transport
 
530
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
531
            import dbus.glib
 
532
        from bzrlib.plugins.dbus import activity
 
533
        bus = dbus.SessionBus()
 
534
        # get the object so we can subscribe to callbacks from it.
 
535
        broadcast_service = bus.get_object(
 
536
            activity.Broadcast.DBUS_NAME,
 
537
            activity.Broadcast.DBUS_PATH)
 
538
 
 
539
        def catch_branch(revision_id, urls):
 
540
            # TODO: show all the urls, or perhaps choose the 'best'.
 
541
            url = urls[0]
 
542
            try:
 
543
                if isinstance(revision_id, unicode):
 
544
                    revision_id = revision_id.encode('utf8')
 
545
                transport = get_transport(url)
 
546
                a_dir = BzrDir.open_from_transport(transport)
 
547
                branch = a_dir.open_branch()
 
548
                revno = branch.revision_id_to_revno(revision_id)
 
549
                revision = branch.repository.get_revision(revision_id)
 
550
                summary = 'New revision %d in %s' % (revno, url)
 
551
                body  = 'Committer: %s\n' % revision.committer
 
552
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
553
                    revision.timezone)
 
554
                body += '\n'
 
555
                body += revision.message
 
556
                body = cgi.escape(body)
 
557
                nw = pynotify.Notification(summary, body)
 
558
                def start_viz(notification=None, action=None, data=None):
 
559
                    """Start the viz program."""
 
560
                    pp = start_viz_window(branch, revision_id)
 
561
                    pp.show()
 
562
                def start_branch(notification=None, action=None, data=None):
 
563
                    """Start a Branch dialog"""
 
564
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
565
                    bd = BranchDialog(remote_path=url)
 
566
                    bd.run()
 
567
                nw.add_action("inspect", "Inspect", start_viz, None)
 
568
                nw.add_action("branch", "Branch", start_branch, None)
 
569
                nw.set_timeout(5000)
 
570
                nw.show()
 
571
            except Exception, e:
 
572
                print e
 
573
                raise
 
574
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
575
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
576
        pynotify.init("bzr commit-notify")
 
577
        gtk.main()
 
578
 
 
579
register_command(cmd_commit_notify)
 
580
 
 
581
 
555
582
class cmd_gselftest(GTKCommand):
556
583
    """Version of selftest that displays a notification at the end"""
557
584
 
648
675
register_command(cmd_test_gtk)
649
676
 
650
677
 
 
678
class cmd_ghandle_patch(GTKCommand):
 
679
    """Display a patch or merge directive, possibly merging.
 
680
 
 
681
    This is a helper, meant to be launched from other programs like browsers
 
682
    or email clients.  Since these programs often do not allow parameters to
 
683
    be provided, a "handle-patch" script is included.
 
684
    """
 
685
 
 
686
    takes_args = ['path']
 
687
 
 
688
    def run(self, path):
 
689
        try:
 
690
            from bzrlib.plugins.gtk.diff import (DiffWindow,
 
691
                                                 MergeDirectiveWindow)
 
692
            lines = open(path, 'rb').readlines()
 
693
            lines = [l.replace('\r\n', '\n') for l in lines]
 
694
            try:
 
695
                directive = merge_directive.MergeDirective.from_lines(lines)
 
696
            except errors.NotAMergeDirective:
 
697
                window = DiffWindow()
 
698
                window.set_diff_text(path, lines)
 
699
            else:
 
700
                window = MergeDirectiveWindow(directive, path)
 
701
                window.set_diff_text(path, directive.patch.splitlines(True))
 
702
            window.show()
 
703
            gtk = self.open_display()
 
704
            window.connect("destroy", gtk.main_quit)
 
705
        except Exception, e:
 
706
            from dialog import error_dialog
 
707
            error_dialog('Error', str(e))
 
708
            raise
 
709
        gtk.main()
 
710
 
 
711
 
 
712
register_command(cmd_ghandle_patch)
 
713
 
651
714
 
652
715
import gettext
653
716
gettext.install('olive-gtk')
654
717
 
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
718
 
659
719
class NoDisplayError(BzrCommandError):
660
720
    """gtk could not find a proper display"""