/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: Daniel Schierbeck
  • Date: 2007-10-14 15:54:57 UTC
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: daniel.schierbeck@gmail.com-20071014155457-m3ek29p4ima8ev7d
Added the new Window base class.

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
"""
34
33
 
35
 
import sys
36
 
 
37
34
import bzrlib
38
35
 
39
 
version_info = (0, 95, 0, 'dev', 1)
 
36
version_info = (0, 92, 0, 'dev', 0)
40
37
 
41
38
if version_info[3] == 'final':
42
39
    version_string = '%d.%d.%d' % version_info[:3]
44
41
    version_string = '%d.%d.%d%s%d' % version_info
45
42
__version__ = version_string
46
43
 
47
 
required_bzrlib = (1, 3)
48
 
 
49
44
def check_bzrlib_version(desired):
50
45
    """Check that bzrlib is compatible.
51
46
 
52
47
    If version is < bzr-gtk version, assume incompatible.
 
48
    If version == bzr-gtk version, assume completely compatible
 
49
    If version == bzr-gtk version + 1, assume compatible, with deprecations
 
50
    Otherwise, assume incompatible.
53
51
    """
 
52
    desired_plus = (desired[0], desired[1]+1)
54
53
    bzrlib_version = bzrlib.version_info[:2]
 
54
    if bzrlib_version == desired or (bzrlib_version == desired_plus and
 
55
                                     bzrlib.version_info[3] == 'dev'):
 
56
        return
55
57
    try:
56
58
        from bzrlib.trace import warning
57
59
    except ImportError:
62
64
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
63
65
                ' %s.' % (bzrlib.__version__, __version__))
64
66
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
 
67
    else:
 
68
        warning('bzr-gtk is not up to date with installed bzr version %s.'
 
69
                ' \nThere should be a newer version available, e.g. %i.%i.' 
 
70
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
65
71
 
66
72
 
67
73
if version_info[2] == "final":
68
 
    check_bzrlib_version(required_bzrlib)
 
74
    check_bzrlib_version(version_info[:2])
69
75
 
70
76
from bzrlib.trace import warning
71
77
if __name__ != 'bzrlib.plugins.gtk':
77
83
    branch,
78
84
    builtins,
79
85
    errors,
80
 
    merge_directive,
81
86
    workingtree,
82
87
    )
83
88
""")
104
109
    bzrlib.ui.ui_factory = GtkUIFactory()
105
110
 
106
111
 
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
 
 
 
112
def data_path():
 
113
    return os.path.dirname(__file__)
 
114
 
135
115
 
136
116
class GTKCommand(Command):
137
117
    """Abstract class providing GTK specific run commands."""
138
118
 
 
119
    def open_display(self):
 
120
        pygtk = import_pygtk()
 
121
        try:
 
122
            import gtk
 
123
        except RuntimeError, e:
 
124
            if str(e) == "could not open display":
 
125
                raise NoDisplayError
 
126
        set_ui_factory()
 
127
        return gtk
 
128
 
139
129
    def run(self):
140
 
        open_display()
 
130
        self.open_display()
141
131
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
132
        dialog.run()
143
133
 
171
161
 
172
162
    def run(self, location="."):
173
163
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
164
        self.open_display()
175
165
        from push import PushDialog
176
166
        dialog = PushDialog(br.repository, br.last_revision(), br)
177
167
        dialog.run()
196
186
            if revision is not None:
197
187
                if len(revision) == 1:
198
188
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
189
                    revision_id = revision[0].in_history(branch).rev_id
200
190
                    tree2 = branch.repository.revision_tree(revision_id)
201
191
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
192
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
193
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
194
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
195
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
196
            else:
207
197
                tree1 = wt
229
219
            wt.unlock()
230
220
 
231
221
 
232
 
def start_viz_window(branch, revisions, limit=None):
 
222
def start_viz_window(branch, revision, limit=None):
233
223
    """Start viz on branch with revision revision.
234
224
    
235
225
    :return: The viz window object.
236
226
    """
237
 
    from viz import BranchWindow
238
 
    return BranchWindow(branch, revisions, limit)
 
227
    from viz.branchwin import BranchWindow
 
228
    branch.lock_read()
 
229
    pp = BranchWindow()
 
230
    pp.set_branch(branch, revision, limit)
 
231
    # cleanup locks when the window is closed
 
232
    pp.connect("destroy", lambda w: branch.unlock())
 
233
    return pp
239
234
 
240
235
 
241
236
class cmd_visualise(Command):
251
246
        "revision",
252
247
        Option('limit', "Maximum number of revisions to display.",
253
248
               int, 'count')]
254
 
    takes_args = [ "locations*" ]
 
249
    takes_args = [ "location?" ]
255
250
    aliases = [ "visualize", "vis", "viz" ]
256
251
 
257
 
    def run(self, locations_list, revision=None, limit=None):
 
252
    def run(self, location=".", revision=None, limit=None):
258
253
        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)
 
254
        (br, path) = branch.Branch.open_containing(location)
 
255
        br.lock_read()
 
256
        try:
264
257
            if revision is None:
265
 
                revids.append(br.last_revision())
 
258
                revid = br.last_revision()
 
259
                if revid is None:
 
260
                    return
266
261
            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()
 
262
                (revno, revid) = revision[0].in_history(br)
 
263
 
 
264
            import gtk
 
265
            pp = start_viz_window(br, revid, limit)
 
266
            pp.connect("destroy", lambda w: gtk.main_quit())
 
267
            pp.show()
 
268
            gtk.main()
 
269
        finally:
 
270
            br.unlock()
273
271
 
274
272
 
275
273
class cmd_gannotate(GTKCommand):
289
287
    aliases = ["gblame", "gpraise"]
290
288
    
291
289
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
290
        gtk = self.open_display()
293
291
 
294
292
        try:
295
293
            line = int(line)
314
312
        if revision is not None:
315
313
            if len(revision) != 1:
316
314
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
315
            revision_id = revision[0].in_history(br).rev_id
318
316
            tree = br.repository.revision_tree(revision_id)
319
317
        else:
320
318
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
319
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
320
        window = GAnnotateWindow(all, plain)
323
321
        window.connect("destroy", lambda w: gtk.main_quit())
 
322
        window.set_title(path + " - gannotate")
324
323
        config = GAnnotateConfig(window)
325
324
        window.show()
326
325
        br.lock_read()
341
340
    """GTK+ commit dialog
342
341
 
343
342
    Graphical user interface for committing revisions"""
344
 
 
 
343
    
345
344
    aliases = [ "gci" ]
346
345
    takes_args = []
347
346
    takes_options = []
348
347
 
349
348
    def run(self, filename=None):
350
349
        import os
351
 
        open_display()
 
350
        self.open_display()
352
351
        from commit import CommitDialog
353
352
        from bzrlib.errors import (BzrCommandError,
354
353
                                   NotBranchError,
360
359
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
361
360
            br = wt.branch
362
361
        except NoWorkingTree, e:
363
 
            from dialog import error_dialog
364
 
            error_dialog(_i18n('Directory does not have a working tree'),
365
 
                         _i18n('Operation aborted.'))
366
 
            return 1 # should this be retval=3?
367
 
 
368
 
        # It is a good habit to keep things locked for the duration, but it
369
 
        # could cause difficulties if someone wants to do things in another
370
 
        # window... We could lock_read() until we actually go to commit
371
 
        # changes... Just a thought.
372
 
        wt.lock_write()
373
 
        try:
374
 
            dlg = CommitDialog(wt)
375
 
            return dlg.run()
376
 
        finally:
377
 
            wt.unlock()
 
362
            path = e.base
 
363
            (br, path) = branch.Branch.open_containing(path)
 
364
 
 
365
        commit = CommitDialog(wt, path, not br)
 
366
        commit.run()
 
367
 
378
368
 
379
369
 
380
370
class cmd_gstatus(GTKCommand):
385
375
    
386
376
    aliases = [ "gst" ]
387
377
    takes_args = ['PATH?']
388
 
    takes_options = ['revision']
 
378
    takes_options = []
389
379
 
390
 
    def run(self, path='.', revision=None):
 
380
    def run(self, path='.'):
391
381
        import os
392
 
        gtk = open_display()
 
382
        gtk = self.open_display()
393
383
        from status import StatusDialog
394
384
        (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)
 
385
        status = StatusDialog(wt, wt_path)
406
386
        status.connect("destroy", gtk.main_quit)
407
387
        status.run()
408
388
 
409
389
 
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
390
 
430
391
class cmd_gconflicts(GTKCommand):
431
 
    """GTK+ conflicts.
 
392
    """ GTK+ conflicts.
432
393
    
433
394
    Select files from the list of conflicts and run an external utility to
434
395
    resolve them.
435
396
    """
436
397
    def run(self):
437
398
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
399
        self.open_display()
439
400
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
401
        dialog = ConflictsDialog(wt)
441
402
        dialog.run()
442
403
 
443
404
 
 
405
 
444
406
class cmd_gpreferences(GTKCommand):
445
407
    """ GTK+ preferences dialog.
446
408
 
447
409
    """
448
410
    def run(self):
449
 
        open_display()
 
411
        self.open_display()
450
412
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
413
        dialog = PreferencesWindow()
452
414
        dialog.run()
453
415
 
454
416
 
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
417
 
478
418
class cmd_gmissing(Command):
479
419
    """ GTK+ missing revisions dialog.
513
453
 
514
454
class cmd_ginit(GTKCommand):
515
455
    def run(self):
516
 
        open_display()
 
456
        self.open_display()
517
457
        from initialize import InitDialog
518
458
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
459
        dialog.run()
523
463
    def run(self):
524
464
        br = branch.Branch.open_containing('.')[0]
525
465
        
526
 
        gtk = open_display()
 
466
        gtk = self.open_display()
527
467
        from tags import TagsWindow
528
468
        window = TagsWindow(br)
529
469
        window.show()
531
471
 
532
472
 
533
473
commands = [
 
474
    cmd_gmissing, 
 
475
    cmd_gpreferences, 
 
476
    cmd_gconflicts, 
 
477
    cmd_gstatus,
 
478
    cmd_gcommit, 
534
479
    cmd_gannotate, 
 
480
    cmd_visualise, 
 
481
    cmd_gdiff,
 
482
    cmd_gpush, 
 
483
    cmd_gcheckout, 
535
484
    cmd_gbranch,
536
 
    cmd_gcheckout, 
537
 
    cmd_gcommit, 
538
 
    cmd_gconflicts, 
539
 
    cmd_gdiff,
540
485
    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
 
486
    cmd_gtags
549
487
    ]
550
488
 
551
489
for cmd in commands:
552
490
    register_command(cmd)
553
491
 
554
492
 
 
493
class cmd_commit_notify(GTKCommand):
 
494
    """Run the bzr commit notifier.
 
495
 
 
496
    This is a background program which will pop up a notification on the users
 
497
    screen when a commit occurs.
 
498
    """
 
499
 
 
500
    def run(self):
 
501
        from notify import NotifyPopupMenu
 
502
        gtk = self.open_display()
 
503
        menu = NotifyPopupMenu()
 
504
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
505
        icon.connect('popup-menu', menu.display)
 
506
 
 
507
        import cgi
 
508
        import dbus
 
509
        import dbus.service
 
510
        import pynotify
 
511
        from bzrlib.bzrdir import BzrDir
 
512
        from bzrlib import errors
 
513
        from bzrlib.osutils import format_date
 
514
        from bzrlib.transport import get_transport
 
515
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
516
            import dbus.glib
 
517
        from bzrlib.plugins.dbus import activity
 
518
        bus = dbus.SessionBus()
 
519
        # get the object so we can subscribe to callbacks from it.
 
520
        broadcast_service = bus.get_object(
 
521
            activity.Broadcast.DBUS_NAME,
 
522
            activity.Broadcast.DBUS_PATH)
 
523
 
 
524
        def catch_branch(revision_id, urls):
 
525
            # TODO: show all the urls, or perhaps choose the 'best'.
 
526
            url = urls[0]
 
527
            try:
 
528
                if isinstance(revision_id, unicode):
 
529
                    revision_id = revision_id.encode('utf8')
 
530
                transport = get_transport(url)
 
531
                a_dir = BzrDir.open_from_transport(transport)
 
532
                branch = a_dir.open_branch()
 
533
                revno = branch.revision_id_to_revno(revision_id)
 
534
                revision = branch.repository.get_revision(revision_id)
 
535
                summary = 'New revision %d in %s' % (revno, url)
 
536
                body  = 'Committer: %s\n' % revision.committer
 
537
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
538
                    revision.timezone)
 
539
                body += '\n'
 
540
                body += revision.message
 
541
                body = cgi.escape(body)
 
542
                nw = pynotify.Notification(summary, body)
 
543
                def start_viz(notification=None, action=None, data=None):
 
544
                    """Start the viz program."""
 
545
                    pp = start_viz_window(branch, revision_id)
 
546
                    pp.show()
 
547
                def start_branch(notification=None, action=None, data=None):
 
548
                    """Start a Branch dialog"""
 
549
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
550
                    bd = BranchDialog(remote_path=url)
 
551
                    bd.run()
 
552
                nw.add_action("inspect", "Inspect", start_viz, None)
 
553
                nw.add_action("branch", "Branch", start_branch, None)
 
554
                nw.set_timeout(5000)
 
555
                nw.show()
 
556
            except Exception, e:
 
557
                print e
 
558
                raise
 
559
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
560
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
561
        pynotify.init("bzr commit-notify")
 
562
        gtk.main()
 
563
 
 
564
register_command(cmd_commit_notify)
 
565
 
 
566
 
555
567
class cmd_gselftest(GTKCommand):
556
568
    """Version of selftest that displays a notification at the end"""
557
569
 
586
598
register_command(cmd_gselftest)
587
599
 
588
600
 
589
 
class cmd_test_gtk(GTKCommand):
590
 
    """Version of selftest that just runs the gtk test suite."""
591
 
 
592
 
    takes_options = ['verbose',
593
 
                     Option('one', short_name='1',
594
 
                            help='Stop when one test fails.'),
595
 
                     Option('benchmark', help='Run the benchmarks.'),
596
 
                     Option('lsprof-timed',
597
 
                     help='Generate lsprof output for benchmarked'
598
 
                          ' sections of code.'),
599
 
                     Option('list-only',
600
 
                     help='List the tests instead of running them.'),
601
 
                     Option('randomize', type=str, argname="SEED",
602
 
                     help='Randomize the order of tests using the given'
603
 
                          ' seed or "now" for the current time.'),
604
 
                    ]
605
 
    takes_args = ['testspecs*']
606
 
 
607
 
    def run(self, verbose=None, one=False, benchmark=None,
608
 
            lsprof_timed=None, list_only=False, randomize=None,
609
 
            testspecs_list=None):
610
 
        from bzrlib import __path__ as bzrlib_path
611
 
        from bzrlib.tests import selftest
612
 
 
613
 
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
614
 
        if benchmark:
615
 
            print 'No benchmarks yet'
616
 
            return 3
617
 
 
618
 
            test_suite_factory = bench_suite
619
 
            if verbose is None:
620
 
                verbose = True
621
 
            # TODO: should possibly lock the history file...
622
 
            benchfile = open(".perf_history", "at", buffering=1)
623
 
        else:
624
 
            test_suite_factory = test_suite
625
 
            if verbose is None:
626
 
                verbose = False
627
 
            benchfile = None
628
 
 
629
 
        if testspecs_list is not None:
630
 
            pattern = '|'.join(testspecs_list)
631
 
        else:
632
 
            pattern = ".*"
633
 
 
634
 
        try:
635
 
            result = selftest(verbose=verbose,
636
 
                              pattern=pattern,
637
 
                              stop_on_failure=one,
638
 
                              test_suite_factory=test_suite_factory,
639
 
                              lsprof_timed=lsprof_timed,
640
 
                              bench_history=benchfile,
641
 
                              list_only=list_only,
642
 
                              random_seed=randomize,
643
 
                             )
644
 
        finally:
645
 
            if benchfile is not None:
646
 
                benchfile.close()
647
 
 
648
 
register_command(cmd_test_gtk)
649
 
 
650
 
 
651
 
 
652
601
import gettext
653
602
gettext.install('olive-gtk')
654
603
 
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
604
 
659
605
class NoDisplayError(BzrCommandError):
660
606
    """gtk could not find a proper display"""
670
616
    default_encoding = sys.getdefaultencoding()
671
617
    try:
672
618
        result = TestSuite()
673
 
        try:
674
 
            import_pygtk()
675
 
        except errors.BzrCommandError:
676
 
            return result
677
619
        result.addTest(tests.test_suite())
678
620
    finally:
679
621
        if sys.getdefaultencoding() != default_encoding: