/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-06-29 16:20:15 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629162015-amhe7xj4cdmup4id
Rename GtkProgressBarStack to GtkWindowProgressBarStack

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.
26
25
ginit             Initialise a new branch.
27
26
gmissing          GTK+ missing revisions dialog. 
28
27
gpreferences      GTK+ preferences dialog. 
37
36
 
38
37
import bzrlib
39
38
 
40
 
version_info = (0, 94, 0, 'dev', 0)
 
39
version_info = (0, 95, 0, 'dev', 1)
41
40
 
42
41
if version_info[3] == 'final':
43
42
    version_string = '%d.%d.%d' % version_info[:3]
109
108
    return os.path.dirname(__file__)
110
109
 
111
110
 
 
111
def icon_path(*args):
 
112
    basedirs = [os.path.join(data_path()),
 
113
             "/usr/share/bzr-gtk", 
 
114
             "/usr/local/share/bzr-gtk"]
 
115
    for basedir in basedirs:
 
116
        path = os.path.join(basedir, 'icons', *args)
 
117
        if os.path.exists(path):
 
118
            return path
 
119
    return None
 
120
 
 
121
 
 
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
 
112
133
class GTKCommand(Command):
113
134
    """Abstract class providing GTK specific run commands."""
114
135
 
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
 
 
125
136
    def run(self):
126
 
        self.open_display()
 
137
        open_display()
127
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
128
139
        dialog.run()
129
140
 
157
168
 
158
169
    def run(self, location="."):
159
170
        (br, path) = branch.Branch.open_containing(location)
160
 
        self.open_display()
 
171
        open_display()
161
172
        from push import PushDialog
162
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
163
174
        dialog.run()
182
193
            if revision is not None:
183
194
                if len(revision) == 1:
184
195
                    tree1 = wt
185
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
186
197
                    tree2 = branch.repository.revision_tree(revision_id)
187
198
                elif len(revision) == 2:
188
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
189
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
190
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
191
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
192
203
            else:
193
204
                tree1 = wt
250
261
            if revision is None:
251
262
                revids.append(br.last_revision())
252
263
            else:
253
 
                (revno, revid) = revision[0].in_history(br)
254
 
                revids.append(revid)
 
264
                revids.append(revision[0].as_revision_id(br))
255
265
        import gtk
256
266
        pp = start_viz_window(br, revids, limit)
257
267
        pp.connect("destroy", lambda w: gtk.main_quit())
276
286
    aliases = ["gblame", "gpraise"]
277
287
    
278
288
    def run(self, filename, all=False, plain=False, line='1', revision=None):
279
 
        gtk = self.open_display()
 
289
        gtk = open_display()
280
290
 
281
291
        try:
282
292
            line = int(line)
301
311
        if revision is not None:
302
312
            if len(revision) != 1:
303
313
                raise BzrCommandError("Only 1 revion may be specified.")
304
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
305
315
            tree = br.repository.revision_tree(revision_id)
306
316
        else:
307
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
308
318
 
309
 
        window = GAnnotateWindow(all, plain)
 
319
        window = GAnnotateWindow(all, plain, branch=br)
310
320
        window.connect("destroy", lambda w: gtk.main_quit())
311
321
        config = GAnnotateConfig(window)
312
322
        window.show()
335
345
 
336
346
    def run(self, filename=None):
337
347
        import os
338
 
        self.open_display()
 
348
        open_display()
339
349
        from commit import CommitDialog
340
350
        from bzrlib.errors import (BzrCommandError,
341
351
                                   NotBranchError,
348
358
            br = wt.branch
349
359
        except NoWorkingTree, e:
350
360
            from dialog import error_dialog
351
 
            error_dialog(_('Directory does not have a working tree'),
352
 
                         _('Operation aborted.'))
 
361
            error_dialog(_i18n('Directory does not have a working tree'),
 
362
                         _i18n('Operation aborted.'))
353
363
            return 1 # should this be retval=3?
354
364
 
355
365
        # It is a good habit to keep things locked for the duration, but it
372
382
    
373
383
    aliases = [ "gst" ]
374
384
    takes_args = ['PATH?']
375
 
    takes_options = []
 
385
    takes_options = ['revision']
376
386
 
377
 
    def run(self, path='.'):
 
387
    def run(self, path='.', revision=None):
378
388
        import os
379
 
        gtk = self.open_display()
 
389
        gtk = open_display()
380
390
        from status import StatusDialog
381
391
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
382
 
        status = StatusDialog(wt, wt_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)
383
403
        status.connect("destroy", gtk.main_quit)
384
404
        status.run()
385
405
 
390
410
    """
391
411
    def run(self):
392
412
        (br, path) = branch.Branch.open_containing(".")
393
 
        gtk = self.open_display()
 
413
        gtk = open_display()
394
414
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
395
415
        from StringIO import StringIO
396
416
        dialog = SendMergeDirectiveDialog(br)
412
432
    """
413
433
    def run(self):
414
434
        (wt, path) = workingtree.WorkingTree.open_containing('.')
415
 
        self.open_display()
 
435
        open_display()
416
436
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
417
437
        dialog = ConflictsDialog(wt)
418
438
        dialog.run()
423
443
 
424
444
    """
425
445
    def run(self):
426
 
        self.open_display()
 
446
        open_display()
427
447
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
428
448
        dialog = PreferencesWindow()
429
449
        dialog.run()
467
487
 
468
488
class cmd_ginit(GTKCommand):
469
489
    def run(self):
470
 
        self.open_display()
 
490
        open_display()
471
491
        from initialize import InitDialog
472
492
        dialog = InitDialog(os.path.abspath(os.path.curdir))
473
493
        dialog.run()
477
497
    def run(self):
478
498
        br = branch.Branch.open_containing('.')[0]
479
499
        
480
 
        gtk = self.open_display()
 
500
        gtk = open_display()
481
501
        from tags import TagsWindow
482
502
        window = TagsWindow(br)
483
503
        window.show()
514
534
 
515
535
    def run(self):
516
536
        from notify import NotifyPopupMenu
517
 
        gtk = self.open_display()
 
537
        gtk = open_display()
518
538
        menu = NotifyPopupMenu()
519
 
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
539
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
520
540
        icon.connect('popup-menu', menu.display)
521
541
 
522
542
        import cgi
529
549
        from bzrlib.transport import get_transport
530
550
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
531
551
            import dbus.glib
532
 
        from bzrlib.plugins.dbus import activity
 
552
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
533
553
        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
554
 
539
555
        def catch_branch(revision_id, urls):
540
556
            # TODO: show all the urls, or perhaps choose the 'best'.
571
587
            except Exception, e:
572
588
                print e
573
589
                raise
574
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
575
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
590
        bus.add_signal_receiver(catch_branch,
 
591
                                dbus_interface=BROADCAST_INTERFACE,
 
592
                                signal_name="Revision")
576
593
        pynotify.init("bzr commit-notify")
577
594
        gtk.main()
578
595
 
675
692
register_command(cmd_test_gtk)
676
693
 
677
694
 
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
 
 
714
695
 
715
696
import gettext
716
697
gettext.install('olive-gtk')
717
698
 
 
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
718
702
 
719
703
class NoDisplayError(BzrCommandError):
720
704
    """gtk could not find a proper display"""