/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-21 12:14:36 UTC
  • Revision ID: daniel.schierbeck@gmail.com-20071021121436-vw9tnsup9meyt9sv
Fixed bug in the revision menu, where the parent property was not set on the diff window.

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