/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: 2008-04-07 20:34:51 UTC
  • mfrom: (450.6.13 bugs)
  • mto: (463.2.1 bug.78765)
  • mto: This revision was merged to the branch mainline in revision 462.
  • Revision ID: daniel.schierbeck@gmail.com-20080407203451-2i6el7jf9t0k9y64
Merged bug page improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
2
 
 
3
1
# This program is free software; you can redistribute it and/or modify
4
2
# it under the terms of the GNU General Public License as published by
5
3
# the Free Software Foundation; either version 2 of the License, or
14
12
# along with this program; if not, write to the Free Software
15
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
14
 
17
 
"""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
 
37
 
 
38
import bzrlib
 
39
 
 
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)
 
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
 
72
if __name__ != 'bzrlib.plugins.gtk':
 
73
    warning("Not running as bzrlib.plugins.gtk, things may break.")
 
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
""")
18
85
 
19
86
from bzrlib.commands import Command, register_command, display_command
20
87
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
21
 
from bzrlib.commands import Command, register_command
22
88
from bzrlib.option import Option
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.workingtree import WorkingTree
25
 
from bzrlib.bzrdir import BzrDir
26
 
 
27
 
__version__ = '0.9.0'
28
 
 
29
 
class cmd_gbranch(Command):
 
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
 
 
101
def set_ui_factory():
 
102
    import_pygtk()
 
103
    from ui import GtkUIFactory
 
104
    import bzrlib.ui
 
105
    bzrlib.ui.ui_factory = GtkUIFactory()
 
106
 
 
107
 
 
108
def data_path():
 
109
    return os.path.dirname(__file__)
 
110
 
 
111
 
 
112
def icon_path(*args):
 
113
    basedirs = [os.path.join(data_path()),
 
114
             "/usr/share/bzr-gtk", 
 
115
             "/usr/local/share/bzr-gtk"]
 
116
    for basedir in basedirs:
 
117
        path = os.path.join(basedir, 'icons', *args)
 
118
        if os.path.exists(path):
 
119
            return path
 
120
    return None
 
121
 
 
122
 
 
123
class GTKCommand(Command):
 
124
    """Abstract class providing GTK specific run commands."""
 
125
 
 
126
    def open_display(self):
 
127
        pygtk = import_pygtk()
 
128
        try:
 
129
            import gtk
 
130
        except RuntimeError, e:
 
131
            if str(e) == "could not open display":
 
132
                raise NoDisplayError
 
133
        set_ui_factory()
 
134
        return gtk
 
135
 
 
136
    def run(self):
 
137
        self.open_display()
 
138
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
 
139
        dialog.run()
 
140
 
 
141
 
 
142
class cmd_gbranch(GTKCommand):
30
143
    """GTK+ branching.
31
144
    
32
145
    """
33
146
 
34
 
    def run(self):
35
 
        import pygtk
36
 
        pygtk.require("2.0")
37
 
        try:
38
 
            import gtk
39
 
        except RuntimeError, e:
40
 
            if str(e) == "could not open display":
41
 
                raise NoDisplayError
42
 
 
43
 
        from clone import CloneDialog
44
 
 
45
 
        window = CloneDialog()
46
 
        if window.run() == gtk.RESPONSE_OK:
47
 
            bzrdir = BzrDir.open(window.url)
48
 
            bzrdir.sprout(window.dest_path)
49
 
 
50
 
register_command(cmd_gbranch)
51
 
 
52
 
class cmd_gdiff(Command):
 
147
    def get_gtk_dialog(self, path):
 
148
        from bzrlib.plugins.gtk.branch import BranchDialog
 
149
        return BranchDialog(path)
 
150
 
 
151
 
 
152
class cmd_gcheckout(GTKCommand):
 
153
    """ GTK+ checkout.
 
154
    
 
155
    """
 
156
    
 
157
    def get_gtk_dialog(self, path):
 
158
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
 
159
        return CheckoutDialog(path)
 
160
 
 
161
 
 
162
 
 
163
class cmd_gpush(GTKCommand):
 
164
    """ GTK+ push.
 
165
    
 
166
    """
 
167
    takes_args = [ "location?" ]
 
168
 
 
169
    def run(self, location="."):
 
170
        (br, path) = branch.Branch.open_containing(location)
 
171
        self.open_display()
 
172
        from push import PushDialog
 
173
        dialog = PushDialog(br.repository, br.last_revision(), br)
 
174
        dialog.run()
 
175
 
 
176
 
 
177
 
 
178
class cmd_gdiff(GTKCommand):
53
179
    """Show differences in working tree in a GTK+ Window.
54
180
    
55
181
    Otherwise, all changes for the tree are listed.
59
185
 
60
186
    @display_command
61
187
    def run(self, revision=None, filename=None):
62
 
        wt = WorkingTree.open_containing(".")[0]
63
 
        branch = wt.branch
64
 
        if revision is not None:
65
 
            if len(revision) == 1:
 
188
        set_ui_factory()
 
189
        wt = workingtree.WorkingTree.open_containing(".")[0]
 
190
        wt.lock_read()
 
191
        try:
 
192
            branch = wt.branch
 
193
            if revision is not None:
 
194
                if len(revision) == 1:
 
195
                    tree1 = wt
 
196
                    revision_id = revision[0].in_history(branch).rev_id
 
197
                    tree2 = branch.repository.revision_tree(revision_id)
 
198
                elif len(revision) == 2:
 
199
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
 
201
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
 
203
            else:
66
204
                tree1 = wt
67
 
                revision_id = revision[0].in_history(branch).rev_id
68
 
                tree2 = branch.repository.revision_tree(revision_id)
69
 
            elif len(revision) == 2:
70
 
                revision_id_0 = revision[0].in_history(branch).rev_id
71
 
                tree2 = branch.repository.revision_tree(revision_id_0)
72
 
                revision_id_1 = revision[1].in_history(branch).rev_id
73
 
                tree1 = branch.repository.revision_tree(revision_id_1)
74
 
        else:
75
 
            tree1 = wt
76
 
            tree2 = tree1.basis_tree()
77
 
 
78
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
79
 
        import gtk
80
 
        window = DiffWindow()
81
 
        window.connect("destroy", lambda w: gtk.main_quit())
82
 
        window.set_diff("Working Tree", tree1, tree2)
83
 
        if filename is not None:
84
 
            tree_filename = tree1.relpath(filename)
85
 
            try:
86
 
                window.set_file(tree_filename)
87
 
            except NoSuchFile:
88
 
                if (tree1.inventory.path2id(tree_filename) is None and 
89
 
                    tree2.inventory.path2id(tree_filename) is None):
90
 
                    raise NotVersionedError(filename)
91
 
                raise BzrCommandError('No changes found for file "%s"' % 
92
 
                                      filename)
93
 
        window.show()
94
 
 
95
 
        gtk.main()
96
 
 
97
 
register_command(cmd_gdiff)
 
205
                tree2 = tree1.basis_tree()
 
206
 
 
207
            from diff import DiffWindow
 
208
            import gtk
 
209
            window = DiffWindow()
 
210
            window.connect("destroy", gtk.main_quit)
 
211
            window.set_diff("Working Tree", tree1, tree2)
 
212
            if filename is not None:
 
213
                tree_filename = wt.relpath(filename)
 
214
                try:
 
215
                    window.set_file(tree_filename)
 
216
                except NoSuchFile:
 
217
                    if (tree1.path2id(tree_filename) is None and 
 
218
                        tree2.path2id(tree_filename) is None):
 
219
                        raise NotVersionedError(filename)
 
220
                    raise BzrCommandError('No changes found for file "%s"' % 
 
221
                                          filename)
 
222
            window.show()
 
223
 
 
224
            gtk.main()
 
225
        finally:
 
226
            wt.unlock()
 
227
 
 
228
 
 
229
def start_viz_window(branch, revisions, limit=None):
 
230
    """Start viz on branch with revision revision.
 
231
    
 
232
    :return: The viz window object.
 
233
    """
 
234
    from viz import BranchWindow
 
235
    return BranchWindow(branch, revisions, limit)
 
236
 
98
237
 
99
238
class cmd_visualise(Command):
100
239
    """Graphically visualise this branch.
107
246
    """
108
247
    takes_options = [
109
248
        "revision",
110
 
        Option('limit', "maximum number of revisions to display",
 
249
        Option('limit', "Maximum number of revisions to display.",
111
250
               int, 'count')]
112
 
    takes_args = [ "location?" ]
 
251
    takes_args = [ "locations*" ]
113
252
    aliases = [ "visualize", "vis", "viz" ]
114
253
 
115
 
    def run(self, location=".", revision=None, limit=None):
116
 
        (branch, path) = Branch.open_containing(location)
117
 
        branch.lock_read()
118
 
        branch.repository.lock_read()
119
 
        try:
 
254
    def run(self, locations_list, revision=None, limit=None):
 
255
        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)
120
261
            if revision is None:
121
 
                revid = branch.last_revision()
122
 
                if revid is None:
123
 
                    return
 
262
                revids.append(br.last_revision())
124
263
            else:
125
 
                (revno, revid) = revision[0].in_history(branch)
126
 
 
127
 
            from viz.bzrkapp import BzrkApp
128
 
                
129
 
            app = BzrkApp()
130
 
            app.show(branch, revid, limit)
131
 
        finally:
132
 
            branch.repository.unlock()
133
 
            branch.unlock()
134
 
        app.main()
135
 
 
136
 
 
137
 
register_command(cmd_visualise)
138
 
 
139
 
class cmd_gannotate(Command):
 
264
                (revno, revid) = revision[0].in_history(br)
 
265
                revids.append(revid)
 
266
        import gtk
 
267
        pp = start_viz_window(br, revids, limit)
 
268
        pp.connect("destroy", lambda w: gtk.main_quit())
 
269
        pp.show()
 
270
        gtk.main()
 
271
 
 
272
 
 
273
class cmd_gannotate(GTKCommand):
140
274
    """GTK+ annotate.
141
275
    
142
276
    Browse changes to FILENAME line by line in a GTK+ window.
144
278
 
145
279
    takes_args = ["filename", "line?"]
146
280
    takes_options = [
147
 
        Option("all", help="show annotations on all lines"),
148
 
        Option("plain", help="don't highlight annotation lines"),
 
281
        Option("all", help="Show annotations on all lines."),
 
282
        Option("plain", help="Don't highlight annotation lines."),
149
283
        Option("line", type=int, argname="lineno",
150
 
               help="jump to specified line number")
 
284
               help="Jump to specified line number."),
 
285
        "revision",
151
286
    ]
152
287
    aliases = ["gblame", "gpraise"]
153
288
    
154
 
    def run(self, filename, all=False, plain=False, line='1'):
155
 
        import pygtk
156
 
        pygtk.require("2.0")
157
 
 
158
 
        try:
159
 
            import gtk
160
 
        except RuntimeError, e:
161
 
            if str(e) == "could not open display":
162
 
                raise NoDisplayError
 
289
    def run(self, filename, all=False, plain=False, line='1', revision=None):
 
290
        gtk = self.open_display()
163
291
 
164
292
        try:
165
293
            line = int(line)
169
297
 
170
298
        from annotate.gannotate import GAnnotateWindow
171
299
        from annotate.config import GAnnotateConfig
172
 
 
173
 
        (wt, path) = WorkingTree.open_containing(filename)
174
 
        branch = wt.branch
175
 
 
176
 
        file_id = wt.path2id(path)
 
300
        from bzrlib.bzrdir import BzrDir
 
301
 
 
302
        wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
 
303
        if wt is not None:
 
304
            tree = wt
 
305
        else:
 
306
            tree = br.basis_tree()
 
307
 
 
308
        file_id = tree.path2id(path)
177
309
 
178
310
        if file_id is None:
179
311
            raise NotVersionedError(filename)
 
312
        if revision is not None:
 
313
            if len(revision) != 1:
 
314
                raise BzrCommandError("Only 1 revion may be specified.")
 
315
            revision_id = revision[0].in_history(br).rev_id
 
316
            tree = br.repository.revision_tree(revision_id)
 
317
        else:
 
318
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
180
319
 
181
320
        window = GAnnotateWindow(all, plain)
182
321
        window.connect("destroy", lambda w: gtk.main_quit())
183
 
        window.set_title(path + " - gannotate")
184
322
        config = GAnnotateConfig(window)
185
323
        window.show()
186
 
        branch.lock_read()
 
324
        br.lock_read()
 
325
        if wt is not None:
 
326
            wt.lock_read()
187
327
        try:
188
 
            window.annotate(branch, file_id)
 
328
            window.annotate(tree, br, file_id)
 
329
            window.jump_to_line(line)
 
330
            gtk.main()
189
331
        finally:
190
 
            branch.unlock()
191
 
        window.jump_to_line(line)
192
 
        
193
 
        gtk.main()
194
 
 
195
 
register_command(cmd_gannotate)
196
 
 
197
 
class cmd_gcommit(Command):
 
332
            br.unlock()
 
333
            if wt is not None:
 
334
                wt.unlock()
 
335
 
 
336
 
 
337
 
 
338
class cmd_gcommit(GTKCommand):
198
339
    """GTK+ commit dialog
199
340
 
200
341
    Graphical user interface for committing revisions"""
201
 
    
 
342
 
 
343
    aliases = [ "gci" ]
202
344
    takes_args = []
203
345
    takes_options = []
204
346
 
205
347
    def run(self, filename=None):
206
 
        import pygtk
207
 
        pygtk.require("2.0")
208
 
 
 
348
        import os
 
349
        self.open_display()
 
350
        from commit import CommitDialog
 
351
        from bzrlib.errors import (BzrCommandError,
 
352
                                   NotBranchError,
 
353
                                   NoWorkingTree)
 
354
 
 
355
        wt = None
 
356
        br = None
 
357
        try:
 
358
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
 
359
            br = wt.branch
 
360
        except NoWorkingTree, e:
 
361
            from dialog import error_dialog
 
362
            error_dialog(_('Directory does not have a working tree'),
 
363
                         _('Operation aborted.'))
 
364
            return 1 # should this be retval=3?
 
365
 
 
366
        # It is a good habit to keep things locked for the duration, but it
 
367
        # could cause difficulties if someone wants to do things in another
 
368
        # window... We could lock_read() until we actually go to commit
 
369
        # changes... Just a thought.
 
370
        wt.lock_write()
 
371
        try:
 
372
            dlg = CommitDialog(wt)
 
373
            return dlg.run()
 
374
        finally:
 
375
            wt.unlock()
 
376
 
 
377
 
 
378
class cmd_gstatus(GTKCommand):
 
379
    """GTK+ status dialog
 
380
 
 
381
    Graphical user interface for showing status 
 
382
    information."""
 
383
    
 
384
    aliases = [ "gst" ]
 
385
    takes_args = ['PATH?']
 
386
    takes_options = []
 
387
 
 
388
    def run(self, path='.'):
 
389
        import os
 
390
        gtk = self.open_display()
 
391
        from status import StatusDialog
 
392
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
 
393
        status = StatusDialog(wt, wt_path)
 
394
        status.connect("destroy", gtk.main_quit)
 
395
        status.run()
 
396
 
 
397
 
 
398
class cmd_gsend(GTKCommand):
 
399
    """GTK+ send merge directive.
 
400
 
 
401
    """
 
402
    def run(self):
 
403
        (br, path) = branch.Branch.open_containing(".")
 
404
        gtk = self.open_display()
 
405
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
 
406
        from StringIO import StringIO
 
407
        dialog = SendMergeDirectiveDialog(br)
 
408
        if dialog.run() == gtk.RESPONSE_OK:
 
409
            outf = StringIO()
 
410
            outf.writelines(dialog.get_merge_directive().to_lines())
 
411
            mail_client = br.get_config().get_mail_client()
 
412
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
 
413
                outf.getvalue())
 
414
 
 
415
            
 
416
 
 
417
 
 
418
class cmd_gconflicts(GTKCommand):
 
419
    """GTK+ conflicts.
 
420
    
 
421
    Select files from the list of conflicts and run an external utility to
 
422
    resolve them.
 
423
    """
 
424
    def run(self):
 
425
        (wt, path) = workingtree.WorkingTree.open_containing('.')
 
426
        self.open_display()
 
427
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
 
428
        dialog = ConflictsDialog(wt)
 
429
        dialog.run()
 
430
 
 
431
 
 
432
class cmd_gpreferences(GTKCommand):
 
433
    """ GTK+ preferences dialog.
 
434
 
 
435
    """
 
436
    def run(self):
 
437
        self.open_display()
 
438
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
439
        dialog = PreferencesWindow()
 
440
        dialog.run()
 
441
 
 
442
 
 
443
class cmd_gmissing(Command):
 
444
    """ GTK+ missing revisions dialog.
 
445
 
 
446
    """
 
447
    takes_args = ["other_branch?"]
 
448
    def run(self, other_branch=None):
 
449
        pygtk = import_pygtk()
209
450
        try:
210
451
            import gtk
211
452
        except RuntimeError, e:
212
453
            if str(e) == "could not open display":
213
454
                raise NoDisplayError
214
455
 
215
 
        from commit import GCommitDialog
216
 
        from bzrlib.commit import Commit
217
 
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
218
 
           StrictCommitFailed)
219
 
 
220
 
        (wt, path) = WorkingTree.open_containing(filename)
221
 
        branch = wt.branch
222
 
 
223
 
        file_id = wt.path2id(path)
224
 
 
225
 
        if file_id is None:
226
 
            raise NotVersionedError(filename)
227
 
 
228
 
        dialog = GCommitDialog(wt)
229
 
        dialog.set_title(path + " - Commit")
230
 
        if dialog.run() != gtk.RESPONSE_CANCEL:
231
 
            Commit().commit(working_tree=wt,message=dialog.message,
232
 
                specific_files=dialog.specific_files)
233
 
 
234
 
register_command(cmd_gcommit)
 
456
        from bzrlib.plugins.gtk.missing import MissingWindow
 
457
        from bzrlib.branch import Branch
 
458
 
 
459
        local_branch = Branch.open_containing(".")[0]
 
460
        if other_branch is None:
 
461
            other_branch = local_branch.get_parent()
 
462
            
 
463
            if other_branch is None:
 
464
                raise errors.BzrCommandError("No peer location known or specified.")
 
465
        remote_branch = Branch.open_containing(other_branch)[0]
 
466
        set_ui_factory()
 
467
        local_branch.lock_read()
 
468
        try:
 
469
            remote_branch.lock_read()
 
470
            try:
 
471
                dialog = MissingWindow(local_branch, remote_branch)
 
472
                dialog.run()
 
473
            finally:
 
474
                remote_branch.unlock()
 
475
        finally:
 
476
            local_branch.unlock()
 
477
 
 
478
 
 
479
class cmd_ginit(GTKCommand):
 
480
    def run(self):
 
481
        self.open_display()
 
482
        from initialize import InitDialog
 
483
        dialog = InitDialog(os.path.abspath(os.path.curdir))
 
484
        dialog.run()
 
485
 
 
486
 
 
487
class cmd_gtags(GTKCommand):
 
488
    def run(self):
 
489
        br = branch.Branch.open_containing('.')[0]
 
490
        
 
491
        gtk = self.open_display()
 
492
        from tags import TagsWindow
 
493
        window = TagsWindow(br)
 
494
        window.show()
 
495
        gtk.main()
 
496
 
 
497
 
 
498
commands = [
 
499
    cmd_gannotate, 
 
500
    cmd_gbranch,
 
501
    cmd_gcheckout, 
 
502
    cmd_gcommit, 
 
503
    cmd_gconflicts, 
 
504
    cmd_gdiff,
 
505
    cmd_ginit,
 
506
    cmd_gmissing, 
 
507
    cmd_gpreferences, 
 
508
    cmd_gpush, 
 
509
    cmd_gsend,
 
510
    cmd_gstatus,
 
511
    cmd_gtags,
 
512
    cmd_visualise
 
513
    ]
 
514
 
 
515
for cmd in commands:
 
516
    register_command(cmd)
 
517
 
 
518
 
 
519
class cmd_commit_notify(GTKCommand):
 
520
    """Run the bzr commit notifier.
 
521
 
 
522
    This is a background program which will pop up a notification on the users
 
523
    screen when a commit occurs.
 
524
    """
 
525
 
 
526
    def run(self):
 
527
        from notify import NotifyPopupMenu
 
528
        gtk = self.open_display()
 
529
        menu = NotifyPopupMenu()
 
530
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
 
531
        icon.connect('popup-menu', menu.display)
 
532
 
 
533
        import cgi
 
534
        import dbus
 
535
        import dbus.service
 
536
        import pynotify
 
537
        from bzrlib.bzrdir import BzrDir
 
538
        from bzrlib import errors
 
539
        from bzrlib.osutils import format_date
 
540
        from bzrlib.transport import get_transport
 
541
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
542
            import dbus.glib
 
543
        BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
 
544
        bus = dbus.SessionBus()
 
545
 
 
546
        def catch_branch(revision_id, urls):
 
547
            # TODO: show all the urls, or perhaps choose the 'best'.
 
548
            url = urls[0]
 
549
            try:
 
550
                if isinstance(revision_id, unicode):
 
551
                    revision_id = revision_id.encode('utf8')
 
552
                transport = get_transport(url)
 
553
                a_dir = BzrDir.open_from_transport(transport)
 
554
                branch = a_dir.open_branch()
 
555
                revno = branch.revision_id_to_revno(revision_id)
 
556
                revision = branch.repository.get_revision(revision_id)
 
557
                summary = 'New revision %d in %s' % (revno, url)
 
558
                body  = 'Committer: %s\n' % revision.committer
 
559
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
560
                    revision.timezone)
 
561
                body += '\n'
 
562
                body += revision.message
 
563
                body = cgi.escape(body)
 
564
                nw = pynotify.Notification(summary, body)
 
565
                def start_viz(notification=None, action=None, data=None):
 
566
                    """Start the viz program."""
 
567
                    pp = start_viz_window(branch, revision_id)
 
568
                    pp.show()
 
569
                def start_branch(notification=None, action=None, data=None):
 
570
                    """Start a Branch dialog"""
 
571
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
572
                    bd = BranchDialog(remote_path=url)
 
573
                    bd.run()
 
574
                nw.add_action("inspect", "Inspect", start_viz, None)
 
575
                nw.add_action("branch", "Branch", start_branch, None)
 
576
                nw.set_timeout(5000)
 
577
                nw.show()
 
578
            except Exception, e:
 
579
                print e
 
580
                raise
 
581
        bus.add_signal_receiver(catch_branch,
 
582
                                dbus_interface=BROADCAST_INTERFACE,
 
583
                                signal_name="Revision")
 
584
        pynotify.init("bzr commit-notify")
 
585
        gtk.main()
 
586
 
 
587
register_command(cmd_commit_notify)
 
588
 
 
589
 
 
590
class cmd_gselftest(GTKCommand):
 
591
    """Version of selftest that displays a notification at the end"""
 
592
 
 
593
    takes_args = builtins.cmd_selftest.takes_args
 
594
    takes_options = builtins.cmd_selftest.takes_options
 
595
    _see_also = ['selftest']
 
596
 
 
597
    def run(self, *args, **kwargs):
 
598
        import cgi
 
599
        import sys
 
600
        default_encoding = sys.getdefaultencoding()
 
601
        # prevent gtk from blowing up later
 
602
        gtk = import_pygtk()
 
603
        # prevent gtk from messing with default encoding
 
604
        import pynotify
 
605
        if sys.getdefaultencoding() != default_encoding:
 
606
            reload(sys)
 
607
            sys.setdefaultencoding(default_encoding)
 
608
        result = builtins.cmd_selftest().run(*args, **kwargs)
 
609
        if result == 0:
 
610
            summary = 'Success'
 
611
            body = 'Selftest succeeded in "%s"' % os.getcwd()
 
612
        if result == 1:
 
613
            summary = 'Failure'
 
614
            body = 'Selftest failed in "%s"' % os.getcwd()
 
615
        pynotify.init("bzr gselftest")
 
616
        note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
 
617
        note.set_timeout(pynotify.EXPIRES_NEVER)
 
618
        note.show()
 
619
 
 
620
 
 
621
register_command(cmd_gselftest)
 
622
 
 
623
 
 
624
class cmd_test_gtk(GTKCommand):
 
625
    """Version of selftest that just runs the gtk test suite."""
 
626
 
 
627
    takes_options = ['verbose',
 
628
                     Option('one', short_name='1',
 
629
                            help='Stop when one test fails.'),
 
630
                     Option('benchmark', help='Run the benchmarks.'),
 
631
                     Option('lsprof-timed',
 
632
                     help='Generate lsprof output for benchmarked'
 
633
                          ' sections of code.'),
 
634
                     Option('list-only',
 
635
                     help='List the tests instead of running them.'),
 
636
                     Option('randomize', type=str, argname="SEED",
 
637
                     help='Randomize the order of tests using the given'
 
638
                          ' seed or "now" for the current time.'),
 
639
                    ]
 
640
    takes_args = ['testspecs*']
 
641
 
 
642
    def run(self, verbose=None, one=False, benchmark=None,
 
643
            lsprof_timed=None, list_only=False, randomize=None,
 
644
            testspecs_list=None):
 
645
        from bzrlib import __path__ as bzrlib_path
 
646
        from bzrlib.tests import selftest
 
647
 
 
648
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
 
649
        if benchmark:
 
650
            print 'No benchmarks yet'
 
651
            return 3
 
652
 
 
653
            test_suite_factory = bench_suite
 
654
            if verbose is None:
 
655
                verbose = True
 
656
            # TODO: should possibly lock the history file...
 
657
            benchfile = open(".perf_history", "at", buffering=1)
 
658
        else:
 
659
            test_suite_factory = test_suite
 
660
            if verbose is None:
 
661
                verbose = False
 
662
            benchfile = None
 
663
 
 
664
        if testspecs_list is not None:
 
665
            pattern = '|'.join(testspecs_list)
 
666
        else:
 
667
            pattern = ".*"
 
668
 
 
669
        try:
 
670
            result = selftest(verbose=verbose,
 
671
                              pattern=pattern,
 
672
                              stop_on_failure=one,
 
673
                              test_suite_factory=test_suite_factory,
 
674
                              lsprof_timed=lsprof_timed,
 
675
                              bench_history=benchfile,
 
676
                              list_only=list_only,
 
677
                              random_seed=randomize,
 
678
                             )
 
679
        finally:
 
680
            if benchfile is not None:
 
681
                benchfile.close()
 
682
 
 
683
register_command(cmd_test_gtk)
 
684
 
 
685
 
 
686
class cmd_ghandle_patch(GTKCommand):
 
687
    """Display a patch or merge directive, possibly merging.
 
688
 
 
689
    This is a helper, meant to be launched from other programs like browsers
 
690
    or email clients.  Since these programs often do not allow parameters to
 
691
    be provided, a "handle-patch" script is included.
 
692
    """
 
693
 
 
694
    takes_args = ['path']
 
695
 
 
696
    def run(self, path):
 
697
        try:
 
698
            from bzrlib.plugins.gtk.diff import (DiffWindow,
 
699
                                                 MergeDirectiveWindow)
 
700
            lines = open(path, 'rb').readlines()
 
701
            lines = [l.replace('\r\n', '\n') for l in lines]
 
702
            try:
 
703
                directive = merge_directive.MergeDirective.from_lines(lines)
 
704
            except errors.NotAMergeDirective:
 
705
                window = DiffWindow()
 
706
                window.set_diff_text(path, lines)
 
707
            else:
 
708
                window = MergeDirectiveWindow(directive, path)
 
709
                window.set_diff_text(path, directive.patch.splitlines(True))
 
710
            window.show()
 
711
            gtk = self.open_display()
 
712
            window.connect("destroy", gtk.main_quit)
 
713
        except Exception, e:
 
714
            from dialog import error_dialog
 
715
            error_dialog('Error', str(e))
 
716
            raise
 
717
        gtk.main()
 
718
 
 
719
 
 
720
register_command(cmd_ghandle_patch)
 
721
 
 
722
 
 
723
import gettext
 
724
gettext.install('olive-gtk')
 
725
 
235
726
 
236
727
class NoDisplayError(BzrCommandError):
237
728
    """gtk could not find a proper display"""
238
729
 
239
730
    def __str__(self):
240
 
        return "No DISPLAY. gannotate is disabled."
 
731
        return "No DISPLAY. Unable to run GTK+ application."
 
732
 
 
733
 
 
734
def test_suite():
 
735
    from unittest import TestSuite
 
736
    import tests
 
737
    import sys
 
738
    default_encoding = sys.getdefaultencoding()
 
739
    try:
 
740
        result = TestSuite()
 
741
        try:
 
742
            import_pygtk()
 
743
        except errors.BzrCommandError:
 
744
            return result
 
745
        result.addTest(tests.test_suite())
 
746
    finally:
 
747
        if sys.getdefaultencoding() != default_encoding:
 
748
            reload(sys)
 
749
            sys.setdefaultencoding(default_encoding)
 
750
    return result