/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:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

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]) REMOVE
 
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
""")
103
104
    bzrlib.ui.ui_factory = GtkUIFactory()
104
105
 
105
106
 
 
107
def data_path():
 
108
    return os.path.dirname(__file__)
 
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
 
106
133
class GTKCommand(Command):
107
134
    """Abstract class providing GTK specific run commands."""
108
135
 
109
 
    def open_display(self):
110
 
        pygtk = import_pygtk()
111
 
        try:
112
 
            import gtk
113
 
        except RuntimeError, e:
114
 
            if str(e) == "could not open display":
115
 
                raise NoDisplayError
116
 
        set_ui_factory()
117
 
        return gtk
118
 
 
119
136
    def run(self):
120
 
        self.open_display()
 
137
        open_display()
121
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
122
139
        dialog.run()
123
140
 
151
168
 
152
169
    def run(self, location="."):
153
170
        (br, path) = branch.Branch.open_containing(location)
154
 
        self.open_display()
 
171
        open_display()
155
172
        from push import PushDialog
156
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
157
174
        dialog.run()
176
193
            if revision is not None:
177
194
                if len(revision) == 1:
178
195
                    tree1 = wt
179
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
180
197
                    tree2 = branch.repository.revision_tree(revision_id)
181
198
                elif len(revision) == 2:
182
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
183
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
184
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
185
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
186
203
            else:
187
204
                tree1 = wt
209
226
            wt.unlock()
210
227
 
211
228
 
212
 
def start_viz_window(branch, revision, limit=None):
 
229
def start_viz_window(branch, revisions, limit=None):
213
230
    """Start viz on branch with revision revision.
214
231
    
215
232
    :return: The viz window object.
216
233
    """
217
 
    from viz.branchwin import BranchWindow
218
 
    branch.lock_read()
219
 
    pp = BranchWindow()
220
 
    pp.set_branch(branch, revision, limit)
221
 
    # cleanup locks when the window is closed
222
 
    pp.connect("destroy", lambda w: branch.unlock())
223
 
    return pp
 
234
    from viz import BranchWindow
 
235
    return BranchWindow(branch, revisions, limit)
224
236
 
225
237
 
226
238
class cmd_visualise(Command):
236
248
        "revision",
237
249
        Option('limit', "Maximum number of revisions to display.",
238
250
               int, 'count')]
239
 
    takes_args = [ "location?" ]
 
251
    takes_args = [ "locations*" ]
240
252
    aliases = [ "visualize", "vis", "viz" ]
241
253
 
242
 
    def run(self, location=".", revision=None, limit=None):
 
254
    def run(self, locations_list, revision=None, limit=None):
243
255
        set_ui_factory()
244
 
        (br, path) = branch.Branch.open_containing(location)
245
 
        br.lock_read()
246
 
        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)
247
261
            if revision is None:
248
 
                revid = br.last_revision()
249
 
                if revid is None:
250
 
                    return
 
262
                revids.append(br.last_revision())
251
263
            else:
252
 
                (revno, revid) = revision[0].in_history(br)
253
 
 
254
 
            import gtk
255
 
            pp = start_viz_window(br, revid, limit)
256
 
            pp.connect("destroy", lambda w: gtk.main_quit())
257
 
            pp.show()
258
 
            gtk.main()
259
 
        finally:
260
 
            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()
261
270
 
262
271
 
263
272
class cmd_gannotate(GTKCommand):
277
286
    aliases = ["gblame", "gpraise"]
278
287
    
279
288
    def run(self, filename, all=False, plain=False, line='1', revision=None):
280
 
        gtk = self.open_display()
 
289
        gtk = open_display()
281
290
 
282
291
        try:
283
292
            line = int(line)
302
311
        if revision is not None:
303
312
            if len(revision) != 1:
304
313
                raise BzrCommandError("Only 1 revion may be specified.")
305
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
306
315
            tree = br.repository.revision_tree(revision_id)
307
316
        else:
308
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
309
318
 
310
 
        window = GAnnotateWindow(all, plain)
 
319
        window = GAnnotateWindow(all, plain, branch=br)
311
320
        window.connect("destroy", lambda w: gtk.main_quit())
312
 
        window.set_title(path + " - gannotate")
313
321
        config = GAnnotateConfig(window)
314
322
        window.show()
315
323
        br.lock_read()
330
338
    """GTK+ commit dialog
331
339
 
332
340
    Graphical user interface for committing revisions"""
333
 
    
 
341
 
334
342
    aliases = [ "gci" ]
335
343
    takes_args = []
336
344
    takes_options = []
337
345
 
338
346
    def run(self, filename=None):
339
347
        import os
340
 
        self.open_display()
 
348
        open_display()
341
349
        from commit import CommitDialog
342
350
        from bzrlib.errors import (BzrCommandError,
343
351
                                   NotBranchError,
349
357
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
350
358
            br = wt.branch
351
359
        except NoWorkingTree, e:
352
 
            path = e.base
353
 
            (br, path) = branch.Branch.open_containing(path)
354
 
 
355
 
        commit = CommitDialog(wt, path, not br)
356
 
        commit.run()
357
 
 
 
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()
358
375
 
359
376
 
360
377
class cmd_gstatus(GTKCommand):
365
382
    
366
383
    aliases = [ "gst" ]
367
384
    takes_args = ['PATH?']
368
 
    takes_options = []
 
385
    takes_options = ['revision']
369
386
 
370
 
    def run(self, path='.'):
 
387
    def run(self, path='.', revision=None):
371
388
        import os
372
 
        gtk = self.open_display()
 
389
        gtk = open_display()
373
390
        from status import StatusDialog
374
391
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
375
 
        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)
376
403
        status.connect("destroy", gtk.main_quit)
377
404
        status.run()
378
405
 
379
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
 
380
426
 
381
427
class cmd_gconflicts(GTKCommand):
382
 
    """ GTK+ push.
 
428
    """GTK+ conflicts.
383
429
    
 
430
    Select files from the list of conflicts and run an external utility to
 
431
    resolve them.
384
432
    """
385
433
    def run(self):
386
434
        (wt, path) = workingtree.WorkingTree.open_containing('.')
387
 
        self.open_display()
 
435
        open_display()
388
436
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
389
437
        dialog = ConflictsDialog(wt)
390
438
        dialog.run()
391
439
 
392
440
 
393
 
 
394
441
class cmd_gpreferences(GTKCommand):
395
442
    """ GTK+ preferences dialog.
396
443
 
397
444
    """
398
445
    def run(self):
399
 
        self.open_display()
 
446
        open_display()
400
447
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
401
448
        dialog = PreferencesWindow()
402
449
        dialog.run()
403
450
 
404
451
 
405
 
 
406
452
class cmd_gmissing(Command):
407
453
    """ GTK+ missing revisions dialog.
408
454
 
441
487
 
442
488
class cmd_ginit(GTKCommand):
443
489
    def run(self):
444
 
        self.open_display()
 
490
        open_display()
445
491
        from initialize import InitDialog
446
492
        dialog = InitDialog(os.path.abspath(os.path.curdir))
447
493
        dialog.run()
451
497
    def run(self):
452
498
        br = branch.Branch.open_containing('.')[0]
453
499
        
454
 
        gtk = self.open_display()
 
500
        gtk = open_display()
455
501
        from tags import TagsWindow
456
502
        window = TagsWindow(br)
457
503
        window.show()
459
505
 
460
506
 
461
507
commands = [
 
508
    cmd_gannotate, 
 
509
    cmd_gbranch,
 
510
    cmd_gcheckout, 
 
511
    cmd_gcommit, 
 
512
    cmd_gconflicts, 
 
513
    cmd_gdiff,
 
514
    cmd_ginit,
462
515
    cmd_gmissing, 
463
516
    cmd_gpreferences, 
464
 
    cmd_gconflicts, 
 
517
    cmd_gpush, 
 
518
    cmd_gsend,
465
519
    cmd_gstatus,
466
 
    cmd_gcommit, 
467
 
    cmd_gannotate, 
468
 
    cmd_visualise, 
469
 
    cmd_gdiff,
470
 
    cmd_gpush, 
471
 
    cmd_gcheckout, 
472
 
    cmd_gbranch,
473
 
    cmd_ginit,
474
 
    cmd_gtags
 
520
    cmd_gtags,
 
521
    cmd_visualise
475
522
    ]
476
523
 
477
524
for cmd in commands:
487
534
 
488
535
    def run(self):
489
536
        from notify import NotifyPopupMenu
490
 
        gtk = self.open_display()
 
537
        gtk = open_display()
491
538
        menu = NotifyPopupMenu()
492
 
        icon = gtk.status_icon_new_from_file("bzr-icon-64.png")
 
539
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
493
540
        icon.connect('popup-menu', menu.display)
494
541
 
495
542
        import cgi
502
549
        from bzrlib.transport import get_transport
503
550
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
504
551
            import dbus.glib
505
 
        from bzrlib.plugins.dbus import activity
 
552
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
506
553
        bus = dbus.SessionBus()
507
 
        # get the object so we can subscribe to callbacks from it.
508
 
        broadcast_service = bus.get_object(
509
 
            activity.Broadcast.DBUS_NAME,
510
 
            activity.Broadcast.DBUS_PATH)
511
554
 
512
555
        def catch_branch(revision_id, urls):
513
556
            # TODO: show all the urls, or perhaps choose the 'best'.
544
587
            except Exception, e:
545
588
                print e
546
589
                raise
547
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
548
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
590
        bus.add_signal_receiver(catch_branch,
 
591
                                dbus_interface=BROADCAST_INTERFACE,
 
592
                                signal_name="Revision")
549
593
        pynotify.init("bzr commit-notify")
550
594
        gtk.main()
551
595
 
552
596
register_command(cmd_commit_notify)
553
597
 
554
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
 
555
696
import gettext
556
697
gettext.install('olive-gtk')
557
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
558
702
 
559
703
class NoDisplayError(BzrCommandError):
560
704
    """gtk could not find a proper display"""
570
714
    default_encoding = sys.getdefaultencoding()
571
715
    try:
572
716
        result = TestSuite()
 
717
        try:
 
718
            import_pygtk()
 
719
        except errors.BzrCommandError:
 
720
            return result
573
721
        result.addTest(tests.test_suite())
574
722
    finally:
575
723
        if sys.getdefaultencoding() != default_encoding: