/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-09-22 16:17:14 UTC
  • Revision ID: szilveszter.farkas@gmail.com-20070922161714-plggdyv41ro0nhim
Updated NEWS.

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