/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: 2007-07-23 12:03:29 UTC
  • Revision ID: jelmer@samba.org-20070723120329-jh92obhhs519edga
Use application path to find icons.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
19
19
gannotate         GTK+ annotate. 
20
20
gbranch           GTK+ branching. 
21
21
gcheckout         GTK+ checkout. 
22
 
gcommit           GTK+ commit dialog.
23
 
gconflicts        GTK+ conflicts. 
 
22
gcommit           GTK+ commit dialog 
 
23
gconflicts        GTK+ push. 
24
24
gdiff             Show differences in working tree in a GTK+ Window. 
25
25
ginit             Initialise a new branch.
26
26
gmissing          GTK+ missing revisions dialog. 
27
27
gpreferences      GTK+ preferences dialog. 
28
 
gpush             GTK+ push.
29
 
gsend             GTK+ send merge directive.
30
 
gstatus           GTK+ status dialog.
 
28
gpush             GTK+ push. 
 
29
gstatus           GTK+ status dialog 
31
30
gtags             Manage branch tags.
32
31
visualise         Graphically visualise this branch. 
33
32
"""
34
33
 
35
 
import sys
36
 
 
37
34
import bzrlib
38
35
 
39
 
version_info = (0, 95, 0, 'dev', 1)
40
 
 
41
 
if version_info[3] == 'final':
42
 
    version_string = '%d.%d.%d' % version_info[:3]
43
 
else:
44
 
    version_string = '%d.%d.%d%s%d' % version_info
45
 
__version__ = version_string
46
 
 
47
 
required_bzrlib = (1, 3)
 
36
__version__ = '0.19.0'
 
37
version_info = tuple(int(n) for n in __version__.split('.'))
 
38
 
48
39
 
49
40
def check_bzrlib_version(desired):
50
41
    """Check that bzrlib is compatible.
51
42
 
52
43
    If version is < bzr-gtk version, assume incompatible.
 
44
    If version == bzr-gtk version, assume completely compatible
 
45
    If version == bzr-gtk version + 1, assume compatible, with deprecations
 
46
    Otherwise, assume incompatible.
53
47
    """
 
48
    desired_plus = (desired[0], desired[1]+1)
54
49
    bzrlib_version = bzrlib.version_info[:2]
 
50
    if bzrlib_version == desired or (bzrlib_version == desired_plus and
 
51
                                     bzrlib.version_info[3] == 'dev'):
 
52
        return
55
53
    try:
56
54
        from bzrlib.trace import warning
57
55
    except ImportError:
59
57
        from warnings import warn as warning
60
58
    if bzrlib_version < desired:
61
59
        from bzrlib.errors import BzrError
62
 
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
 
60
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
63
61
                ' %s.' % (bzrlib.__version__, __version__))
64
 
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
65
 
 
66
 
 
67
 
if version_info[2] == "final":
68
 
    check_bzrlib_version(required_bzrlib)
 
62
        raise BzrError('Version mismatch: %r' % version_info)
 
63
    else:
 
64
        warning('bzr-gtk is not up to date with installed bzr version %s.'
 
65
                ' \nThere should be a newer version available, e.g. %i.%i.' 
 
66
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
 
67
 
 
68
 
 
69
check_bzrlib_version(version_info[:2])
69
70
 
70
71
from bzrlib.trace import warning
71
72
if __name__ != 'bzrlib.plugins.gtk':
75
76
lazy_import(globals(), """
76
77
from bzrlib import (
77
78
    branch,
78
 
    builtins,
79
79
    errors,
80
 
    merge_directive,
81
80
    workingtree,
82
81
    )
83
82
""")
108
107
    return os.path.dirname(__file__)
109
108
 
110
109
 
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
110
class GTKCommand(Command):
134
111
    """Abstract class providing GTK specific run commands."""
135
112
 
 
113
    def open_display(self):
 
114
        pygtk = import_pygtk()
 
115
        try:
 
116
            import gtk
 
117
        except RuntimeError, e:
 
118
            if str(e) == "could not open display":
 
119
                raise NoDisplayError
 
120
        set_ui_factory()
 
121
        return gtk
 
122
 
136
123
    def run(self):
137
 
        open_display()
 
124
        self.open_display()
138
125
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
139
126
        dialog.run()
140
127
 
168
155
 
169
156
    def run(self, location="."):
170
157
        (br, path) = branch.Branch.open_containing(location)
171
 
        open_display()
 
158
        self.open_display()
172
159
        from push import PushDialog
173
160
        dialog = PushDialog(br.repository, br.last_revision(), br)
174
161
        dialog.run()
193
180
            if revision is not None:
194
181
                if len(revision) == 1:
195
182
                    tree1 = wt
196
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
183
                    revision_id = revision[0].in_history(branch).rev_id
197
184
                    tree2 = branch.repository.revision_tree(revision_id)
198
185
                elif len(revision) == 2:
199
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
186
                    revision_id_0 = revision[0].in_history(branch).rev_id
200
187
                    tree2 = branch.repository.revision_tree(revision_id_0)
201
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
188
                    revision_id_1 = revision[1].in_history(branch).rev_id
202
189
                    tree1 = branch.repository.revision_tree(revision_id_1)
203
190
            else:
204
191
                tree1 = wt
226
213
            wt.unlock()
227
214
 
228
215
 
229
 
def start_viz_window(branch, revisions, limit=None):
 
216
def start_viz_window(branch, revision, limit=None):
230
217
    """Start viz on branch with revision revision.
231
218
    
232
219
    :return: The viz window object.
233
220
    """
234
 
    from viz import BranchWindow
235
 
    return BranchWindow(branch, revisions, limit)
 
221
    from viz.branchwin import BranchWindow
 
222
    branch.lock_read()
 
223
    pp = BranchWindow()
 
224
    pp.set_branch(branch, revision, limit)
 
225
    # cleanup locks when the window is closed
 
226
    pp.connect("destroy", lambda w: branch.unlock())
 
227
    return pp
236
228
 
237
229
 
238
230
class cmd_visualise(Command):
248
240
        "revision",
249
241
        Option('limit', "Maximum number of revisions to display.",
250
242
               int, 'count')]
251
 
    takes_args = [ "locations*" ]
 
243
    takes_args = [ "location?" ]
252
244
    aliases = [ "visualize", "vis", "viz" ]
253
245
 
254
 
    def run(self, locations_list, revision=None, limit=None):
 
246
    def run(self, location=".", revision=None, limit=None):
255
247
        set_ui_factory()
256
 
        if locations_list is None:
257
 
            locations_list = ["."]
258
 
        revids = []
259
 
        for location in locations_list:
260
 
            (br, path) = branch.Branch.open_containing(location)
 
248
        (br, path) = branch.Branch.open_containing(location)
 
249
        br.lock_read()
 
250
        try:
261
251
            if revision is None:
262
 
                revids.append(br.last_revision())
 
252
                revid = br.last_revision()
 
253
                if revid is None:
 
254
                    return
263
255
            else:
264
 
                revids.append(revision[0].as_revision_id(br))
265
 
        import gtk
266
 
        pp = start_viz_window(br, revids, limit)
267
 
        pp.connect("destroy", lambda w: gtk.main_quit())
268
 
        pp.show()
269
 
        gtk.main()
 
256
                (revno, revid) = revision[0].in_history(br)
 
257
 
 
258
            import gtk
 
259
            pp = start_viz_window(br, revid, limit)
 
260
            pp.connect("destroy", lambda w: gtk.main_quit())
 
261
            pp.show()
 
262
            gtk.main()
 
263
        finally:
 
264
            br.unlock()
270
265
 
271
266
 
272
267
class cmd_gannotate(GTKCommand):
286
281
    aliases = ["gblame", "gpraise"]
287
282
    
288
283
    def run(self, filename, all=False, plain=False, line='1', revision=None):
289
 
        gtk = open_display()
 
284
        gtk = self.open_display()
290
285
 
291
286
        try:
292
287
            line = int(line)
311
306
        if revision is not None:
312
307
            if len(revision) != 1:
313
308
                raise BzrCommandError("Only 1 revion may be specified.")
314
 
            revision_id = revision[0].as_revision_id(br)
 
309
            revision_id = revision[0].in_history(br).rev_id
315
310
            tree = br.repository.revision_tree(revision_id)
316
311
        else:
317
312
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
318
313
 
319
 
        window = GAnnotateWindow(all, plain, branch=br)
 
314
        window = GAnnotateWindow(all, plain)
320
315
        window.connect("destroy", lambda w: gtk.main_quit())
 
316
        window.set_title(path + " - gannotate")
321
317
        config = GAnnotateConfig(window)
322
318
        window.show()
323
319
        br.lock_read()
338
334
    """GTK+ commit dialog
339
335
 
340
336
    Graphical user interface for committing revisions"""
341
 
 
 
337
    
342
338
    aliases = [ "gci" ]
343
339
    takes_args = []
344
340
    takes_options = []
345
341
 
346
342
    def run(self, filename=None):
347
343
        import os
348
 
        open_display()
 
344
        self.open_display()
349
345
        from commit import CommitDialog
350
346
        from bzrlib.errors import (BzrCommandError,
351
347
                                   NotBranchError,
357
353
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
358
354
            br = wt.branch
359
355
        except NoWorkingTree, e:
360
 
            from dialog import error_dialog
361
 
            error_dialog(_i18n('Directory does not have a working tree'),
362
 
                         _i18n('Operation aborted.'))
363
 
            return 1 # should this be retval=3?
364
 
 
365
 
        # It is a good habit to keep things locked for the duration, but it
366
 
        # could cause difficulties if someone wants to do things in another
367
 
        # window... We could lock_read() until we actually go to commit
368
 
        # changes... Just a thought.
369
 
        wt.lock_write()
370
 
        try:
371
 
            dlg = CommitDialog(wt)
372
 
            return dlg.run()
373
 
        finally:
374
 
            wt.unlock()
 
356
            path = e.base
 
357
            (br, path) = branch.Branch.open_containing(path)
 
358
 
 
359
        commit = CommitDialog(wt, path, not br)
 
360
        commit.run()
 
361
 
375
362
 
376
363
 
377
364
class cmd_gstatus(GTKCommand):
382
369
    
383
370
    aliases = [ "gst" ]
384
371
    takes_args = ['PATH?']
385
 
    takes_options = ['revision']
 
372
    takes_options = []
386
373
 
387
 
    def run(self, path='.', revision=None):
 
374
    def run(self, path='.'):
388
375
        import os
389
 
        gtk = open_display()
 
376
        gtk = self.open_display()
390
377
        from status import StatusDialog
391
378
        (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)
 
379
        status = StatusDialog(wt, wt_path)
403
380
        status.connect("destroy", gtk.main_quit)
404
381
        status.run()
405
382
 
406
383
 
407
 
class cmd_gsend(GTKCommand):
408
 
    """GTK+ send merge directive.
409
 
 
410
 
    """
411
 
    def run(self):
412
 
        (br, path) = branch.Branch.open_containing(".")
413
 
        gtk = open_display()
414
 
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
415
 
        from StringIO import StringIO
416
 
        dialog = SendMergeDirectiveDialog(br)
417
 
        if dialog.run() == gtk.RESPONSE_OK:
418
 
            outf = StringIO()
419
 
            outf.writelines(dialog.get_merge_directive().to_lines())
420
 
            mail_client = br.get_config().get_mail_client()
421
 
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
422
 
                outf.getvalue())
423
 
 
424
 
            
425
 
 
426
384
 
427
385
class cmd_gconflicts(GTKCommand):
428
 
    """GTK+ conflicts.
 
386
    """ GTK+ push.
429
387
    
430
 
    Select files from the list of conflicts and run an external utility to
431
 
    resolve them.
432
388
    """
433
389
    def run(self):
434
390
        (wt, path) = workingtree.WorkingTree.open_containing('.')
435
 
        open_display()
 
391
        self.open_display()
436
392
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
437
393
        dialog = ConflictsDialog(wt)
438
394
        dialog.run()
439
395
 
440
396
 
 
397
 
441
398
class cmd_gpreferences(GTKCommand):
442
399
    """ GTK+ preferences dialog.
443
400
 
444
401
    """
445
402
    def run(self):
446
 
        open_display()
 
403
        self.open_display()
447
404
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
448
405
        dialog = PreferencesWindow()
449
406
        dialog.run()
450
407
 
451
408
 
 
409
 
452
410
class cmd_gmissing(Command):
453
411
    """ GTK+ missing revisions dialog.
454
412
 
487
445
 
488
446
class cmd_ginit(GTKCommand):
489
447
    def run(self):
490
 
        open_display()
 
448
        self.open_display()
491
449
        from initialize import InitDialog
492
450
        dialog = InitDialog(os.path.abspath(os.path.curdir))
493
451
        dialog.run()
497
455
    def run(self):
498
456
        br = branch.Branch.open_containing('.')[0]
499
457
        
500
 
        gtk = open_display()
 
458
        gtk = self.open_display()
501
459
        from tags import TagsWindow
502
460
        window = TagsWindow(br)
503
461
        window.show()
505
463
 
506
464
 
507
465
commands = [
 
466
    cmd_gmissing, 
 
467
    cmd_gpreferences, 
 
468
    cmd_gconflicts, 
 
469
    cmd_gstatus,
 
470
    cmd_gcommit, 
508
471
    cmd_gannotate, 
 
472
    cmd_visualise, 
 
473
    cmd_gdiff,
 
474
    cmd_gpush, 
 
475
    cmd_gcheckout, 
509
476
    cmd_gbranch,
510
 
    cmd_gcheckout, 
511
 
    cmd_gcommit, 
512
 
    cmd_gconflicts, 
513
 
    cmd_gdiff,
514
477
    cmd_ginit,
515
 
    cmd_gmissing, 
516
 
    cmd_gpreferences, 
517
 
    cmd_gpush, 
518
 
    cmd_gsend,
519
 
    cmd_gstatus,
520
 
    cmd_gtags,
521
 
    cmd_visualise
 
478
    cmd_gtags
522
479
    ]
523
480
 
524
481
for cmd in commands:
534
491
 
535
492
    def run(self):
536
493
        from notify import NotifyPopupMenu
537
 
        gtk = open_display()
 
494
        gtk = self.open_display()
538
495
        menu = NotifyPopupMenu()
539
 
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
 
496
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
540
497
        icon.connect('popup-menu', menu.display)
541
498
 
542
499
        import cgi
549
506
        from bzrlib.transport import get_transport
550
507
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
551
508
            import dbus.glib
552
 
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
 
509
        from bzrlib.plugins.dbus import activity
553
510
        bus = dbus.SessionBus()
 
511
        # get the object so we can subscribe to callbacks from it.
 
512
        broadcast_service = bus.get_object(
 
513
            activity.Broadcast.DBUS_NAME,
 
514
            activity.Broadcast.DBUS_PATH)
554
515
 
555
516
        def catch_branch(revision_id, urls):
556
517
            # TODO: show all the urls, or perhaps choose the 'best'.
587
548
            except Exception, e:
588
549
                print e
589
550
                raise
590
 
        bus.add_signal_receiver(catch_branch,
591
 
                                dbus_interface=BROADCAST_INTERFACE,
592
 
                                signal_name="Revision")
 
551
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
552
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
593
553
        pynotify.init("bzr commit-notify")
594
554
        gtk.main()
595
555
 
596
556
register_command(cmd_commit_notify)
597
557
 
598
558
 
599
 
class cmd_gselftest(GTKCommand):
600
 
    """Version of selftest that displays a notification at the end"""
601
 
 
602
 
    takes_args = builtins.cmd_selftest.takes_args
603
 
    takes_options = builtins.cmd_selftest.takes_options
604
 
    _see_also = ['selftest']
605
 
 
606
 
    def run(self, *args, **kwargs):
607
 
        import cgi
608
 
        import sys
609
 
        default_encoding = sys.getdefaultencoding()
610
 
        # prevent gtk from blowing up later
611
 
        gtk = import_pygtk()
612
 
        # prevent gtk from messing with default encoding
613
 
        import pynotify
614
 
        if sys.getdefaultencoding() != default_encoding:
615
 
            reload(sys)
616
 
            sys.setdefaultencoding(default_encoding)
617
 
        result = builtins.cmd_selftest().run(*args, **kwargs)
618
 
        if result == 0:
619
 
            summary = 'Success'
620
 
            body = 'Selftest succeeded in "%s"' % os.getcwd()
621
 
        if result == 1:
622
 
            summary = 'Failure'
623
 
            body = 'Selftest failed in "%s"' % os.getcwd()
624
 
        pynotify.init("bzr gselftest")
625
 
        note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
626
 
        note.set_timeout(pynotify.EXPIRES_NEVER)
627
 
        note.show()
628
 
 
629
 
 
630
 
register_command(cmd_gselftest)
631
 
 
632
 
 
633
 
class cmd_test_gtk(GTKCommand):
634
 
    """Version of selftest that just runs the gtk test suite."""
635
 
 
636
 
    takes_options = ['verbose',
637
 
                     Option('one', short_name='1',
638
 
                            help='Stop when one test fails.'),
639
 
                     Option('benchmark', help='Run the benchmarks.'),
640
 
                     Option('lsprof-timed',
641
 
                     help='Generate lsprof output for benchmarked'
642
 
                          ' sections of code.'),
643
 
                     Option('list-only',
644
 
                     help='List the tests instead of running them.'),
645
 
                     Option('randomize', type=str, argname="SEED",
646
 
                     help='Randomize the order of tests using the given'
647
 
                          ' seed or "now" for the current time.'),
648
 
                    ]
649
 
    takes_args = ['testspecs*']
650
 
 
651
 
    def run(self, verbose=None, one=False, benchmark=None,
652
 
            lsprof_timed=None, list_only=False, randomize=None,
653
 
            testspecs_list=None):
654
 
        from bzrlib import __path__ as bzrlib_path
655
 
        from bzrlib.tests import selftest
656
 
 
657
 
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
658
 
        if benchmark:
659
 
            print 'No benchmarks yet'
660
 
            return 3
661
 
 
662
 
            test_suite_factory = bench_suite
663
 
            if verbose is None:
664
 
                verbose = True
665
 
            # TODO: should possibly lock the history file...
666
 
            benchfile = open(".perf_history", "at", buffering=1)
667
 
        else:
668
 
            test_suite_factory = test_suite
669
 
            if verbose is None:
670
 
                verbose = False
671
 
            benchfile = None
672
 
 
673
 
        if testspecs_list is not None:
674
 
            pattern = '|'.join(testspecs_list)
675
 
        else:
676
 
            pattern = ".*"
677
 
 
678
 
        try:
679
 
            result = selftest(verbose=verbose,
680
 
                              pattern=pattern,
681
 
                              stop_on_failure=one,
682
 
                              test_suite_factory=test_suite_factory,
683
 
                              lsprof_timed=lsprof_timed,
684
 
                              bench_history=benchfile,
685
 
                              list_only=list_only,
686
 
                              random_seed=randomize,
687
 
                             )
688
 
        finally:
689
 
            if benchfile is not None:
690
 
                benchfile.close()
691
 
 
692
 
register_command(cmd_test_gtk)
693
 
 
694
 
 
695
 
 
696
559
import gettext
697
560
gettext.install('olive-gtk')
698
561
 
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
562
 
703
563
class NoDisplayError(BzrCommandError):
704
564
    """gtk could not find a proper display"""
714
574
    default_encoding = sys.getdefaultencoding()
715
575
    try:
716
576
        result = TestSuite()
717
 
        try:
718
 
            import_pygtk()
719
 
        except errors.BzrCommandError:
720
 
            return result
721
577
        result.addTest(tests.test_suite())
722
578
    finally:
723
579
        if sys.getdefaultencoding() != default_encoding: