/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

Merge signatures tab.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
22
22
gcommit           GTK+ commit dialog.
23
23
gconflicts        GTK+ conflicts. 
24
24
gdiff             Show differences in working tree in a GTK+ Window. 
 
25
ghandle-patch     Display and optionally merge a merge directive or patch.
25
26
ginit             Initialise a new branch.
26
27
gmissing          GTK+ missing revisions dialog. 
27
28
gpreferences      GTK+ preferences dialog. 
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]
119
120
    return None
120
121
 
121
122
 
122
 
def open_display():
123
 
    pygtk = import_pygtk()
124
 
    try:
125
 
        import gtk
126
 
    except RuntimeError, e:
127
 
        if str(e) == "could not open display":
128
 
            raise NoDisplayError
129
 
    set_ui_factory()
130
 
    return gtk
131
 
 
132
 
 
133
123
class GTKCommand(Command):
134
124
    """Abstract class providing GTK specific run commands."""
135
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
 
136
136
    def run(self):
137
 
        open_display()
 
137
        self.open_display()
138
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
139
139
        dialog.run()
140
140
 
168
168
 
169
169
    def run(self, location="."):
170
170
        (br, path) = branch.Branch.open_containing(location)
171
 
        open_display()
 
171
        self.open_display()
172
172
        from push import PushDialog
173
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
174
174
        dialog.run()
193
193
            if revision is not None:
194
194
                if len(revision) == 1:
195
195
                    tree1 = wt
196
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
196
                    revision_id = revision[0].in_history(branch).rev_id
197
197
                    tree2 = branch.repository.revision_tree(revision_id)
198
198
                elif len(revision) == 2:
199
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
199
                    revision_id_0 = revision[0].in_history(branch).rev_id
200
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
201
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
201
                    revision_id_1 = revision[1].in_history(branch).rev_id
202
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
203
203
            else:
204
204
                tree1 = wt
261
261
            if revision is None:
262
262
                revids.append(br.last_revision())
263
263
            else:
264
 
                revids.append(revision[0].as_revision_id(br))
 
264
                (revno, revid) = revision[0].in_history(br)
 
265
                revids.append(revid)
265
266
        import gtk
266
267
        pp = start_viz_window(br, revids, limit)
267
268
        pp.connect("destroy", lambda w: gtk.main_quit())
286
287
    aliases = ["gblame", "gpraise"]
287
288
    
288
289
    def run(self, filename, all=False, plain=False, line='1', revision=None):
289
 
        gtk = open_display()
 
290
        gtk = self.open_display()
290
291
 
291
292
        try:
292
293
            line = int(line)
311
312
        if revision is not None:
312
313
            if len(revision) != 1:
313
314
                raise BzrCommandError("Only 1 revion may be specified.")
314
 
            revision_id = revision[0].as_revision_id(br)
 
315
            revision_id = revision[0].in_history(br).rev_id
315
316
            tree = br.repository.revision_tree(revision_id)
316
317
        else:
317
318
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
318
319
 
319
 
        window = GAnnotateWindow(all, plain, branch=br)
 
320
        window = GAnnotateWindow(all, plain)
320
321
        window.connect("destroy", lambda w: gtk.main_quit())
321
322
        config = GAnnotateConfig(window)
322
323
        window.show()
345
346
 
346
347
    def run(self, filename=None):
347
348
        import os
348
 
        open_display()
 
349
        self.open_display()
349
350
        from commit import CommitDialog
350
351
        from bzrlib.errors import (BzrCommandError,
351
352
                                   NotBranchError,
358
359
            br = wt.branch
359
360
        except NoWorkingTree, e:
360
361
            from dialog import error_dialog
361
 
            error_dialog(_i18n('Directory does not have a working tree'),
362
 
                         _i18n('Operation aborted.'))
 
362
            error_dialog(_('Directory does not have a working tree'),
 
363
                         _('Operation aborted.'))
363
364
            return 1 # should this be retval=3?
364
365
 
365
366
        # It is a good habit to keep things locked for the duration, but it
382
383
    
383
384
    aliases = [ "gst" ]
384
385
    takes_args = ['PATH?']
385
 
    takes_options = ['revision']
 
386
    takes_options = []
386
387
 
387
 
    def run(self, path='.', revision=None):
 
388
    def run(self, path='.'):
388
389
        import os
389
 
        gtk = open_display()
 
390
        gtk = self.open_display()
390
391
        from status import StatusDialog
391
392
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
392
 
        
393
 
        if revision is not None:
394
 
            try:
395
 
                revision_id = revision[0].as_revision_id(wt.branch)
396
 
            except:
397
 
                from bzrlib.errors import BzrError
398
 
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
399
 
        else:
400
 
            revision_id = None
401
 
 
402
 
        status = StatusDialog(wt, wt_path, revision_id)
 
393
        status = StatusDialog(wt, wt_path)
403
394
        status.connect("destroy", gtk.main_quit)
404
395
        status.run()
405
396
 
410
401
    """
411
402
    def run(self):
412
403
        (br, path) = branch.Branch.open_containing(".")
413
 
        gtk = open_display()
 
404
        gtk = self.open_display()
414
405
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
415
406
        from StringIO import StringIO
416
407
        dialog = SendMergeDirectiveDialog(br)
432
423
    """
433
424
    def run(self):
434
425
        (wt, path) = workingtree.WorkingTree.open_containing('.')
435
 
        open_display()
 
426
        self.open_display()
436
427
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
437
428
        dialog = ConflictsDialog(wt)
438
429
        dialog.run()
443
434
 
444
435
    """
445
436
    def run(self):
446
 
        open_display()
 
437
        self.open_display()
447
438
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
448
439
        dialog = PreferencesWindow()
449
440
        dialog.run()
487
478
 
488
479
class cmd_ginit(GTKCommand):
489
480
    def run(self):
490
 
        open_display()
 
481
        self.open_display()
491
482
        from initialize import InitDialog
492
483
        dialog = InitDialog(os.path.abspath(os.path.curdir))
493
484
        dialog.run()
497
488
    def run(self):
498
489
        br = branch.Branch.open_containing('.')[0]
499
490
        
500
 
        gtk = open_display()
 
491
        gtk = self.open_display()
501
492
        from tags import TagsWindow
502
493
        window = TagsWindow(br)
503
494
        window.show()
534
525
 
535
526
    def run(self):
536
527
        from notify import NotifyPopupMenu
537
 
        gtk = open_display()
 
528
        gtk = self.open_display()
538
529
        menu = NotifyPopupMenu()
539
530
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
540
531
        icon.connect('popup-menu', menu.display)
549
540
        from bzrlib.transport import get_transport
550
541
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
551
542
            import dbus.glib
552
 
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
 
543
        from bzrlib.plugins.dbus import activity
553
544
        bus = dbus.SessionBus()
 
545
        # get the object so we can subscribe to callbacks from it.
 
546
        broadcast_service = bus.get_object(
 
547
            activity.Broadcast.DBUS_NAME,
 
548
            activity.Broadcast.DBUS_PATH)
554
549
 
555
550
        def catch_branch(revision_id, urls):
556
551
            # TODO: show all the urls, or perhaps choose the 'best'.
587
582
            except Exception, e:
588
583
                print e
589
584
                raise
590
 
        bus.add_signal_receiver(catch_branch,
591
 
                                dbus_interface=BROADCAST_INTERFACE,
592
 
                                signal_name="Revision")
 
585
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
586
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
593
587
        pynotify.init("bzr commit-notify")
594
588
        gtk.main()
595
589
 
692
686
register_command(cmd_test_gtk)
693
687
 
694
688
 
 
689
class cmd_ghandle_patch(GTKCommand):
 
690
    """Display a patch or merge directive, possibly merging.
 
691
 
 
692
    This is a helper, meant to be launched from other programs like browsers
 
693
    or email clients.  Since these programs often do not allow parameters to
 
694
    be provided, a "handle-patch" script is included.
 
695
    """
 
696
 
 
697
    takes_args = ['path']
 
698
 
 
699
    def run(self, path):
 
700
        try:
 
701
            from bzrlib.plugins.gtk.diff import (DiffWindow,
 
702
                                                 MergeDirectiveWindow)
 
703
            lines = open(path, 'rb').readlines()
 
704
            lines = [l.replace('\r\n', '\n') for l in lines]
 
705
            try:
 
706
                directive = merge_directive.MergeDirective.from_lines(lines)
 
707
            except errors.NotAMergeDirective:
 
708
                window = DiffWindow()
 
709
                window.set_diff_text(path, lines)
 
710
            else:
 
711
                window = MergeDirectiveWindow(directive, path)
 
712
                window.set_diff_text(path, directive.patch.splitlines(True))
 
713
            window.show()
 
714
            gtk = self.open_display()
 
715
            window.connect("destroy", gtk.main_quit)
 
716
        except Exception, e:
 
717
            from dialog import error_dialog
 
718
            error_dialog('Error', str(e))
 
719
            raise
 
720
        gtk.main()
 
721
 
 
722
 
 
723
register_command(cmd_ghandle_patch)
 
724
 
695
725
 
696
726
import gettext
697
727
gettext.install('olive-gtk')
698
728
 
699
 
# Let's create a specialized alias to protect '_' from being erased by other
700
 
# uses of '_' as an anonymous variable (think pdb for one).
701
 
_i18n = gettext.gettext
702
729
 
703
730
class NoDisplayError(BzrCommandError):
704
731
    """gtk could not find a proper display"""