/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: Martin Albisetti
  • Date: 2008-03-04 22:13:43 UTC
  • mto: This revision was merged to the branch mainline in revision 439.
  • Revision ID: argentina@gmail.com-20080304221343-ixbdn2uf87z3jnfl
Added custom colored context icons

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
 
gannotate         GTK+ annotate.
19
 
gbranch           GTK+ branching.
20
 
gcheckout         GTK+ checkout.
 
18
commit-notify     Start the graphical notifier of commits.
 
19
gannotate         GTK+ annotate. 
 
20
gbranch           GTK+ branching. 
 
21
gcheckout         GTK+ checkout. 
21
22
gcommit           GTK+ commit dialog.
22
 
gconflicts        GTK+ conflicts.
23
 
gdiff             Show differences in working tree in a GTK+ Window.
 
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.
24
26
ginit             Initialise a new branch.
25
 
gloom             GTK+ loom browse dialog
26
 
gmerge            GTK+ merge dialog
27
 
gmissing          GTK+ missing revisions dialog.
28
 
gpreferences      GTK+ preferences 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
39
36
import sys
40
37
 
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
 
 
54
38
import bzrlib
55
 
import bzrlib.api
56
 
from bzrlib.commands import plugin_cmds
57
39
 
58
 
from bzrlib.plugins.gtk.info import (
59
 
    bzr_plugin_version as version_info,
60
 
    bzr_compatible_versions,
61
 
    )
 
40
version_info = (0, 94, 0, 'dev', 0)
62
41
 
63
42
if version_info[3] == 'final':
64
43
    version_string = '%d.%d.%d' % version_info[:3]
66
45
    version_string = '%d.%d.%d%s%d' % version_info
67
46
__version__ = version_string
68
47
 
69
 
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
70
 
 
 
48
required_bzrlib = (1, 0)
 
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
71
72
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
 
75
100
 
76
101
def set_ui_factory():
77
 
    from bzrlib.plugins.gtk.ui import GtkUIFactory
 
102
    import_pygtk()
 
103
    from ui import GtkUIFactory
78
104
    import bzrlib.ui
79
105
    bzrlib.ui.ui_factory = GtkUIFactory()
80
106
 
81
107
 
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
 
        ]
 
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
        window.set_title(path + " - gannotate")
 
310
        config = GAnnotateConfig(window)
 
311
        window.show()
 
312
        br.lock_read()
 
313
        if wt is not None:
 
314
            wt.lock_read()
 
315
        try:
 
316
            window.annotate(tree, br, file_id)
 
317
            window.jump_to_line(line)
 
318
            gtk.main()
 
319
        finally:
 
320
            br.unlock()
 
321
            if wt is not None:
 
322
                wt.unlock()
 
323
 
 
324
 
 
325
 
 
326
class cmd_gcommit(GTKCommand):
 
327
    """GTK+ commit dialog
 
328
 
 
329
    Graphical user interface for committing revisions"""
 
330
 
 
331
    aliases = [ "gci" ]
 
332
    takes_args = []
 
333
    takes_options = []
 
334
 
 
335
    def run(self, filename=None):
 
336
        import os
 
337
        self.open_display()
 
338
        from commit import CommitDialog
 
339
        from bzrlib.errors import (BzrCommandError,
 
340
                                   NotBranchError,
 
341
                                   NoWorkingTree)
 
342
 
 
343
        wt = None
 
344
        br = None
 
345
        try:
 
346
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
 
347
            br = wt.branch
 
348
        except NoWorkingTree, e:
 
349
            from dialog import error_dialog
 
350
            error_dialog(_('Directory does not have a working tree'),
 
351
                         _('Operation aborted.'))
 
352
            return 1 # should this be retval=3?
 
353
 
 
354
        # It is a good habit to keep things locked for the duration, but it
 
355
        # could cause difficulties if someone wants to do things in another
 
356
        # window... We could lock_read() until we actually go to commit
 
357
        # changes... Just a thought.
 
358
        wt.lock_write()
 
359
        try:
 
360
            dlg = CommitDialog(wt)
 
361
            return dlg.run()
 
362
        finally:
 
363
            wt.unlock()
 
364
 
 
365
 
 
366
class cmd_gstatus(GTKCommand):
 
367
    """GTK+ status dialog
 
368
 
 
369
    Graphical user interface for showing status 
 
370
    information."""
 
371
    
 
372
    aliases = [ "gst" ]
 
373
    takes_args = ['PATH?']
 
374
    takes_options = []
 
375
 
 
376
    def run(self, path='.'):
 
377
        import os
 
378
        gtk = self.open_display()
 
379
        from status import StatusDialog
 
380
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
 
381
        status = StatusDialog(wt, wt_path)
 
382
        status.connect("destroy", gtk.main_quit)
 
383
        status.run()
 
384
 
 
385
 
 
386
class cmd_gsend(GTKCommand):
 
387
    """GTK+ send merge directive.
 
388
 
 
389
    """
 
390
    def run(self):
 
391
        (br, path) = branch.Branch.open_containing(".")
 
392
        gtk = self.open_display()
 
393
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
 
394
        from StringIO import StringIO
 
395
        dialog = SendMergeDirectiveDialog(br)
 
396
        if dialog.run() == gtk.RESPONSE_OK:
 
397
            outf = StringIO()
 
398
            outf.writelines(dialog.get_merge_directive().to_lines())
 
399
            mail_client = br.get_config().get_mail_client()
 
400
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
 
401
                outf.getvalue())
 
402
 
 
403
            
 
404
 
 
405
 
 
406
class cmd_gconflicts(GTKCommand):
 
407
    """GTK+ conflicts.
 
408
    
 
409
    Select files from the list of conflicts and run an external utility to
 
410
    resolve them.
 
411
    """
 
412
    def run(self):
 
413
        (wt, path) = workingtree.WorkingTree.open_containing('.')
 
414
        self.open_display()
 
415
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
 
416
        dialog = ConflictsDialog(wt)
 
417
        dialog.run()
 
418
 
 
419
 
 
420
class cmd_gpreferences(GTKCommand):
 
421
    """ GTK+ preferences dialog.
 
422
 
 
423
    """
 
424
    def run(self):
 
425
        self.open_display()
 
426
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
427
        dialog = PreferencesWindow()
 
428
        dialog.run()
 
429
 
 
430
 
 
431
class cmd_gmissing(Command):
 
432
    """ GTK+ missing revisions dialog.
 
433
 
 
434
    """
 
435
    takes_args = ["other_branch?"]
 
436
    def run(self, other_branch=None):
 
437
        pygtk = import_pygtk()
 
438
        try:
 
439
            import gtk
 
440
        except RuntimeError, e:
 
441
            if str(e) == "could not open display":
 
442
                raise NoDisplayError
 
443
 
 
444
        from bzrlib.plugins.gtk.missing import MissingWindow
 
445
        from bzrlib.branch import Branch
 
446
 
 
447
        local_branch = Branch.open_containing(".")[0]
 
448
        if other_branch is None:
 
449
            other_branch = local_branch.get_parent()
 
450
            
 
451
            if other_branch is None:
 
452
                raise errors.BzrCommandError("No peer location known or specified.")
 
453
        remote_branch = Branch.open_containing(other_branch)[0]
 
454
        set_ui_factory()
 
455
        local_branch.lock_read()
 
456
        try:
 
457
            remote_branch.lock_read()
 
458
            try:
 
459
                dialog = MissingWindow(local_branch, remote_branch)
 
460
                dialog.run()
 
461
            finally:
 
462
                remote_branch.unlock()
 
463
        finally:
 
464
            local_branch.unlock()
 
465
 
 
466
 
 
467
class cmd_ginit(GTKCommand):
 
468
    def run(self):
 
469
        self.open_display()
 
470
        from initialize import InitDialog
 
471
        dialog = InitDialog(os.path.abspath(os.path.curdir))
 
472
        dialog.run()
 
473
 
 
474
 
 
475
class cmd_gtags(GTKCommand):
 
476
    def run(self):
 
477
        br = branch.Branch.open_containing('.')[0]
 
478
        
 
479
        gtk = self.open_display()
 
480
        from tags import TagsWindow
 
481
        window = TagsWindow(br)
 
482
        window.show()
 
483
        gtk.main()
 
484
 
 
485
 
 
486
commands = [
 
487
    cmd_gannotate, 
 
488
    cmd_gbranch,
 
489
    cmd_gcheckout, 
 
490
    cmd_gcommit, 
 
491
    cmd_gconflicts, 
 
492
    cmd_gdiff,
 
493
    cmd_ginit,
 
494
    cmd_gmissing, 
 
495
    cmd_gpreferences, 
 
496
    cmd_gpush, 
 
497
    cmd_gsend,
 
498
    cmd_gstatus,
 
499
    cmd_gtags,
 
500
    cmd_visualise
 
501
    ]
 
502
 
 
503
for cmd in commands:
 
504
    register_command(cmd)
 
505
 
 
506
 
 
507
class cmd_commit_notify(GTKCommand):
 
508
    """Run the bzr commit notifier.
 
509
 
 
510
    This is a background program which will pop up a notification on the users
 
511
    screen when a commit occurs.
 
512
    """
 
513
 
 
514
    def run(self):
 
515
        from notify import NotifyPopupMenu
 
516
        gtk = self.open_display()
 
517
        menu = NotifyPopupMenu()
 
518
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
519
        icon.connect('popup-menu', menu.display)
 
520
 
 
521
        import cgi
 
522
        import dbus
 
523
        import dbus.service
 
524
        import pynotify
 
525
        from bzrlib.bzrdir import BzrDir
 
526
        from bzrlib import errors
 
527
        from bzrlib.osutils import format_date
 
528
        from bzrlib.transport import get_transport
 
529
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
530
            import dbus.glib
 
531
        from bzrlib.plugins.dbus import activity
 
532
        bus = dbus.SessionBus()
 
533
        # get the object so we can subscribe to callbacks from it.
 
534
        broadcast_service = bus.get_object(
 
535
            activity.Broadcast.DBUS_NAME,
 
536
            activity.Broadcast.DBUS_PATH)
 
537
 
 
538
        def catch_branch(revision_id, urls):
 
539
            # TODO: show all the urls, or perhaps choose the 'best'.
 
540
            url = urls[0]
 
541
            try:
 
542
                if isinstance(revision_id, unicode):
 
543
                    revision_id = revision_id.encode('utf8')
 
544
                transport = get_transport(url)
 
545
                a_dir = BzrDir.open_from_transport(transport)
 
546
                branch = a_dir.open_branch()
 
547
                revno = branch.revision_id_to_revno(revision_id)
 
548
                revision = branch.repository.get_revision(revision_id)
 
549
                summary = 'New revision %d in %s' % (revno, url)
 
550
                body  = 'Committer: %s\n' % revision.committer
 
551
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
552
                    revision.timezone)
 
553
                body += '\n'
 
554
                body += revision.message
 
555
                body = cgi.escape(body)
 
556
                nw = pynotify.Notification(summary, body)
 
557
                def start_viz(notification=None, action=None, data=None):
 
558
                    """Start the viz program."""
 
559
                    pp = start_viz_window(branch, revision_id)
 
560
                    pp.show()
 
561
                def start_branch(notification=None, action=None, data=None):
 
562
                    """Start a Branch dialog"""
 
563
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
564
                    bd = BranchDialog(remote_path=url)
 
565
                    bd.run()
 
566
                nw.add_action("inspect", "Inspect", start_viz, None)
 
567
                nw.add_action("branch", "Branch", start_branch, None)
 
568
                nw.set_timeout(5000)
 
569
                nw.show()
 
570
            except Exception, e:
 
571
                print e
 
572
                raise
 
573
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
574
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
575
        pynotify.init("bzr commit-notify")
 
576
        gtk.main()
 
577
 
 
578
register_command(cmd_commit_notify)
 
579
 
 
580
 
 
581
class cmd_gselftest(GTKCommand):
 
582
    """Version of selftest that displays a notification at the end"""
 
583
 
 
584
    takes_args = builtins.cmd_selftest.takes_args
 
585
    takes_options = builtins.cmd_selftest.takes_options
 
586
    _see_also = ['selftest']
 
587
 
 
588
    def run(self, *args, **kwargs):
 
589
        import cgi
 
590
        import sys
 
591
        default_encoding = sys.getdefaultencoding()
 
592
        # prevent gtk from blowing up later
 
593
        gtk = import_pygtk()
 
594
        # prevent gtk from messing with default encoding
 
595
        import pynotify
 
596
        if sys.getdefaultencoding() != default_encoding:
 
597
            reload(sys)
 
598
            sys.setdefaultencoding(default_encoding)
 
599
        result = builtins.cmd_selftest().run(*args, **kwargs)
 
600
        if result == 0:
 
601
            summary = 'Success'
 
602
            body = 'Selftest succeeded in "%s"' % os.getcwd()
 
603
        if result == 1:
 
604
            summary = 'Failure'
 
605
            body = 'Selftest failed in "%s"' % os.getcwd()
 
606
        pynotify.init("bzr gselftest")
 
607
        note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
 
608
        note.set_timeout(pynotify.EXPIRES_NEVER)
 
609
        note.show()
 
610
 
 
611
 
 
612
register_command(cmd_gselftest)
 
613
 
 
614
 
 
615
class cmd_test_gtk(GTKCommand):
 
616
    """Version of selftest that just runs the gtk test suite."""
 
617
 
 
618
    takes_options = ['verbose',
 
619
                     Option('one', short_name='1',
 
620
                            help='Stop when one test fails.'),
 
621
                     Option('benchmark', help='Run the benchmarks.'),
 
622
                     Option('lsprof-timed',
 
623
                     help='Generate lsprof output for benchmarked'
 
624
                          ' sections of code.'),
 
625
                     Option('list-only',
 
626
                     help='List the tests instead of running them.'),
 
627
                     Option('randomize', type=str, argname="SEED",
 
628
                     help='Randomize the order of tests using the given'
 
629
                          ' seed or "now" for the current time.'),
 
630
                    ]
 
631
    takes_args = ['testspecs*']
 
632
 
 
633
    def run(self, verbose=None, one=False, benchmark=None,
 
634
            lsprof_timed=None, list_only=False, randomize=None,
 
635
            testspecs_list=None):
 
636
        from bzrlib import __path__ as bzrlib_path
 
637
        from bzrlib.tests import selftest
 
638
 
 
639
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
 
640
        if benchmark:
 
641
            print 'No benchmarks yet'
 
642
            return 3
 
643
 
 
644
            test_suite_factory = bench_suite
 
645
            if verbose is None:
 
646
                verbose = True
 
647
            # TODO: should possibly lock the history file...
 
648
            benchfile = open(".perf_history", "at", buffering=1)
 
649
        else:
 
650
            test_suite_factory = test_suite
 
651
            if verbose is None:
 
652
                verbose = False
 
653
            benchfile = None
 
654
 
 
655
        if testspecs_list is not None:
 
656
            pattern = '|'.join(testspecs_list)
 
657
        else:
 
658
            pattern = ".*"
 
659
 
 
660
        try:
 
661
            result = selftest(verbose=verbose,
 
662
                              pattern=pattern,
 
663
                              stop_on_failure=one,
 
664
                              test_suite_factory=test_suite_factory,
 
665
                              lsprof_timed=lsprof_timed,
 
666
                              bench_history=benchfile,
 
667
                              list_only=list_only,
 
668
                              random_seed=randomize,
 
669
                             )
 
670
        finally:
 
671
            if benchfile is not None:
 
672
                benchfile.close()
 
673
 
 
674
register_command(cmd_test_gtk)
 
675
 
 
676
 
 
677
class cmd_ghandle_patch(GTKCommand):
 
678
    """Display a patch or merge directive, possibly merging.
 
679
 
 
680
    This is a helper, meant to be launched from other programs like browsers
 
681
    or email clients.  Since these programs often do not allow parameters to
 
682
    be provided, a "handle-patch" script is included.
 
683
    """
 
684
 
 
685
    takes_args = ['path']
 
686
 
 
687
    def run(self, path):
 
688
        try:
 
689
            from bzrlib.plugins.gtk.diff import (DiffWindow,
 
690
                                                 MergeDirectiveWindow)
 
691
            lines = open(path, 'rb').readlines()
 
692
            lines = [l.replace('\r\n', '\n') for l in lines]
 
693
            try:
 
694
                directive = merge_directive.MergeDirective.from_lines(lines)
 
695
            except errors.NotAMergeDirective:
 
696
                window = DiffWindow()
 
697
                window.set_diff_text(path, lines)
 
698
            else:
 
699
                window = MergeDirectiveWindow(directive, path)
 
700
                window.set_diff_text(path, directive.patch.splitlines(True))
 
701
            window.show()
 
702
            gtk = self.open_display()
 
703
            window.connect("destroy", gtk.main_quit)
 
704
        except Exception, e:
 
705
            from dialog import error_dialog
 
706
            error_dialog('Error', str(e))
 
707
            raise
 
708
        gtk.main()
 
709
 
 
710
 
 
711
register_command(cmd_ghandle_patch)
 
712
 
 
713
 
 
714
import gettext
 
715
gettext.install('olive-gtk')
 
716
 
 
717
 
 
718
class NoDisplayError(BzrCommandError):
 
719
    """gtk could not find a proper display"""
 
720
 
 
721
    def __str__(self):
 
722
        return "No DISPLAY. Unable to run GTK+ application."
 
723
 
 
724
 
 
725
def test_suite():
 
726
    from unittest import TestSuite
 
727
    import tests
162
728
    import sys
163
729
    default_encoding = sys.getdefaultencoding()
164
730
    try:
165
 
        result = basic_tests
 
731
        result = TestSuite()
166
732
        try:
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]))
 
733
            import_pygtk()
 
734
        except errors.BzrCommandError:
 
735
            return result
 
736
        result.addTest(tests.test_suite())
172
737
    finally:
173
738
        if sys.getdefaultencoding() != default_encoding:
174
739
            reload(sys)
175
740
            sys.setdefaultencoding(default_encoding)
176
 
    return basic_tests
177
 
 
 
741
    return result