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