/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 19:07:23 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629190723-l8mzg9x4oec0lhsl
Return cleartext from seahorse module

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+ push. 
 
22
gcommit           GTK+ commit dialog.
 
23
gconflicts        GTK+ conflicts. 
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
 
gstatus           GTK+ status dialog 
 
28
gpush             GTK+ push.
 
29
gsend             GTK+ send merge directive.
 
30
gstatus           GTK+ status dialog.
30
31
gtags             Manage branch tags.
31
32
visualise         Graphically visualise this branch. 
32
33
"""
33
34
 
 
35
import sys
 
36
 
34
37
import bzrlib
35
38
 
36
 
__version__ = '0.19.0'
37
 
version_info = tuple(int(n) for n in __version__.split('.'))
38
 
 
 
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)
39
48
 
40
49
def check_bzrlib_version(desired):
41
50
    """Check that bzrlib is compatible.
42
51
 
43
52
    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.
47
53
    """
48
 
    desired_plus = (desired[0], desired[1]+1)
49
54
    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
53
55
    try:
54
56
        from bzrlib.trace import warning
55
57
    except ImportError:
57
59
        from warnings import warn as warning
58
60
    if bzrlib_version < desired:
59
61
        from bzrlib.errors import BzrError
60
 
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
 
62
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
61
63
                ' %s.' % (bzrlib.__version__, __version__))
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])
 
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)
70
69
 
71
70
from bzrlib.trace import warning
72
71
if __name__ != 'bzrlib.plugins.gtk':
76
75
lazy_import(globals(), """
77
76
from bzrlib import (
78
77
    branch,
 
78
    builtins,
79
79
    errors,
 
80
    merge_directive,
80
81
    workingtree,
81
82
    )
82
83
""")
107
108
    return os.path.dirname(__file__)
108
109
 
109
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
 
110
133
class GTKCommand(Command):
111
134
    """Abstract class providing GTK specific run commands."""
112
135
 
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
 
 
123
136
    def run(self):
124
 
        self.open_display()
 
137
        open_display()
125
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
126
139
        dialog.run()
127
140
 
155
168
 
156
169
    def run(self, location="."):
157
170
        (br, path) = branch.Branch.open_containing(location)
158
 
        self.open_display()
 
171
        open_display()
159
172
        from push import PushDialog
160
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
161
174
        dialog.run()
180
193
            if revision is not None:
181
194
                if len(revision) == 1:
182
195
                    tree1 = wt
183
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
184
197
                    tree2 = branch.repository.revision_tree(revision_id)
185
198
                elif len(revision) == 2:
186
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
187
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
188
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
189
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
190
203
            else:
191
204
                tree1 = wt
213
226
            wt.unlock()
214
227
 
215
228
 
216
 
def start_viz_window(branch, revision, limit=None):
 
229
def start_viz_window(branch, revisions, limit=None):
217
230
    """Start viz on branch with revision revision.
218
231
    
219
232
    :return: The viz window object.
220
233
    """
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
 
234
    from viz import BranchWindow
 
235
    return BranchWindow(branch, revisions, limit)
228
236
 
229
237
 
230
238
class cmd_visualise(Command):
240
248
        "revision",
241
249
        Option('limit', "Maximum number of revisions to display.",
242
250
               int, 'count')]
243
 
    takes_args = [ "location?" ]
 
251
    takes_args = [ "locations*" ]
244
252
    aliases = [ "visualize", "vis", "viz" ]
245
253
 
246
 
    def run(self, location=".", revision=None, limit=None):
 
254
    def run(self, locations_list, revision=None, limit=None):
247
255
        set_ui_factory()
248
 
        (br, path) = branch.Branch.open_containing(location)
249
 
        br.lock_read()
250
 
        try:
 
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)
251
261
            if revision is None:
252
 
                revid = br.last_revision()
253
 
                if revid is None:
254
 
                    return
 
262
                revids.append(br.last_revision())
255
263
            else:
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()
 
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()
265
270
 
266
271
 
267
272
class cmd_gannotate(GTKCommand):
281
286
    aliases = ["gblame", "gpraise"]
282
287
    
283
288
    def run(self, filename, all=False, plain=False, line='1', revision=None):
284
 
        gtk = self.open_display()
 
289
        gtk = open_display()
285
290
 
286
291
        try:
287
292
            line = int(line)
306
311
        if revision is not None:
307
312
            if len(revision) != 1:
308
313
                raise BzrCommandError("Only 1 revion may be specified.")
309
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
310
315
            tree = br.repository.revision_tree(revision_id)
311
316
        else:
312
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
313
318
 
314
 
        window = GAnnotateWindow(all, plain)
 
319
        window = GAnnotateWindow(all, plain, branch=br)
315
320
        window.connect("destroy", lambda w: gtk.main_quit())
316
 
        window.set_title(path + " - gannotate")
317
321
        config = GAnnotateConfig(window)
318
322
        window.show()
319
323
        br.lock_read()
334
338
    """GTK+ commit dialog
335
339
 
336
340
    Graphical user interface for committing revisions"""
337
 
    
 
341
 
338
342
    aliases = [ "gci" ]
339
343
    takes_args = []
340
344
    takes_options = []
341
345
 
342
346
    def run(self, filename=None):
343
347
        import os
344
 
        self.open_display()
 
348
        open_display()
345
349
        from commit import CommitDialog
346
350
        from bzrlib.errors import (BzrCommandError,
347
351
                                   NotBranchError,
353
357
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
354
358
            br = wt.branch
355
359
        except NoWorkingTree, e:
356
 
            path = e.base
357
 
            (br, path) = branch.Branch.open_containing(path)
358
 
 
359
 
        commit = CommitDialog(wt, path, not br)
360
 
        commit.run()
361
 
 
 
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()
362
375
 
363
376
 
364
377
class cmd_gstatus(GTKCommand):
369
382
    
370
383
    aliases = [ "gst" ]
371
384
    takes_args = ['PATH?']
372
 
    takes_options = []
 
385
    takes_options = ['revision']
373
386
 
374
 
    def run(self, path='.'):
 
387
    def run(self, path='.', revision=None):
375
388
        import os
376
 
        gtk = self.open_display()
 
389
        gtk = open_display()
377
390
        from status import StatusDialog
378
391
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
379
 
        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)
380
403
        status.connect("destroy", gtk.main_quit)
381
404
        status.run()
382
405
 
383
406
 
 
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
 
384
426
 
385
427
class cmd_gconflicts(GTKCommand):
386
 
    """ GTK+ push.
 
428
    """GTK+ conflicts.
387
429
    
 
430
    Select files from the list of conflicts and run an external utility to
 
431
    resolve them.
388
432
    """
389
433
    def run(self):
390
434
        (wt, path) = workingtree.WorkingTree.open_containing('.')
391
 
        self.open_display()
 
435
        open_display()
392
436
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
393
437
        dialog = ConflictsDialog(wt)
394
438
        dialog.run()
395
439
 
396
440
 
397
 
 
398
441
class cmd_gpreferences(GTKCommand):
399
442
    """ GTK+ preferences dialog.
400
443
 
401
444
    """
402
445
    def run(self):
403
 
        self.open_display()
 
446
        open_display()
404
447
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
405
448
        dialog = PreferencesWindow()
406
449
        dialog.run()
407
450
 
408
451
 
409
 
 
410
452
class cmd_gmissing(Command):
411
453
    """ GTK+ missing revisions dialog.
412
454
 
445
487
 
446
488
class cmd_ginit(GTKCommand):
447
489
    def run(self):
448
 
        self.open_display()
 
490
        open_display()
449
491
        from initialize import InitDialog
450
492
        dialog = InitDialog(os.path.abspath(os.path.curdir))
451
493
        dialog.run()
455
497
    def run(self):
456
498
        br = branch.Branch.open_containing('.')[0]
457
499
        
458
 
        gtk = self.open_display()
 
500
        gtk = open_display()
459
501
        from tags import TagsWindow
460
502
        window = TagsWindow(br)
461
503
        window.show()
463
505
 
464
506
 
465
507
commands = [
 
508
    cmd_gannotate, 
 
509
    cmd_gbranch,
 
510
    cmd_gcheckout, 
 
511
    cmd_gcommit, 
 
512
    cmd_gconflicts, 
 
513
    cmd_gdiff,
 
514
    cmd_ginit,
466
515
    cmd_gmissing, 
467
516
    cmd_gpreferences, 
468
 
    cmd_gconflicts, 
 
517
    cmd_gpush, 
 
518
    cmd_gsend,
469
519
    cmd_gstatus,
470
 
    cmd_gcommit, 
471
 
    cmd_gannotate, 
472
 
    cmd_visualise, 
473
 
    cmd_gdiff,
474
 
    cmd_gpush, 
475
 
    cmd_gcheckout, 
476
 
    cmd_gbranch,
477
 
    cmd_ginit,
478
 
    cmd_gtags
 
520
    cmd_gtags,
 
521
    cmd_visualise
479
522
    ]
480
523
 
481
524
for cmd in commands:
491
534
 
492
535
    def run(self):
493
536
        from notify import NotifyPopupMenu
494
 
        gtk = self.open_display()
 
537
        gtk = open_display()
495
538
        menu = NotifyPopupMenu()
496
 
        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"))
497
540
        icon.connect('popup-menu', menu.display)
498
541
 
499
542
        import cgi
506
549
        from bzrlib.transport import get_transport
507
550
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
508
551
            import dbus.glib
509
 
        from bzrlib.plugins.dbus import activity
 
552
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
510
553
        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)
515
554
 
516
555
        def catch_branch(revision_id, urls):
517
556
            # TODO: show all the urls, or perhaps choose the 'best'.
548
587
            except Exception, e:
549
588
                print e
550
589
                raise
551
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
552
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
590
        bus.add_signal_receiver(catch_branch,
 
591
                                dbus_interface=BROADCAST_INTERFACE,
 
592
                                signal_name="Revision")
553
593
        pynotify.init("bzr commit-notify")
554
594
        gtk.main()
555
595
 
556
596
register_command(cmd_commit_notify)
557
597
 
558
598
 
 
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
 
559
696
import gettext
560
697
gettext.install('olive-gtk')
561
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
562
702
 
563
703
class NoDisplayError(BzrCommandError):
564
704
    """gtk could not find a proper display"""
574
714
    default_encoding = sys.getdefaultencoding()
575
715
    try:
576
716
        result = TestSuite()
 
717
        try:
 
718
            import_pygtk()
 
719
        except errors.BzrCommandError:
 
720
            return result
577
721
        result.addTest(tests.test_suite())
578
722
    finally:
579
723
        if sys.getdefaultencoding() != default_encoding: