/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:04:44 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629190444-3hhmoc5fsoknrvet
Re-enable signature showing.

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 
 
22
gcommit           GTK+ commit dialog.
23
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
"""
35
36
 
36
37
import bzrlib
37
38
 
38
 
version_info = (0, 92, 0, 'dev', 0)
 
39
version_info = (0, 95, 0, 'dev', 1)
39
40
 
40
41
if version_info[3] == 'final':
41
42
    version_string = '%d.%d.%d' % version_info[:3]
43
44
    version_string = '%d.%d.%d%s%d' % version_info
44
45
__version__ = version_string
45
46
 
 
47
required_bzrlib = (1, 3)
 
48
 
46
49
def check_bzrlib_version(desired):
47
50
    """Check that bzrlib is compatible.
48
51
 
49
52
    If version is < bzr-gtk version, assume incompatible.
50
 
    If version == bzr-gtk version, assume completely compatible
51
 
    If version == bzr-gtk version + 1, assume compatible, with deprecations
52
 
    Otherwise, assume incompatible.
53
53
    """
54
 
    desired_plus = (desired[0], desired[1]+1)
55
54
    bzrlib_version = bzrlib.version_info[:2]
56
 
    if bzrlib_version == desired or (bzrlib_version == desired_plus and
57
 
                                     bzrlib.version_info[3] == 'dev'):
58
 
        return
59
55
    try:
60
56
        from bzrlib.trace import warning
61
57
    except ImportError:
66
62
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
67
63
                ' %s.' % (bzrlib.__version__, __version__))
68
64
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
69
 
    else:
70
 
        warning('bzr-gtk is not up to date with installed bzr version %s.'
71
 
                ' \nThere should be a newer version available, e.g. %i.%i.' 
72
 
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
73
65
 
74
66
 
75
67
if version_info[2] == "final":
76
 
    check_bzrlib_version(version_info[:2])
 
68
    check_bzrlib_version(required_bzrlib)
77
69
 
78
70
from bzrlib.trace import warning
79
71
if __name__ != 'bzrlib.plugins.gtk':
85
77
    branch,
86
78
    builtins,
87
79
    errors,
 
80
    merge_directive,
88
81
    workingtree,
89
82
    )
90
83
""")
115
108
    return os.path.dirname(__file__)
116
109
 
117
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
 
118
133
class GTKCommand(Command):
119
134
    """Abstract class providing GTK specific run commands."""
120
135
 
121
 
    def open_display(self):
122
 
        pygtk = import_pygtk()
123
 
        try:
124
 
            import gtk
125
 
        except RuntimeError, e:
126
 
            if str(e) == "could not open display":
127
 
                raise NoDisplayError
128
 
        set_ui_factory()
129
 
        return gtk
130
 
 
131
136
    def run(self):
132
 
        self.open_display()
 
137
        open_display()
133
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
134
139
        dialog.run()
135
140
 
163
168
 
164
169
    def run(self, location="."):
165
170
        (br, path) = branch.Branch.open_containing(location)
166
 
        self.open_display()
 
171
        open_display()
167
172
        from push import PushDialog
168
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
169
174
        dialog.run()
188
193
            if revision is not None:
189
194
                if len(revision) == 1:
190
195
                    tree1 = wt
191
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
192
197
                    tree2 = branch.repository.revision_tree(revision_id)
193
198
                elif len(revision) == 2:
194
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
195
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
196
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
197
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
198
203
            else:
199
204
                tree1 = wt
221
226
            wt.unlock()
222
227
 
223
228
 
224
 
def start_viz_window(branch, revision, limit=None):
 
229
def start_viz_window(branch, revisions, limit=None):
225
230
    """Start viz on branch with revision revision.
226
231
    
227
232
    :return: The viz window object.
228
233
    """
229
 
    from viz.branchwin import BranchWindow
230
 
    branch.lock_read()
231
 
    pp = BranchWindow()
232
 
    pp.set_branch(branch, revision, limit)
233
 
    # cleanup locks when the window is closed
234
 
    pp.connect("destroy", lambda w: branch.unlock())
235
 
    return pp
 
234
    from viz import BranchWindow
 
235
    return BranchWindow(branch, revisions, limit)
236
236
 
237
237
 
238
238
class cmd_visualise(Command):
248
248
        "revision",
249
249
        Option('limit', "Maximum number of revisions to display.",
250
250
               int, 'count')]
251
 
    takes_args = [ "location?" ]
 
251
    takes_args = [ "locations*" ]
252
252
    aliases = [ "visualize", "vis", "viz" ]
253
253
 
254
 
    def run(self, location=".", revision=None, limit=None):
 
254
    def run(self, locations_list, revision=None, limit=None):
255
255
        set_ui_factory()
256
 
        (br, path) = branch.Branch.open_containing(location)
257
 
        br.lock_read()
258
 
        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)
259
261
            if revision is None:
260
 
                revid = br.last_revision()
261
 
                if revid is None:
262
 
                    return
 
262
                revids.append(br.last_revision())
263
263
            else:
264
 
                (revno, revid) = revision[0].in_history(br)
265
 
 
266
 
            import gtk
267
 
            pp = start_viz_window(br, revid, limit)
268
 
            pp.connect("destroy", lambda w: gtk.main_quit())
269
 
            pp.show()
270
 
            gtk.main()
271
 
        finally:
272
 
            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()
273
270
 
274
271
 
275
272
class cmd_gannotate(GTKCommand):
289
286
    aliases = ["gblame", "gpraise"]
290
287
    
291
288
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = self.open_display()
 
289
        gtk = open_display()
293
290
 
294
291
        try:
295
292
            line = int(line)
314
311
        if revision is not None:
315
312
            if len(revision) != 1:
316
313
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
318
315
            tree = br.repository.revision_tree(revision_id)
319
316
        else:
320
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
318
 
322
 
        window = GAnnotateWindow(all, plain)
 
319
        window = GAnnotateWindow(all, plain, branch=br)
323
320
        window.connect("destroy", lambda w: gtk.main_quit())
324
 
        window.set_title(path + " - gannotate")
325
321
        config = GAnnotateConfig(window)
326
322
        window.show()
327
323
        br.lock_read()
349
345
 
350
346
    def run(self, filename=None):
351
347
        import os
352
 
        self.open_display()
 
348
        open_display()
353
349
        from commit import CommitDialog
354
350
        from bzrlib.errors import (BzrCommandError,
355
351
                                   NotBranchError,
362
358
            br = wt.branch
363
359
        except NoWorkingTree, e:
364
360
            from dialog import error_dialog
365
 
            error_dialog(_('Directory does not have a working tree'),
366
 
                         _('Operation aborted.'))
 
361
            error_dialog(_i18n('Directory does not have a working tree'),
 
362
                         _i18n('Operation aborted.'))
367
363
            return 1 # should this be retval=3?
368
364
 
369
365
        # It is a good habit to keep things locked for the duration, but it
386
382
    
387
383
    aliases = [ "gst" ]
388
384
    takes_args = ['PATH?']
389
 
    takes_options = []
 
385
    takes_options = ['revision']
390
386
 
391
 
    def run(self, path='.'):
 
387
    def run(self, path='.', revision=None):
392
388
        import os
393
 
        gtk = self.open_display()
 
389
        gtk = open_display()
394
390
        from status import StatusDialog
395
391
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
396
 
        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)
397
403
        status.connect("destroy", gtk.main_quit)
398
404
        status.run()
399
405
 
400
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
 
401
426
 
402
427
class cmd_gconflicts(GTKCommand):
403
 
    """ GTK+ conflicts.
 
428
    """GTK+ conflicts.
404
429
    
405
430
    Select files from the list of conflicts and run an external utility to
406
431
    resolve them.
407
432
    """
408
433
    def run(self):
409
434
        (wt, path) = workingtree.WorkingTree.open_containing('.')
410
 
        self.open_display()
 
435
        open_display()
411
436
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
412
437
        dialog = ConflictsDialog(wt)
413
438
        dialog.run()
414
439
 
415
440
 
416
 
 
417
441
class cmd_gpreferences(GTKCommand):
418
442
    """ GTK+ preferences dialog.
419
443
 
420
444
    """
421
445
    def run(self):
422
 
        self.open_display()
 
446
        open_display()
423
447
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
424
448
        dialog = PreferencesWindow()
425
449
        dialog.run()
426
450
 
427
451
 
428
 
 
429
452
class cmd_gmissing(Command):
430
453
    """ GTK+ missing revisions dialog.
431
454
 
464
487
 
465
488
class cmd_ginit(GTKCommand):
466
489
    def run(self):
467
 
        self.open_display()
 
490
        open_display()
468
491
        from initialize import InitDialog
469
492
        dialog = InitDialog(os.path.abspath(os.path.curdir))
470
493
        dialog.run()
474
497
    def run(self):
475
498
        br = branch.Branch.open_containing('.')[0]
476
499
        
477
 
        gtk = self.open_display()
 
500
        gtk = open_display()
478
501
        from tags import TagsWindow
479
502
        window = TagsWindow(br)
480
503
        window.show()
482
505
 
483
506
 
484
507
commands = [
 
508
    cmd_gannotate, 
 
509
    cmd_gbranch,
 
510
    cmd_gcheckout, 
 
511
    cmd_gcommit, 
 
512
    cmd_gconflicts, 
 
513
    cmd_gdiff,
 
514
    cmd_ginit,
485
515
    cmd_gmissing, 
486
516
    cmd_gpreferences, 
487
 
    cmd_gconflicts, 
 
517
    cmd_gpush, 
 
518
    cmd_gsend,
488
519
    cmd_gstatus,
489
 
    cmd_gcommit, 
490
 
    cmd_gannotate, 
491
 
    cmd_visualise, 
492
 
    cmd_gdiff,
493
 
    cmd_gpush, 
494
 
    cmd_gcheckout, 
495
 
    cmd_gbranch,
496
 
    cmd_ginit,
497
 
    cmd_gtags
 
520
    cmd_gtags,
 
521
    cmd_visualise
498
522
    ]
499
523
 
500
524
for cmd in commands:
510
534
 
511
535
    def run(self):
512
536
        from notify import NotifyPopupMenu
513
 
        gtk = self.open_display()
 
537
        gtk = open_display()
514
538
        menu = NotifyPopupMenu()
515
 
        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"))
516
540
        icon.connect('popup-menu', menu.display)
517
541
 
518
542
        import cgi
525
549
        from bzrlib.transport import get_transport
526
550
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
527
551
            import dbus.glib
528
 
        from bzrlib.plugins.dbus import activity
 
552
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
529
553
        bus = dbus.SessionBus()
530
 
        # get the object so we can subscribe to callbacks from it.
531
 
        broadcast_service = bus.get_object(
532
 
            activity.Broadcast.DBUS_NAME,
533
 
            activity.Broadcast.DBUS_PATH)
534
554
 
535
555
        def catch_branch(revision_id, urls):
536
556
            # TODO: show all the urls, or perhaps choose the 'best'.
567
587
            except Exception, e:
568
588
                print e
569
589
                raise
570
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
571
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
590
        bus.add_signal_receiver(catch_branch,
 
591
                                dbus_interface=BROADCAST_INTERFACE,
 
592
                                signal_name="Revision")
572
593
        pynotify.init("bzr commit-notify")
573
594
        gtk.main()
574
595
 
614
635
 
615
636
    takes_options = ['verbose',
616
637
                     Option('one', short_name='1',
617
 
                            help='stop when one test fails'),
618
 
                     Option('benchmark', help='run the benchmarks.'),
 
638
                            help='Stop when one test fails.'),
 
639
                     Option('benchmark', help='Run the benchmarks.'),
619
640
                     Option('lsprof-timed',
620
 
                     help='generate lsprof output for benchmarked'
 
641
                     help='Generate lsprof output for benchmarked'
621
642
                          ' sections of code.'),
622
643
                     Option('list-only',
623
 
                     help='list the tests instead of running them'),
 
644
                     help='List the tests instead of running them.'),
624
645
                     Option('randomize', type=str, argname="SEED",
625
 
                     help='randomize the order of tests using the given'
626
 
                          ' seed or "now" for the current time'),
 
646
                     help='Randomize the order of tests using the given'
 
647
                          ' seed or "now" for the current time.'),
627
648
                    ]
628
649
    takes_args = ['testspecs*']
629
650
 
671
692
register_command(cmd_test_gtk)
672
693
 
673
694
 
 
695
 
674
696
import gettext
675
697
gettext.install('olive-gtk')
676
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
677
702
 
678
703
class NoDisplayError(BzrCommandError):
679
704
    """gtk could not find a proper display"""
689
714
    default_encoding = sys.getdefaultencoding()
690
715
    try:
691
716
        result = TestSuite()
 
717
        try:
 
718
            import_pygtk()
 
719
        except errors.BzrCommandError:
 
720
            return result
692
721
        result.addTest(tests.test_suite())
693
722
    finally:
694
723
        if sys.getdefaultencoding() != default_encoding: