/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: 2007-07-17 02:55:14 UTC
  • Revision ID: jelmer@samba.org-20070717025514-w0phtodu6o8x5ifh
Start working on 0.19.0

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