/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
"""Graphical support for Bazaar using GTK.
16
16
 
17
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. 
 
18
gannotate         GTK+ annotate.
 
19
gbranch           GTK+ branching.
 
20
gcheckout         GTK+ checkout.
22
21
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.
 
22
gconflicts        GTK+ conflicts.
 
23
gdiff             Show differences in working tree in a GTK+ Window.
26
24
ginit             Initialise a new branch.
27
 
gmissing          GTK+ missing revisions dialog. 
28
 
gpreferences      GTK+ preferences dialog. 
 
25
gloom             GTK+ loom browse dialog
 
26
gmerge            GTK+ merge dialog
 
27
gmissing          GTK+ missing revisions dialog.
 
28
gpreferences      GTK+ preferences dialog.
29
29
gpush             GTK+ push.
30
30
gsend             GTK+ send merge directive.
31
31
gstatus           GTK+ status dialog.
32
32
gtags             Manage branch tags.
33
 
visualise         Graphically visualise this branch. 
 
33
visualise         Graphically visualise this branch.
34
34
"""
35
35
 
 
36
from __future__ import absolute_import
 
37
 
 
38
import os
36
39
import sys
37
40
 
 
41
if getattr(sys, "frozen", None) is not None: # we run bzr.exe
 
42
 
 
43
    # FIXME: Unless a better packaging solution is found, the following
 
44
    # provides a workaround for https://bugs.launchpad.net/bzr/+bug/388790 Also
 
45
    # see https://code.edge.launchpad.net/~vila/bzr-gtk/388790-windows-setup
 
46
    # for more details about while it's needed.
 
47
 
 
48
    # NOTE: _lib must be ahead of bzrlib or sax.saxutils (in olive) fails
 
49
    here = os.path.dirname(__file__)
 
50
    sys.path.insert(0, os.path.join(here, '_lib'))
 
51
    sys.path.append(os.path.join(here, '_lib/gtk-2.0'))
 
52
 
 
53
 
38
54
import bzrlib
 
55
import bzrlib.api
 
56
from bzrlib.commands import plugin_cmds
39
57
 
40
 
version_info = (0, 94, 0, 'dev', 0)
 
58
from bzrlib.plugins.gtk.info import (
 
59
    bzr_plugin_version as version_info,
 
60
    bzr_compatible_versions,
 
61
    )
41
62
 
42
63
if version_info[3] == 'final':
43
64
    version_string = '%d.%d.%d' % version_info[:3]
45
66
    version_string = '%d.%d.%d%s%d' % version_info
46
67
__version__ = version_string
47
68
 
48
 
required_bzrlib = (1, 3)
49
 
 
50
 
def check_bzrlib_version(desired):
51
 
    """Check that bzrlib is compatible.
52
 
 
53
 
    If version is < bzr-gtk version, assume incompatible.
54
 
    """
55
 
    bzrlib_version = bzrlib.version_info[:2]
56
 
    try:
57
 
        from bzrlib.trace import warning
58
 
    except ImportError:
59
 
        # get the message out any way we can
60
 
        from warnings import warn as warning
61
 
    if bzrlib_version < desired:
62
 
        from bzrlib.errors import BzrError
63
 
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
64
 
                ' %s.' % (bzrlib.__version__, __version__))
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)
70
 
 
71
 
from bzrlib.trace import warning
 
69
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
 
70
 
72
71
if __name__ != 'bzrlib.plugins.gtk':
 
72
    from bzrlib.trace import warning
73
73
    warning("Not running as bzrlib.plugins.gtk, things may break.")
74
74
 
75
 
from bzrlib.lazy_import import lazy_import
76
 
lazy_import(globals(), """
77
 
from bzrlib import (
78
 
    branch,
79
 
    builtins,
80
 
    errors,
81
 
    merge_directive,
82
 
    workingtree,
83
 
    )
84
 
""")
85
 
 
86
 
from bzrlib.commands import Command, register_command, display_command
87
 
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
88
 
from bzrlib.option import Option
89
 
 
90
 
import os.path
91
 
 
92
 
def import_pygtk():
93
 
    try:
94
 
        import pygtk
95
 
    except ImportError:
96
 
        raise errors.BzrCommandError("PyGTK not installed.")
97
 
    pygtk.require('2.0')
98
 
    return pygtk
99
 
 
100
75
 
101
76
def set_ui_factory():
102
 
    import_pygtk()
103
 
    from ui import GtkUIFactory
 
77
    from bzrlib.plugins.gtk.ui import GtkUIFactory
104
78
    import bzrlib.ui
105
79
    bzrlib.ui.ui_factory = GtkUIFactory()
106
80
 
107
81
 
108
 
def data_path():
109
 
    return os.path.dirname(__file__)
110
 
 
111
 
 
112
 
class GTKCommand(Command):
113
 
    """Abstract class providing GTK specific run commands."""
114
 
 
115
 
    def open_display(self):
116
 
        pygtk = import_pygtk()
117
 
        try:
118
 
            import gtk
119
 
        except RuntimeError, e:
120
 
            if str(e) == "could not open display":
121
 
                raise NoDisplayError
122
 
        set_ui_factory()
123
 
        return gtk
124
 
 
125
 
    def run(self):
126
 
        self.open_display()
127
 
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
128
 
        dialog.run()
129
 
 
130
 
 
131
 
class cmd_gbranch(GTKCommand):
132
 
    """GTK+ branching.
133
 
    
134
 
    """
135
 
 
136
 
    def get_gtk_dialog(self, path):
137
 
        from bzrlib.plugins.gtk.branch import BranchDialog
138
 
        return BranchDialog(path)
139
 
 
140
 
 
141
 
class cmd_gcheckout(GTKCommand):
142
 
    """ GTK+ checkout.
143
 
    
144
 
    """
145
 
    
146
 
    def get_gtk_dialog(self, path):
147
 
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
148
 
        return CheckoutDialog(path)
149
 
 
150
 
 
151
 
 
152
 
class cmd_gpush(GTKCommand):
153
 
    """ GTK+ push.
154
 
    
155
 
    """
156
 
    takes_args = [ "location?" ]
157
 
 
158
 
    def run(self, location="."):
159
 
        (br, path) = branch.Branch.open_containing(location)
160
 
        self.open_display()
161
 
        from push import PushDialog
162
 
        dialog = PushDialog(br.repository, br.last_revision(), br)
163
 
        dialog.run()
164
 
 
165
 
 
166
 
 
167
 
class cmd_gdiff(GTKCommand):
168
 
    """Show differences in working tree in a GTK+ Window.
169
 
    
170
 
    Otherwise, all changes for the tree are listed.
171
 
    """
172
 
    takes_args = ['filename?']
173
 
    takes_options = ['revision']
174
 
 
175
 
    @display_command
176
 
    def run(self, revision=None, filename=None):
177
 
        set_ui_factory()
178
 
        wt = workingtree.WorkingTree.open_containing(".")[0]
179
 
        wt.lock_read()
180
 
        try:
181
 
            branch = wt.branch
182
 
            if revision is not None:
183
 
                if len(revision) == 1:
184
 
                    tree1 = wt
185
 
                    revision_id = revision[0].in_history(branch).rev_id
186
 
                    tree2 = branch.repository.revision_tree(revision_id)
187
 
                elif len(revision) == 2:
188
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
189
 
                    tree2 = branch.repository.revision_tree(revision_id_0)
190
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
191
 
                    tree1 = branch.repository.revision_tree(revision_id_1)
192
 
            else:
193
 
                tree1 = wt
194
 
                tree2 = tree1.basis_tree()
195
 
 
196
 
            from diff import DiffWindow
197
 
            import gtk
198
 
            window = DiffWindow()
199
 
            window.connect("destroy", gtk.main_quit)
200
 
            window.set_diff("Working Tree", tree1, tree2)
201
 
            if filename is not None:
202
 
                tree_filename = wt.relpath(filename)
203
 
                try:
204
 
                    window.set_file(tree_filename)
205
 
                except NoSuchFile:
206
 
                    if (tree1.path2id(tree_filename) is None and 
207
 
                        tree2.path2id(tree_filename) is None):
208
 
                        raise NotVersionedError(filename)
209
 
                    raise BzrCommandError('No changes found for file "%s"' % 
210
 
                                          filename)
211
 
            window.show()
212
 
 
213
 
            gtk.main()
214
 
        finally:
215
 
            wt.unlock()
216
 
 
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
 
 
227
 
class cmd_visualise(Command):
228
 
    """Graphically visualise this branch.
229
 
 
230
 
    Opens a graphical window to allow you to see the history of the branch
231
 
    and relationships between revisions in a visual manner,
232
 
 
233
 
    The default starting point is latest revision on the branch, you can
234
 
    specify a starting point with -r revision.
235
 
    """
236
 
    takes_options = [
237
 
        "revision",
238
 
        Option('limit', "Maximum number of revisions to display.",
239
 
               int, 'count')]
240
 
    takes_args = [ "location?" ]
241
 
    aliases = [ "visualize", "vis", "viz" ]
242
 
 
243
 
    def run(self, location=".", revision=None, limit=None):
244
 
        set_ui_factory()
245
 
        (br, path) = branch.Branch.open_containing(location)
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)
252
 
 
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()
258
 
 
259
 
 
260
 
class cmd_gannotate(GTKCommand):
261
 
    """GTK+ annotate.
262
 
    
263
 
    Browse changes to FILENAME line by line in a GTK+ window.
264
 
    """
265
 
 
266
 
    takes_args = ["filename", "line?"]
267
 
    takes_options = [
268
 
        Option("all", help="Show annotations on all lines."),
269
 
        Option("plain", help="Don't highlight annotation lines."),
270
 
        Option("line", type=int, argname="lineno",
271
 
               help="Jump to specified line number."),
272
 
        "revision",
273
 
    ]
274
 
    aliases = ["gblame", "gpraise"]
275
 
    
276
 
    def run(self, filename, all=False, plain=False, line='1', revision=None):
277
 
        gtk = self.open_display()
278
 
 
279
 
        try:
280
 
            line = int(line)
281
 
        except ValueError:
282
 
            raise BzrCommandError('Line argument ("%s") is not a number.' % 
283
 
                                  line)
284
 
 
285
 
        from annotate.gannotate import GAnnotateWindow
286
 
        from annotate.config import GAnnotateConfig
287
 
        from bzrlib.bzrdir import BzrDir
288
 
 
289
 
        wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
290
 
        if wt is not None:
291
 
            tree = wt
292
 
        else:
293
 
            tree = br.basis_tree()
294
 
 
295
 
        file_id = tree.path2id(path)
296
 
 
297
 
        if file_id is None:
298
 
            raise NotVersionedError(filename)
299
 
        if revision is not None:
300
 
            if len(revision) != 1:
301
 
                raise BzrCommandError("Only 1 revion may be specified.")
302
 
            revision_id = revision[0].in_history(br).rev_id
303
 
            tree = br.repository.revision_tree(revision_id)
304
 
        else:
305
 
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
306
 
 
307
 
        window = GAnnotateWindow(all, plain)
308
 
        window.connect("destroy", lambda w: gtk.main_quit())
309
 
        config = GAnnotateConfig(window)
310
 
        window.show()
311
 
        br.lock_read()
312
 
        if wt is not None:
313
 
            wt.lock_read()
314
 
        try:
315
 
            window.annotate(tree, br, file_id)
316
 
            window.jump_to_line(line)
317
 
            gtk.main()
318
 
        finally:
319
 
            br.unlock()
320
 
            if wt is not None:
321
 
                wt.unlock()
322
 
 
323
 
 
324
 
 
325
 
class cmd_gcommit(GTKCommand):
326
 
    """GTK+ commit dialog
327
 
 
328
 
    Graphical user interface for committing revisions"""
329
 
 
330
 
    aliases = [ "gci" ]
331
 
    takes_args = []
332
 
    takes_options = []
333
 
 
334
 
    def run(self, filename=None):
335
 
        import os
336
 
        self.open_display()
337
 
        from commit import CommitDialog
338
 
        from bzrlib.errors import (BzrCommandError,
339
 
                                   NotBranchError,
340
 
                                   NoWorkingTree)
341
 
 
342
 
        wt = None
343
 
        br = None
344
 
        try:
345
 
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
346
 
            br = wt.branch
347
 
        except NoWorkingTree, e:
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()
363
 
 
364
 
 
365
 
class cmd_gstatus(GTKCommand):
366
 
    """GTK+ status dialog
367
 
 
368
 
    Graphical user interface for showing status 
369
 
    information."""
370
 
    
371
 
    aliases = [ "gst" ]
372
 
    takes_args = ['PATH?']
373
 
    takes_options = []
374
 
 
375
 
    def run(self, path='.'):
376
 
        import os
377
 
        gtk = self.open_display()
378
 
        from status import StatusDialog
379
 
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
380
 
        status = StatusDialog(wt, wt_path)
381
 
        status.connect("destroy", gtk.main_quit)
382
 
        status.run()
383
 
 
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
 
 
404
 
 
405
 
class cmd_gconflicts(GTKCommand):
406
 
    """GTK+ conflicts.
407
 
    
408
 
    Select files from the list of conflicts and run an external utility to
409
 
    resolve them.
410
 
    """
411
 
    def run(self):
412
 
        (wt, path) = workingtree.WorkingTree.open_containing('.')
413
 
        self.open_display()
414
 
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
415
 
        dialog = ConflictsDialog(wt)
416
 
        dialog.run()
417
 
 
418
 
 
419
 
class cmd_gpreferences(GTKCommand):
420
 
    """ GTK+ preferences dialog.
421
 
 
422
 
    """
423
 
    def run(self):
424
 
        self.open_display()
425
 
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
426
 
        dialog = PreferencesWindow()
427
 
        dialog.run()
428
 
 
429
 
 
430
 
class cmd_gmissing(Command):
431
 
    """ GTK+ missing revisions dialog.
432
 
 
433
 
    """
434
 
    takes_args = ["other_branch?"]
435
 
    def run(self, other_branch=None):
436
 
        pygtk = import_pygtk()
437
 
        try:
438
 
            import gtk
439
 
        except RuntimeError, e:
440
 
            if str(e) == "could not open display":
441
 
                raise NoDisplayError
442
 
 
443
 
        from bzrlib.plugins.gtk.missing import MissingWindow
444
 
        from bzrlib.branch import Branch
445
 
 
446
 
        local_branch = Branch.open_containing(".")[0]
447
 
        if other_branch is None:
448
 
            other_branch = local_branch.get_parent()
449
 
            
450
 
            if other_branch is None:
451
 
                raise errors.BzrCommandError("No peer location known or specified.")
452
 
        remote_branch = Branch.open_containing(other_branch)[0]
453
 
        set_ui_factory()
454
 
        local_branch.lock_read()
455
 
        try:
456
 
            remote_branch.lock_read()
457
 
            try:
458
 
                dialog = MissingWindow(local_branch, remote_branch)
459
 
                dialog.run()
460
 
            finally:
461
 
                remote_branch.unlock()
462
 
        finally:
463
 
            local_branch.unlock()
464
 
 
465
 
 
466
 
class cmd_ginit(GTKCommand):
467
 
    def run(self):
468
 
        self.open_display()
469
 
        from initialize import InitDialog
470
 
        dialog = InitDialog(os.path.abspath(os.path.curdir))
471
 
        dialog.run()
472
 
 
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
 
 
485
 
commands = [
486
 
    cmd_gannotate, 
487
 
    cmd_gbranch,
488
 
    cmd_gcheckout, 
489
 
    cmd_gcommit, 
490
 
    cmd_gconflicts, 
491
 
    cmd_gdiff,
492
 
    cmd_ginit,
493
 
    cmd_gmissing, 
494
 
    cmd_gpreferences, 
495
 
    cmd_gpush, 
496
 
    cmd_gsend,
497
 
    cmd_gstatus,
498
 
    cmd_gtags,
499
 
    cmd_visualise
500
 
    ]
501
 
 
502
 
for cmd in commands:
503
 
    register_command(cmd)
504
 
 
505
 
 
506
 
class cmd_commit_notify(GTKCommand):
507
 
    """Run the bzr commit notifier.
508
 
 
509
 
    This is a background program which will pop up a notification on the users
510
 
    screen when a commit occurs.
511
 
    """
512
 
 
513
 
    def run(self):
514
 
        from notify import NotifyPopupMenu
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
 
 
520
 
        import cgi
521
 
        import dbus
522
 
        import dbus.service
523
 
        import pynotify
524
 
        from bzrlib.bzrdir import BzrDir
525
 
        from bzrlib import errors
526
 
        from bzrlib.osutils import format_date
527
 
        from bzrlib.transport import get_transport
528
 
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
529
 
            import dbus.glib
530
 
        from bzrlib.plugins.dbus import activity
531
 
        bus = dbus.SessionBus()
532
 
        # get the object so we can subscribe to callbacks from it.
533
 
        broadcast_service = bus.get_object(
534
 
            activity.Broadcast.DBUS_NAME,
535
 
            activity.Broadcast.DBUS_PATH)
536
 
 
537
 
        def catch_branch(revision_id, urls):
538
 
            # TODO: show all the urls, or perhaps choose the 'best'.
539
 
            url = urls[0]
540
 
            try:
541
 
                if isinstance(revision_id, unicode):
542
 
                    revision_id = revision_id.encode('utf8')
543
 
                transport = get_transport(url)
544
 
                a_dir = BzrDir.open_from_transport(transport)
545
 
                branch = a_dir.open_branch()
546
 
                revno = branch.revision_id_to_revno(revision_id)
547
 
                revision = branch.repository.get_revision(revision_id)
548
 
                summary = 'New revision %d in %s' % (revno, url)
549
 
                body  = 'Committer: %s\n' % revision.committer
550
 
                body += 'Date: %s\n' % format_date(revision.timestamp,
551
 
                    revision.timezone)
552
 
                body += '\n'
553
 
                body += revision.message
554
 
                body = cgi.escape(body)
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)
567
 
                nw.set_timeout(5000)
568
 
                nw.show()
569
 
            except Exception, e:
570
 
                print e
571
 
                raise
572
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
573
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
574
 
        pynotify.init("bzr commit-notify")
575
 
        gtk.main()
576
 
 
577
 
register_command(cmd_commit_notify)
578
 
 
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
 
 
713
 
import gettext
714
 
gettext.install('olive-gtk')
715
 
 
716
 
 
717
 
class NoDisplayError(BzrCommandError):
718
 
    """gtk could not find a proper display"""
719
 
 
720
 
    def __str__(self):
721
 
        return "No DISPLAY. Unable to run GTK+ application."
722
 
 
723
 
 
724
 
def test_suite():
725
 
    from unittest import TestSuite
726
 
    import tests
 
82
def data_basedirs():
 
83
    return [os.path.dirname(__file__),
 
84
             "/usr/share/bzr-gtk", 
 
85
             "/usr/local/share/bzr-gtk"]
 
86
 
 
87
 
 
88
def data_path(*args):
 
89
    for basedir in data_basedirs():
 
90
        path = os.path.join(basedir, *args)
 
91
        if os.path.exists(path):
 
92
            return path
 
93
    return None
 
94
 
 
95
 
 
96
def icon_path(*args):
 
97
    return data_path(os.path.join('icons', *args))
 
98
 
 
99
 
 
100
commands = {
 
101
    "gannotate": ["gblame", "gpraise"],
 
102
    "gbranch": [],
 
103
    "gcheckout": [],
 
104
    "gcommit": ["gci"],
 
105
    "gconflicts": [],
 
106
    "gdiff": [],
 
107
    "ginit": [],
 
108
    "gmerge": [],
 
109
    "gmissing": [],
 
110
    "gpreferences": [],
 
111
    "gpush": [],
 
112
    "gsend": [],
 
113
    "gstatus": ["gst"],
 
114
    "gtags": [],
 
115
    "visualise": ["visualize", "vis", "viz", 'glog'],
 
116
    }
 
117
 
 
118
try:
 
119
    from bzrlib.plugins import loom
 
120
except ImportError:
 
121
    pass # Loom plugin doesn't appear to be present
 
122
else:
 
123
    commands["gloom"] = []
 
124
 
 
125
for cmd, aliases in commands.iteritems():
 
126
    plugin_cmds.register_lazy("cmd_%s" % cmd, aliases,
 
127
                              "bzrlib.plugins.gtk.commands")
 
128
 
 
129
def save_commit_messages(*args):
 
130
    from bzrlib.plugins.gtk import commitmsgs
 
131
    commitmsgs.save_commit_messages(*args)
 
132
 
 
133
try:
 
134
    from bzrlib.hooks import install_lazy_named_hook
 
135
except ImportError:
 
136
    from bzrlib.branch import Branch
 
137
    Branch.hooks.install_named_hook('post_uncommit',
 
138
                                    save_commit_messages,
 
139
                                    "Saving commit messages for gcommit")
 
140
else:
 
141
    install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
 
142
        'post_uncommit', save_commit_messages, "Saving commit messages for gcommit")
 
143
 
 
144
try:
 
145
    from bzrlib.registry import register_lazy
 
146
except ImportError:
 
147
    from bzrlib import config
 
148
    option_registry = getattr(config, "option_registry", None)
 
149
    if option_registry is not None:
 
150
        config.option_registry.register_lazy('nautilus_integration',
 
151
                'bzrlib.plugins.gtk.config', 'opt_nautilus_integration')
 
152
else:
 
153
    register_lazy("bzrlib.config", "option_registry",
 
154
        'nautilus_integration', 'bzrlib.plugins.gtk.config',
 
155
        'opt_nautilus_integration')
 
156
 
 
157
 
 
158
def load_tests(basic_tests, module, loader):
 
159
    testmod_names = [
 
160
        'tests',
 
161
        ]
727
162
    import sys
728
163
    default_encoding = sys.getdefaultencoding()
729
164
    try:
730
 
        result = TestSuite()
 
165
        result = basic_tests
731
166
        try:
732
 
            import_pygtk()
733
 
        except errors.BzrCommandError:
734
 
            return result
735
 
        result.addTest(tests.test_suite())
 
167
            import gi.repository.Gtk
 
168
        except ImportError:
 
169
            return basic_tests
 
170
        basic_tests.addTest(loader.loadTestsFromModuleNames(
 
171
                ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
736
172
    finally:
737
173
        if sys.getdefaultencoding() != default_encoding:
738
174
            reload(sys)
739
175
            sys.setdefaultencoding(default_encoding)
740
 
    return result
 
176
    return basic_tests
 
177