/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
15
15
"""Graphical support for Bazaar using GTK.
16
16
 
17
17
This plugin includes:
 
18
commit-notify     Start the graphical notifier of commits.
18
19
gannotate         GTK+ annotate. 
19
20
gbranch           GTK+ branching. 
20
21
gcheckout         GTK+ checkout. 
21
 
gcommit           GTK+ commit dialog.
 
22
gcommit           GTK+ commit dialog 
22
23
gconflicts        GTK+ conflicts. 
23
24
gdiff             Show differences in working tree in a GTK+ Window. 
24
25
ginit             Initialise a new branch.
25
 
gmerge            GTK+ merge dialog
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
""")
104
111
    bzrlib.ui.ui_factory = GtkUIFactory()
105
112
 
106
113
 
107
 
def data_basedirs():
108
 
    return [os.path.dirname(__file__),
109
 
             "/usr/share/bzr-gtk", 
110
 
             "/usr/local/share/bzr-gtk"]
111
 
 
112
 
 
113
 
def data_path(*args):
114
 
    for basedir in data_basedirs():
115
 
        path = os.path.join(basedir, *args)
116
 
        if os.path.exists(path):
117
 
            return path
118
 
    return None
119
 
 
120
 
 
121
 
def icon_path(*args):
122
 
    return data_path(os.path.join('icons', *args))
123
 
 
124
 
 
125
 
def open_display():
126
 
    pygtk = import_pygtk()
127
 
    try:
128
 
        import gtk
129
 
    except RuntimeError, e:
130
 
        if str(e) == "could not open display":
131
 
            raise NoDisplayError
132
 
    set_ui_factory()
133
 
    return gtk
134
 
 
 
114
def data_path():
 
115
    return os.path.dirname(__file__)
 
116
 
135
117
 
136
118
class GTKCommand(Command):
137
119
    """Abstract class providing GTK specific run commands."""
138
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
 
139
131
    def run(self):
140
 
        open_display()
 
132
        self.open_display()
141
133
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
134
        dialog.run()
143
135
 
171
163
 
172
164
    def run(self, location="."):
173
165
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
166
        self.open_display()
175
167
        from push import PushDialog
176
168
        dialog = PushDialog(br.repository, br.last_revision(), br)
177
169
        dialog.run()
196
188
            if revision is not None:
197
189
                if len(revision) == 1:
198
190
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
191
                    revision_id = revision[0].in_history(branch).rev_id
200
192
                    tree2 = branch.repository.revision_tree(revision_id)
201
193
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
194
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
195
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
196
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
197
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
198
            else:
207
199
                tree1 = wt
229
221
            wt.unlock()
230
222
 
231
223
 
232
 
def start_viz_window(branch, revisions, limit=None):
 
224
def start_viz_window(branch, revision, limit=None):
233
225
    """Start viz on branch with revision revision.
234
226
    
235
227
    :return: The viz window object.
236
228
    """
237
 
    from viz import BranchWindow
238
 
    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
239
236
 
240
237
 
241
238
class cmd_visualise(Command):
251
248
        "revision",
252
249
        Option('limit', "Maximum number of revisions to display.",
253
250
               int, 'count')]
254
 
    takes_args = [ "locations*" ]
 
251
    takes_args = [ "location?" ]
255
252
    aliases = [ "visualize", "vis", "viz" ]
256
253
 
257
 
    def run(self, locations_list, revision=None, limit=None):
 
254
    def run(self, location=".", revision=None, limit=None):
258
255
        set_ui_factory()
259
 
        if locations_list is None:
260
 
            locations_list = ["."]
261
 
        revids = []
262
 
        for location in locations_list:
263
 
            (br, path) = branch.Branch.open_containing(location)
 
256
        (br, path) = branch.Branch.open_containing(location)
 
257
        br.lock_read()
 
258
        try:
264
259
            if revision is None:
265
 
                revids.append(br.last_revision())
 
260
                revid = br.last_revision()
 
261
                if revid is None:
 
262
                    return
266
263
            else:
267
 
                revids.append(revision[0].as_revision_id(br))
268
 
        import gtk
269
 
        pp = start_viz_window(br, revids, limit)
270
 
        pp.connect("destroy", lambda w: gtk.main_quit())
271
 
        pp.show()
272
 
        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()
273
273
 
274
274
 
275
275
class cmd_gannotate(GTKCommand):
289
289
    aliases = ["gblame", "gpraise"]
290
290
    
291
291
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
292
        gtk = self.open_display()
293
293
 
294
294
        try:
295
295
            line = int(line)
314
314
        if revision is not None:
315
315
            if len(revision) != 1:
316
316
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
317
            revision_id = revision[0].in_history(br).rev_id
318
318
            tree = br.repository.revision_tree(revision_id)
319
319
        else:
320
320
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
321
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
322
        window = GAnnotateWindow(all, plain)
323
323
        window.connect("destroy", lambda w: gtk.main_quit())
 
324
        window.set_title(path + " - gannotate")
324
325
        config = GAnnotateConfig(window)
325
326
        window.show()
326
327
        br.lock_read()
348
349
 
349
350
    def run(self, filename=None):
350
351
        import os
351
 
        open_display()
 
352
        self.open_display()
352
353
        from commit import CommitDialog
353
354
        from bzrlib.errors import (BzrCommandError,
354
355
                                   NotBranchError,
361
362
            br = wt.branch
362
363
        except NoWorkingTree, e:
363
364
            from dialog import error_dialog
364
 
            error_dialog(_i18n('Directory does not have a working tree'),
365
 
                         _i18n('Operation aborted.'))
 
365
            error_dialog(_('Directory does not have a working tree'),
 
366
                         _('Operation aborted.'))
366
367
            return 1 # should this be retval=3?
367
368
 
368
369
        # It is a good habit to keep things locked for the duration, but it
385
386
    
386
387
    aliases = [ "gst" ]
387
388
    takes_args = ['PATH?']
388
 
    takes_options = ['revision']
 
389
    takes_options = []
389
390
 
390
 
    def run(self, path='.', revision=None):
 
391
    def run(self, path='.'):
391
392
        import os
392
 
        gtk = open_display()
 
393
        gtk = self.open_display()
393
394
        from status import StatusDialog
394
395
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
395
 
        
396
 
        if revision is not None:
397
 
            try:
398
 
                revision_id = revision[0].as_revision_id(wt.branch)
399
 
            except:
400
 
                from bzrlib.errors import BzrError
401
 
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
402
 
        else:
403
 
            revision_id = None
404
 
 
405
 
        status = StatusDialog(wt, wt_path, revision_id)
 
396
        status = StatusDialog(wt, wt_path)
406
397
        status.connect("destroy", gtk.main_quit)
407
398
        status.run()
408
399
 
409
400
 
410
 
class cmd_gsend(GTKCommand):
411
 
    """GTK+ send merge directive.
412
 
 
413
 
    """
414
 
    def run(self):
415
 
        (br, path) = branch.Branch.open_containing(".")
416
 
        gtk = open_display()
417
 
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
418
 
        from StringIO import StringIO
419
 
        dialog = SendMergeDirectiveDialog(br)
420
 
        if dialog.run() == gtk.RESPONSE_OK:
421
 
            outf = StringIO()
422
 
            outf.writelines(dialog.get_merge_directive().to_lines())
423
 
            mail_client = br.get_config().get_mail_client()
424
 
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
425
 
                outf.getvalue())
426
 
 
427
 
            
428
 
 
429
401
 
430
402
class cmd_gconflicts(GTKCommand):
431
 
    """GTK+ conflicts.
 
403
    """ GTK+ conflicts.
432
404
    
433
405
    Select files from the list of conflicts and run an external utility to
434
406
    resolve them.
435
407
    """
436
408
    def run(self):
437
409
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
410
        self.open_display()
439
411
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
412
        dialog = ConflictsDialog(wt)
441
413
        dialog.run()
442
414
 
443
415
 
 
416
 
444
417
class cmd_gpreferences(GTKCommand):
445
418
    """ GTK+ preferences dialog.
446
419
 
447
420
    """
448
421
    def run(self):
449
 
        open_display()
 
422
        self.open_display()
450
423
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
424
        dialog = PreferencesWindow()
452
425
        dialog.run()
453
426
 
454
427
 
455
 
class cmd_gmerge(Command):
456
 
    """ GTK+ merge dialog
457
 
    
458
 
    """
459
 
    takes_args = ["merge_from_path?"]
460
 
    def run(self, merge_from_path=None):
461
 
        from bzrlib import workingtree
462
 
        from bzrlib.plugins.gtk.dialog import error_dialog
463
 
        from bzrlib.plugins.gtk.merge import MergeDialog
464
 
        
465
 
        (wt, path) = workingtree.WorkingTree.open_containing('.')
466
 
        old_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
467
 
        delta = wt.changes_from(old_tree)
468
 
        if len(delta.added) or len(delta.removed) or len(delta.renamed) or len(delta.modified):
469
 
            error_dialog(_i18n('There are local changes in the branch'),
470
 
                         _i18n('Please commit or revert the changes before merging.'))
471
 
        else:
472
 
            parent_branch_path = wt.branch.get_parent()
473
 
            merge = MergeDialog(wt, path, parent_branch_path)
474
 
            response = merge.run()
475
 
            merge.destroy()
476
 
 
477
428
 
478
429
class cmd_gmissing(Command):
479
430
    """ GTK+ missing revisions dialog.
513
464
 
514
465
class cmd_ginit(GTKCommand):
515
466
    def run(self):
516
 
        open_display()
 
467
        self.open_display()
517
468
        from initialize import InitDialog
518
469
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
470
        dialog.run()
523
474
    def run(self):
524
475
        br = branch.Branch.open_containing('.')[0]
525
476
        
526
 
        gtk = open_display()
 
477
        gtk = self.open_display()
527
478
        from tags import TagsWindow
528
479
        window = TagsWindow(br)
529
480
        window.show()
531
482
 
532
483
 
533
484
commands = [
 
485
    cmd_gmissing, 
 
486
    cmd_gpreferences, 
 
487
    cmd_gconflicts, 
 
488
    cmd_gstatus,
 
489
    cmd_gcommit, 
534
490
    cmd_gannotate, 
 
491
    cmd_visualise, 
 
492
    cmd_gdiff,
 
493
    cmd_gpush, 
 
494
    cmd_gcheckout, 
535
495
    cmd_gbranch,
536
 
    cmd_gcheckout, 
537
 
    cmd_gcommit, 
538
 
    cmd_gconflicts, 
539
 
    cmd_gdiff,
540
496
    cmd_ginit,
541
 
    cmd_gmerge,
542
 
    cmd_gmissing, 
543
 
    cmd_gpreferences, 
544
 
    cmd_gpush, 
545
 
    cmd_gsend,
546
 
    cmd_gstatus,
547
 
    cmd_gtags,
548
 
    cmd_visualise
 
497
    cmd_gtags
549
498
    ]
550
499
 
551
500
for cmd in commands:
552
501
    register_command(cmd)
553
502
 
554
503
 
 
504
class cmd_commit_notify(GTKCommand):
 
505
    """Run the bzr commit notifier.
 
506
 
 
507
    This is a background program which will pop up a notification on the users
 
508
    screen when a commit occurs.
 
509
    """
 
510
 
 
511
    def run(self):
 
512
        from notify import NotifyPopupMenu
 
513
        gtk = self.open_display()
 
514
        menu = NotifyPopupMenu()
 
515
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
516
        icon.connect('popup-menu', menu.display)
 
517
 
 
518
        import cgi
 
519
        import dbus
 
520
        import dbus.service
 
521
        import pynotify
 
522
        from bzrlib.bzrdir import BzrDir
 
523
        from bzrlib import errors
 
524
        from bzrlib.osutils import format_date
 
525
        from bzrlib.transport import get_transport
 
526
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
527
            import dbus.glib
 
528
        from bzrlib.plugins.dbus import activity
 
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)
 
534
 
 
535
        def catch_branch(revision_id, urls):
 
536
            # TODO: show all the urls, or perhaps choose the 'best'.
 
537
            url = urls[0]
 
538
            try:
 
539
                if isinstance(revision_id, unicode):
 
540
                    revision_id = revision_id.encode('utf8')
 
541
                transport = get_transport(url)
 
542
                a_dir = BzrDir.open_from_transport(transport)
 
543
                branch = a_dir.open_branch()
 
544
                revno = branch.revision_id_to_revno(revision_id)
 
545
                revision = branch.repository.get_revision(revision_id)
 
546
                summary = 'New revision %d in %s' % (revno, url)
 
547
                body  = 'Committer: %s\n' % revision.committer
 
548
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
549
                    revision.timezone)
 
550
                body += '\n'
 
551
                body += revision.message
 
552
                body = cgi.escape(body)
 
553
                nw = pynotify.Notification(summary, body)
 
554
                def start_viz(notification=None, action=None, data=None):
 
555
                    """Start the viz program."""
 
556
                    pp = start_viz_window(branch, revision_id)
 
557
                    pp.show()
 
558
                def start_branch(notification=None, action=None, data=None):
 
559
                    """Start a Branch dialog"""
 
560
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
561
                    bd = BranchDialog(remote_path=url)
 
562
                    bd.run()
 
563
                nw.add_action("inspect", "Inspect", start_viz, None)
 
564
                nw.add_action("branch", "Branch", start_branch, None)
 
565
                nw.set_timeout(5000)
 
566
                nw.show()
 
567
            except Exception, e:
 
568
                print e
 
569
                raise
 
570
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
571
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
572
        pynotify.init("bzr commit-notify")
 
573
        gtk.main()
 
574
 
 
575
register_command(cmd_commit_notify)
 
576
 
 
577
 
555
578
class cmd_gselftest(GTKCommand):
556
579
    """Version of selftest that displays a notification at the end"""
557
580
 
591
614
 
592
615
    takes_options = ['verbose',
593
616
                     Option('one', short_name='1',
594
 
                            help='Stop when one test fails.'),
595
 
                     Option('benchmark', help='Run the benchmarks.'),
 
617
                            help='stop when one test fails'),
 
618
                     Option('benchmark', help='run the benchmarks.'),
596
619
                     Option('lsprof-timed',
597
 
                     help='Generate lsprof output for benchmarked'
 
620
                     help='generate lsprof output for benchmarked'
598
621
                          ' sections of code.'),
599
622
                     Option('list-only',
600
 
                     help='List the tests instead of running them.'),
 
623
                     help='list the tests instead of running them'),
601
624
                     Option('randomize', type=str, argname="SEED",
602
 
                     help='Randomize the order of tests using the given'
603
 
                          ' 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'),
604
627
                    ]
605
628
    takes_args = ['testspecs*']
606
629
 
648
671
register_command(cmd_test_gtk)
649
672
 
650
673
 
651
 
 
652
674
import gettext
653
675
gettext.install('olive-gtk')
654
676
 
655
 
# Let's create a specialized alias to protect '_' from being erased by other
656
 
# uses of '_' as an anonymous variable (think pdb for one).
657
 
_i18n = gettext.gettext
658
677
 
659
678
class NoDisplayError(BzrCommandError):
660
679
    """gtk could not find a proper display"""
670
689
    default_encoding = sys.getdefaultencoding()
671
690
    try:
672
691
        result = TestSuite()
673
 
        try:
674
 
            import_pygtk()
675
 
        except errors.BzrCommandError:
676
 
            return result
677
692
        result.addTest(tests.test_suite())
678
693
    finally:
679
694
        if sys.getdefaultencoding() != default_encoding: