/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-03-28 19:39:35 UTC
  • mto: (450.1.13 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080328193935-ih23kvdwk3w0adp5
Split identity settings out of main preferences window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
12
12
# along with this program; if not, write to the Free Software
13
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
14
14
 
15
 
"""GTK+ frontends to Bazaar commands """
 
15
"""Graphical support for Bazaar using GTK.
 
16
 
 
17
This plugin includes:
 
18
commit-notify     Start the graphical notifier of commits.
 
19
gannotate         GTK+ annotate. 
 
20
gbranch           GTK+ branching. 
 
21
gcheckout         GTK+ checkout. 
 
22
gcommit           GTK+ commit dialog.
 
23
gconflicts        GTK+ conflicts. 
 
24
gdiff             Show differences in working tree in a GTK+ Window. 
 
25
ghandle-patch     Display and optionally merge a merge directive or patch.
 
26
ginit             Initialise a new branch.
 
27
gmissing          GTK+ missing revisions dialog. 
 
28
gpreferences      GTK+ preferences dialog. 
 
29
gpush             GTK+ push.
 
30
gsend             GTK+ send merge directive.
 
31
gstatus           GTK+ status dialog.
 
32
gtags             Manage branch tags.
 
33
visualise         Graphically visualise this branch. 
 
34
"""
 
35
 
 
36
import sys
16
37
 
17
38
import bzrlib
18
39
 
19
 
__version__ = '0.16.0'
20
 
version_info = tuple(int(n) for n in __version__.split('.'))
21
 
 
 
40
version_info = (0, 94, 0, 'dev', 0)
 
41
 
 
42
if version_info[3] == 'final':
 
43
    version_string = '%d.%d.%d' % version_info[:3]
 
44
else:
 
45
    version_string = '%d.%d.%d%s%d' % version_info
 
46
__version__ = version_string
 
47
 
 
48
required_bzrlib = (1, 3)
22
49
 
23
50
def check_bzrlib_version(desired):
24
51
    """Check that bzrlib is compatible.
25
52
 
26
53
    If version is < bzr-gtk version, assume incompatible.
27
 
    If version == bzr-gtk version, assume completely compatible
28
 
    If version == bzr-gtk version + 1, assume compatible, with deprecations
29
 
    Otherwise, assume incompatible.
30
54
    """
31
 
    desired_plus = (desired[0], desired[1]+1)
32
55
    bzrlib_version = bzrlib.version_info[:2]
33
 
    if bzrlib_version == desired:
34
 
        return
35
56
    try:
36
57
        from bzrlib.trace import warning
37
58
    except ImportError:
38
59
        # get the message out any way we can
39
60
        from warnings import warn as warning
40
61
    if bzrlib_version < desired:
41
 
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
 
62
        from bzrlib.errors import BzrError
 
63
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
42
64
                ' %s.' % (bzrlib.__version__, __version__))
43
 
        # Not using BzrNewError, because it may not exist.
44
 
        raise Exception, ('Version mismatch', version_info)
45
 
    else:
46
 
        warning('bzr-gtk is not up to date with installed bzr version %s.'
47
 
                ' \nThere should be a newer version available, e.g. %i.%i.' 
48
 
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
49
 
        if bzrlib_version != desired_plus:
50
 
            raise Exception, 'Version mismatch'
51
 
 
52
 
 
53
 
check_bzrlib_version(version_info[:2])
 
65
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
 
66
 
 
67
 
 
68
if version_info[2] == "final":
 
69
    check_bzrlib_version(required_bzrlib)
54
70
 
55
71
from bzrlib.trace import warning
56
72
if __name__ != 'bzrlib.plugins.gtk':
60
76
lazy_import(globals(), """
61
77
from bzrlib import (
62
78
    branch,
 
79
    builtins,
63
80
    errors,
 
81
    merge_directive,
64
82
    workingtree,
65
83
    )
66
84
""")
87
105
    bzrlib.ui.ui_factory = GtkUIFactory()
88
106
 
89
107
 
 
108
def data_path():
 
109
    return os.path.dirname(__file__)
 
110
 
 
111
 
90
112
class GTKCommand(Command):
91
113
    """Abstract class providing GTK specific run commands."""
92
114
 
137
159
        (br, path) = branch.Branch.open_containing(location)
138
160
        self.open_display()
139
161
        from push import PushDialog
140
 
        dialog = PushDialog(br)
 
162
        dialog = PushDialog(br.repository, br.last_revision(), br)
141
163
        dialog.run()
142
164
 
143
165
 
181
203
                try:
182
204
                    window.set_file(tree_filename)
183
205
                except NoSuchFile:
184
 
                    if (tree1.inventory.path2id(tree_filename) is None and 
185
 
                        tree2.inventory.path2id(tree_filename) is None):
 
206
                    if (tree1.path2id(tree_filename) is None and 
 
207
                        tree2.path2id(tree_filename) is None):
186
208
                        raise NotVersionedError(filename)
187
209
                    raise BzrCommandError('No changes found for file "%s"' % 
188
210
                                          filename)
193
215
            wt.unlock()
194
216
 
195
217
 
 
218
def start_viz_window(branch, revision, limit=None):
 
219
    """Start viz on branch with revision revision.
 
220
    
 
221
    :return: The viz window object.
 
222
    """
 
223
    from viz import BranchWindow
 
224
    return BranchWindow(branch, revision, limit)
 
225
 
 
226
 
196
227
class cmd_visualise(Command):
197
228
    """Graphically visualise this branch.
198
229
 
204
235
    """
205
236
    takes_options = [
206
237
        "revision",
207
 
        Option('limit', "maximum number of revisions to display",
 
238
        Option('limit', "Maximum number of revisions to display.",
208
239
               int, 'count')]
209
240
    takes_args = [ "location?" ]
210
241
    aliases = [ "visualize", "vis", "viz" ]
212
243
    def run(self, location=".", revision=None, limit=None):
213
244
        set_ui_factory()
214
245
        (br, path) = branch.Branch.open_containing(location)
215
 
        br.lock_read()
216
 
        br.repository.lock_read()
217
 
        try:
218
 
            if revision is None:
219
 
                revid = br.last_revision()
220
 
                if revid is None:
221
 
                    return
222
 
            else:
223
 
                (revno, revid) = revision[0].in_history(br)
 
246
        if revision is None:
 
247
            revid = br.last_revision()
 
248
            if revid is None:
 
249
                return
 
250
        else:
 
251
            (revno, revid) = revision[0].in_history(br)
224
252
 
225
 
            from viz.branchwin import BranchWindow
226
 
            import gtk
227
 
                
228
 
            pp = BranchWindow()
229
 
            pp.set_branch(br, revid, limit)
230
 
            pp.connect("destroy", lambda w: gtk.main_quit())
231
 
            pp.show()
232
 
            gtk.main()
233
 
        finally:
234
 
            br.repository.unlock()
235
 
            br.unlock()
 
253
        import gtk
 
254
        pp = start_viz_window(br, revid, limit)
 
255
        pp.connect("destroy", lambda w: gtk.main_quit())
 
256
        pp.show()
 
257
        gtk.main()
236
258
 
237
259
 
238
260
class cmd_gannotate(GTKCommand):
243
265
 
244
266
    takes_args = ["filename", "line?"]
245
267
    takes_options = [
246
 
        Option("all", help="show annotations on all lines"),
247
 
        Option("plain", help="don't highlight annotation lines"),
 
268
        Option("all", help="Show annotations on all lines."),
 
269
        Option("plain", help="Don't highlight annotation lines."),
248
270
        Option("line", type=int, argname="lineno",
249
 
               help="jump to specified line number"),
 
271
               help="Jump to specified line number."),
250
272
        "revision",
251
273
    ]
252
274
    aliases = ["gblame", "gpraise"]
284
306
 
285
307
        window = GAnnotateWindow(all, plain)
286
308
        window.connect("destroy", lambda w: gtk.main_quit())
287
 
        window.set_title(path + " - gannotate")
288
309
        config = GAnnotateConfig(window)
289
310
        window.show()
290
311
        br.lock_read()
305
326
    """GTK+ commit dialog
306
327
 
307
328
    Graphical user interface for committing revisions"""
308
 
    
 
329
 
309
330
    aliases = [ "gci" ]
310
331
    takes_args = []
311
332
    takes_options = []
323
344
        try:
324
345
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
325
346
            br = wt.branch
326
 
        except NotBranchError, e:
327
 
            path = e.path
328
347
        except NoWorkingTree, e:
329
 
            path = e.base
330
 
            try:
331
 
                (br, path) = branch.Branch.open_containing(path)
332
 
            except NotBranchError, e:
333
 
                path = e.path
334
 
 
335
 
        commit = CommitDialog(wt, path, not br)
336
 
        commit.run()
337
 
 
 
348
            from dialog import error_dialog
 
349
            error_dialog(_('Directory does not have a working tree'),
 
350
                         _('Operation aborted.'))
 
351
            return 1 # should this be retval=3?
 
352
 
 
353
        # It is a good habit to keep things locked for the duration, but it
 
354
        # could cause difficulties if someone wants to do things in another
 
355
        # window... We could lock_read() until we actually go to commit
 
356
        # changes... Just a thought.
 
357
        wt.lock_write()
 
358
        try:
 
359
            dlg = CommitDialog(wt)
 
360
            return dlg.run()
 
361
        finally:
 
362
            wt.unlock()
338
363
 
339
364
 
340
365
class cmd_gstatus(GTKCommand):
357
382
        status.run()
358
383
 
359
384
 
 
385
class cmd_gsend(GTKCommand):
 
386
    """GTK+ send merge directive.
 
387
 
 
388
    """
 
389
    def run(self):
 
390
        (br, path) = branch.Branch.open_containing(".")
 
391
        gtk = self.open_display()
 
392
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
 
393
        from StringIO import StringIO
 
394
        dialog = SendMergeDirectiveDialog(br)
 
395
        if dialog.run() == gtk.RESPONSE_OK:
 
396
            outf = StringIO()
 
397
            outf.writelines(dialog.get_merge_directive().to_lines())
 
398
            mail_client = br.get_config().get_mail_client()
 
399
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
 
400
                outf.getvalue())
 
401
 
 
402
            
 
403
 
360
404
 
361
405
class cmd_gconflicts(GTKCommand):
362
 
    """ GTK+ push.
 
406
    """GTK+ conflicts.
363
407
    
 
408
    Select files from the list of conflicts and run an external utility to
 
409
    resolve them.
364
410
    """
365
411
    def run(self):
366
412
        (wt, path) = workingtree.WorkingTree.open_containing('.')
370
416
        dialog.run()
371
417
 
372
418
 
373
 
 
374
419
class cmd_gpreferences(GTKCommand):
375
420
    """ GTK+ preferences dialog.
376
421
 
382
427
        dialog.run()
383
428
 
384
429
 
385
 
 
386
430
class cmd_gmissing(Command):
387
431
    """ GTK+ missing revisions dialog.
388
432
 
427
471
        dialog.run()
428
472
 
429
473
 
 
474
class cmd_gtags(GTKCommand):
 
475
    def run(self):
 
476
        br = branch.Branch.open_containing('.')[0]
 
477
        
 
478
        gtk = self.open_display()
 
479
        from tags import TagsWindow
 
480
        window = TagsWindow(br)
 
481
        window.show()
 
482
        gtk.main()
 
483
 
 
484
 
430
485
commands = [
 
486
    cmd_gannotate, 
 
487
    cmd_gbranch,
 
488
    cmd_gcheckout, 
 
489
    cmd_gcommit, 
 
490
    cmd_gconflicts, 
 
491
    cmd_gdiff,
 
492
    cmd_ginit,
431
493
    cmd_gmissing, 
432
494
    cmd_gpreferences, 
433
 
    cmd_gconflicts, 
 
495
    cmd_gpush, 
 
496
    cmd_gsend,
434
497
    cmd_gstatus,
435
 
    cmd_gcommit, 
436
 
    cmd_gannotate, 
437
 
    cmd_visualise, 
438
 
    cmd_gdiff,
439
 
    cmd_gpush, 
440
 
    cmd_gcheckout, 
441
 
    cmd_gbranch,
442
 
    cmd_ginit
 
498
    cmd_gtags,
 
499
    cmd_visualise
443
500
    ]
444
501
 
445
502
for cmd in commands:
454
511
    """
455
512
 
456
513
    def run(self):
 
514
        from notify import NotifyPopupMenu
457
515
        gtk = self.open_display()
 
516
        menu = NotifyPopupMenu()
 
517
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
518
        icon.connect('popup-menu', menu.display)
 
519
 
458
520
        import cgi
459
521
        import dbus
460
522
        import dbus.service
471
533
        broadcast_service = bus.get_object(
472
534
            activity.Broadcast.DBUS_NAME,
473
535
            activity.Broadcast.DBUS_PATH)
 
536
 
474
537
        def catch_branch(revision_id, urls):
475
538
            # TODO: show all the urls, or perhaps choose the 'best'.
476
539
            url = urls[0]
490
553
                body += revision.message
491
554
                body = cgi.escape(body)
492
555
                nw = pynotify.Notification(summary, body)
 
556
                def start_viz(notification=None, action=None, data=None):
 
557
                    """Start the viz program."""
 
558
                    pp = start_viz_window(branch, revision_id)
 
559
                    pp.show()
 
560
                def start_branch(notification=None, action=None, data=None):
 
561
                    """Start a Branch dialog"""
 
562
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
563
                    bd = BranchDialog(remote_path=url)
 
564
                    bd.run()
 
565
                nw.add_action("inspect", "Inspect", start_viz, None)
 
566
                nw.add_action("branch", "Branch", start_branch, None)
493
567
                nw.set_timeout(5000)
494
568
                nw.show()
495
569
            except Exception, e:
503
577
register_command(cmd_commit_notify)
504
578
 
505
579
 
 
580
class cmd_gselftest(GTKCommand):
 
581
    """Version of selftest that displays a notification at the end"""
 
582
 
 
583
    takes_args = builtins.cmd_selftest.takes_args
 
584
    takes_options = builtins.cmd_selftest.takes_options
 
585
    _see_also = ['selftest']
 
586
 
 
587
    def run(self, *args, **kwargs):
 
588
        import cgi
 
589
        import sys
 
590
        default_encoding = sys.getdefaultencoding()
 
591
        # prevent gtk from blowing up later
 
592
        gtk = import_pygtk()
 
593
        # prevent gtk from messing with default encoding
 
594
        import pynotify
 
595
        if sys.getdefaultencoding() != default_encoding:
 
596
            reload(sys)
 
597
            sys.setdefaultencoding(default_encoding)
 
598
        result = builtins.cmd_selftest().run(*args, **kwargs)
 
599
        if result == 0:
 
600
            summary = 'Success'
 
601
            body = 'Selftest succeeded in "%s"' % os.getcwd()
 
602
        if result == 1:
 
603
            summary = 'Failure'
 
604
            body = 'Selftest failed in "%s"' % os.getcwd()
 
605
        pynotify.init("bzr gselftest")
 
606
        note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
 
607
        note.set_timeout(pynotify.EXPIRES_NEVER)
 
608
        note.show()
 
609
 
 
610
 
 
611
register_command(cmd_gselftest)
 
612
 
 
613
 
 
614
class cmd_test_gtk(GTKCommand):
 
615
    """Version of selftest that just runs the gtk test suite."""
 
616
 
 
617
    takes_options = ['verbose',
 
618
                     Option('one', short_name='1',
 
619
                            help='Stop when one test fails.'),
 
620
                     Option('benchmark', help='Run the benchmarks.'),
 
621
                     Option('lsprof-timed',
 
622
                     help='Generate lsprof output for benchmarked'
 
623
                          ' sections of code.'),
 
624
                     Option('list-only',
 
625
                     help='List the tests instead of running them.'),
 
626
                     Option('randomize', type=str, argname="SEED",
 
627
                     help='Randomize the order of tests using the given'
 
628
                          ' seed or "now" for the current time.'),
 
629
                    ]
 
630
    takes_args = ['testspecs*']
 
631
 
 
632
    def run(self, verbose=None, one=False, benchmark=None,
 
633
            lsprof_timed=None, list_only=False, randomize=None,
 
634
            testspecs_list=None):
 
635
        from bzrlib import __path__ as bzrlib_path
 
636
        from bzrlib.tests import selftest
 
637
 
 
638
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
 
639
        if benchmark:
 
640
            print 'No benchmarks yet'
 
641
            return 3
 
642
 
 
643
            test_suite_factory = bench_suite
 
644
            if verbose is None:
 
645
                verbose = True
 
646
            # TODO: should possibly lock the history file...
 
647
            benchfile = open(".perf_history", "at", buffering=1)
 
648
        else:
 
649
            test_suite_factory = test_suite
 
650
            if verbose is None:
 
651
                verbose = False
 
652
            benchfile = None
 
653
 
 
654
        if testspecs_list is not None:
 
655
            pattern = '|'.join(testspecs_list)
 
656
        else:
 
657
            pattern = ".*"
 
658
 
 
659
        try:
 
660
            result = selftest(verbose=verbose,
 
661
                              pattern=pattern,
 
662
                              stop_on_failure=one,
 
663
                              test_suite_factory=test_suite_factory,
 
664
                              lsprof_timed=lsprof_timed,
 
665
                              bench_history=benchfile,
 
666
                              list_only=list_only,
 
667
                              random_seed=randomize,
 
668
                             )
 
669
        finally:
 
670
            if benchfile is not None:
 
671
                benchfile.close()
 
672
 
 
673
register_command(cmd_test_gtk)
 
674
 
 
675
 
 
676
class cmd_ghandle_patch(GTKCommand):
 
677
    """Display a patch or merge directive, possibly merging.
 
678
 
 
679
    This is a helper, meant to be launched from other programs like browsers
 
680
    or email clients.  Since these programs often do not allow parameters to
 
681
    be provided, a "handle-patch" script is included.
 
682
    """
 
683
 
 
684
    takes_args = ['path']
 
685
 
 
686
    def run(self, path):
 
687
        try:
 
688
            from bzrlib.plugins.gtk.diff import (DiffWindow,
 
689
                                                 MergeDirectiveWindow)
 
690
            lines = open(path, 'rb').readlines()
 
691
            lines = [l.replace('\r\n', '\n') for l in lines]
 
692
            try:
 
693
                directive = merge_directive.MergeDirective.from_lines(lines)
 
694
            except errors.NotAMergeDirective:
 
695
                window = DiffWindow()
 
696
                window.set_diff_text(path, lines)
 
697
            else:
 
698
                window = MergeDirectiveWindow(directive, path)
 
699
                window.set_diff_text(path, directive.patch.splitlines(True))
 
700
            window.show()
 
701
            gtk = self.open_display()
 
702
            window.connect("destroy", gtk.main_quit)
 
703
        except Exception, e:
 
704
            from dialog import error_dialog
 
705
            error_dialog('Error', str(e))
 
706
            raise
 
707
        gtk.main()
 
708
 
 
709
 
 
710
register_command(cmd_ghandle_patch)
 
711
 
 
712
 
506
713
import gettext
507
714
gettext.install('olive-gtk')
508
715
 
521
728
    default_encoding = sys.getdefaultencoding()
522
729
    try:
523
730
        result = TestSuite()
 
731
        try:
 
732
            import_pygtk()
 
733
        except errors.BzrCommandError:
 
734
            return result
524
735
        result.addTest(tests.test_suite())
525
736
    finally:
526
737
        if sys.getdefaultencoding() != default_encoding: