/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: John Arbash Meinel
  • Date: 2007-10-02 23:08:12 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071002230812-h8i6pq8fwvodute4
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.

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