/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 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

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
 
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_info = (0, 92, 0, 'dev', 0)
 
39
version_info = (0, 95, 0, 'dev', 1)
37
40
 
38
41
if version_info[3] == 'final':
39
42
    version_string = '%d.%d.%d' % version_info[:3]
41
44
    version_string = '%d.%d.%d%s%d' % version_info
42
45
__version__ = version_string
43
46
 
 
47
required_bzrlib = (1, 3)
 
48
 
44
49
def check_bzrlib_version(desired):
45
50
    """Check that bzrlib is compatible.
46
51
 
47
52
    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.
51
53
    """
52
 
    desired_plus = (desired[0], desired[1]+1)
53
54
    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
57
55
    try:
58
56
        from bzrlib.trace import warning
59
57
    except ImportError:
64
62
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
65
63
                ' %s.' % (bzrlib.__version__, __version__))
66
64
        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]))
71
65
 
72
66
 
73
67
if version_info[2] == "final":
74
 
    check_bzrlib_version(version_info[:2])
 
68
    check_bzrlib_version(required_bzrlib)
75
69
 
76
70
from bzrlib.trace import warning
77
71
if __name__ != 'bzrlib.plugins.gtk':
83
77
    branch,
84
78
    builtins,
85
79
    errors,
 
80
    merge_directive,
86
81
    workingtree,
87
82
    )
88
83
""")
113
108
    return os.path.dirname(__file__)
114
109
 
115
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
 
116
133
class GTKCommand(Command):
117
134
    """Abstract class providing GTK specific run commands."""
118
135
 
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
 
 
129
136
    def run(self):
130
 
        self.open_display()
 
137
        open_display()
131
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
132
139
        dialog.run()
133
140
 
161
168
 
162
169
    def run(self, location="."):
163
170
        (br, path) = branch.Branch.open_containing(location)
164
 
        self.open_display()
 
171
        open_display()
165
172
        from push import PushDialog
166
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
167
174
        dialog.run()
186
193
            if revision is not None:
187
194
                if len(revision) == 1:
188
195
                    tree1 = wt
189
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
190
197
                    tree2 = branch.repository.revision_tree(revision_id)
191
198
                elif len(revision) == 2:
192
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
193
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
194
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
195
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
196
203
            else:
197
204
                tree1 = wt
219
226
            wt.unlock()
220
227
 
221
228
 
222
 
def start_viz_window(branch, revision, limit=None):
 
229
def start_viz_window(branch, revisions, limit=None):
223
230
    """Start viz on branch with revision revision.
224
231
    
225
232
    :return: The viz window object.
226
233
    """
227
 
    from viz.branchwin import BranchWindow
228
 
    return BranchWindow(branch, revision, limit)
 
234
    from viz import BranchWindow
 
235
    return BranchWindow(branch, revisions, limit)
229
236
 
230
237
 
231
238
class cmd_visualise(Command):
241
248
        "revision",
242
249
        Option('limit', "Maximum number of revisions to display.",
243
250
               int, 'count')]
244
 
    takes_args = [ "location?" ]
 
251
    takes_args = [ "locations*" ]
245
252
    aliases = [ "visualize", "vis", "viz" ]
246
253
 
247
 
    def run(self, location=".", revision=None, limit=None):
 
254
    def run(self, locations_list, revision=None, limit=None):
248
255
        set_ui_factory()
249
 
        (br, path) = branch.Branch.open_containing(location)
250
 
        br.lock_read()
251
 
        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)
252
261
            if revision is None:
253
 
                revid = br.last_revision()
254
 
                if revid is None:
255
 
                    return
 
262
                revids.append(br.last_revision())
256
263
            else:
257
 
                (revno, revid) = revision[0].in_history(br)
258
 
 
259
 
            import gtk
260
 
            pp = start_viz_window(br, revid, limit)
261
 
            pp.connect("destroy", lambda w: gtk.main_quit())
262
 
            pp.show()
263
 
            gtk.main()
264
 
        finally:
265
 
            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()
266
270
 
267
271
 
268
272
class cmd_gannotate(GTKCommand):
282
286
    aliases = ["gblame", "gpraise"]
283
287
    
284
288
    def run(self, filename, all=False, plain=False, line='1', revision=None):
285
 
        gtk = self.open_display()
 
289
        gtk = open_display()
286
290
 
287
291
        try:
288
292
            line = int(line)
307
311
        if revision is not None:
308
312
            if len(revision) != 1:
309
313
                raise BzrCommandError("Only 1 revion may be specified.")
310
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
311
315
            tree = br.repository.revision_tree(revision_id)
312
316
        else:
313
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
314
318
 
315
 
        window = GAnnotateWindow(all, plain)
 
319
        window = GAnnotateWindow(all, plain, branch=br)
316
320
        window.connect("destroy", lambda w: gtk.main_quit())
317
 
        window.set_title(path + " - gannotate")
318
321
        config = GAnnotateConfig(window)
319
322
        window.show()
320
323
        br.lock_read()
335
338
    """GTK+ commit dialog
336
339
 
337
340
    Graphical user interface for committing revisions"""
338
 
    
 
341
 
339
342
    aliases = [ "gci" ]
340
343
    takes_args = []
341
344
    takes_options = []
342
345
 
343
346
    def run(self, filename=None):
344
347
        import os
345
 
        self.open_display()
 
348
        open_display()
346
349
        from commit import CommitDialog
347
350
        from bzrlib.errors import (BzrCommandError,
348
351
                                   NotBranchError,
354
357
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
355
358
            br = wt.branch
356
359
        except NoWorkingTree, e:
357
 
            path = e.base
358
 
            (br, path) = branch.Branch.open_containing(path)
359
 
 
360
 
        commit = CommitDialog(wt, path, not br)
361
 
        commit.run()
362
 
 
 
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()
363
375
 
364
376
 
365
377
class cmd_gstatus(GTKCommand):
370
382
    
371
383
    aliases = [ "gst" ]
372
384
    takes_args = ['PATH?']
373
 
    takes_options = []
 
385
    takes_options = ['revision']
374
386
 
375
 
    def run(self, path='.'):
 
387
    def run(self, path='.', revision=None):
376
388
        import os
377
 
        gtk = self.open_display()
 
389
        gtk = open_display()
378
390
        from status import StatusDialog
379
391
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
380
 
        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)
381
403
        status.connect("destroy", gtk.main_quit)
382
404
        status.run()
383
405
 
384
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
 
385
426
 
386
427
class cmd_gconflicts(GTKCommand):
387
 
    """ GTK+ conflicts.
 
428
    """GTK+ conflicts.
388
429
    
389
430
    Select files from the list of conflicts and run an external utility to
390
431
    resolve them.
391
432
    """
392
433
    def run(self):
393
434
        (wt, path) = workingtree.WorkingTree.open_containing('.')
394
 
        self.open_display()
 
435
        open_display()
395
436
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
396
437
        dialog = ConflictsDialog(wt)
397
438
        dialog.run()
398
439
 
399
440
 
400
 
 
401
441
class cmd_gpreferences(GTKCommand):
402
442
    """ GTK+ preferences dialog.
403
443
 
404
444
    """
405
445
    def run(self):
406
 
        self.open_display()
 
446
        open_display()
407
447
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
408
448
        dialog = PreferencesWindow()
409
449
        dialog.run()
410
450
 
411
451
 
412
 
 
413
452
class cmd_gmissing(Command):
414
453
    """ GTK+ missing revisions dialog.
415
454
 
448
487
 
449
488
class cmd_ginit(GTKCommand):
450
489
    def run(self):
451
 
        self.open_display()
 
490
        open_display()
452
491
        from initialize import InitDialog
453
492
        dialog = InitDialog(os.path.abspath(os.path.curdir))
454
493
        dialog.run()
458
497
    def run(self):
459
498
        br = branch.Branch.open_containing('.')[0]
460
499
        
461
 
        gtk = self.open_display()
 
500
        gtk = open_display()
462
501
        from tags import TagsWindow
463
502
        window = TagsWindow(br)
464
503
        window.show()
466
505
 
467
506
 
468
507
commands = [
 
508
    cmd_gannotate, 
 
509
    cmd_gbranch,
 
510
    cmd_gcheckout, 
 
511
    cmd_gcommit, 
 
512
    cmd_gconflicts, 
 
513
    cmd_gdiff,
 
514
    cmd_ginit,
469
515
    cmd_gmissing, 
470
516
    cmd_gpreferences, 
471
 
    cmd_gconflicts, 
 
517
    cmd_gpush, 
 
518
    cmd_gsend,
472
519
    cmd_gstatus,
473
 
    cmd_gcommit, 
474
 
    cmd_gannotate, 
475
 
    cmd_visualise, 
476
 
    cmd_gdiff,
477
 
    cmd_gpush, 
478
 
    cmd_gcheckout, 
479
 
    cmd_gbranch,
480
 
    cmd_ginit,
481
 
    cmd_gtags
 
520
    cmd_gtags,
 
521
    cmd_visualise
482
522
    ]
483
523
 
484
524
for cmd in commands:
494
534
 
495
535
    def run(self):
496
536
        from notify import NotifyPopupMenu
497
 
        gtk = self.open_display()
 
537
        gtk = open_display()
498
538
        menu = NotifyPopupMenu()
499
 
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
539
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
500
540
        icon.connect('popup-menu', menu.display)
501
541
 
502
542
        import cgi
509
549
        from bzrlib.transport import get_transport
510
550
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
511
551
            import dbus.glib
512
 
        from bzrlib.plugins.dbus import activity
 
552
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
513
553
        bus = dbus.SessionBus()
514
 
        # get the object so we can subscribe to callbacks from it.
515
 
        broadcast_service = bus.get_object(
516
 
            activity.Broadcast.DBUS_NAME,
517
 
            activity.Broadcast.DBUS_PATH)
518
554
 
519
555
        def catch_branch(revision_id, urls):
520
556
            # TODO: show all the urls, or perhaps choose the 'best'.
551
587
            except Exception, e:
552
588
                print e
553
589
                raise
554
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
555
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
590
        bus.add_signal_receiver(catch_branch,
 
591
                                dbus_interface=BROADCAST_INTERFACE,
 
592
                                signal_name="Revision")
556
593
        pynotify.init("bzr commit-notify")
557
594
        gtk.main()
558
595
 
593
630
register_command(cmd_gselftest)
594
631
 
595
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
 
596
696
import gettext
597
697
gettext.install('olive-gtk')
598
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
599
702
 
600
703
class NoDisplayError(BzrCommandError):
601
704
    """gtk could not find a proper display"""
611
714
    default_encoding = sys.getdefaultencoding()
612
715
    try:
613
716
        result = TestSuite()
 
717
        try:
 
718
            import_pygtk()
 
719
        except errors.BzrCommandError:
 
720
            return result
614
721
        result.addTest(tests.test_suite())
615
722
    finally:
616
723
        if sys.getdefaultencoding() != default_encoding: