/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
49 by Jelmer Vernooij
Merge in Dan Loda's gannotate plugin and put it in annotate/
1
# This program is free software; you can redistribute it and/or modify
2
# it under the terms of the GNU General Public License as published by
3
# the Free Software Foundation; either version 2 of the License, or
4
# (at your option) any later version.
5
6
# This program is distributed in the hope that it will be useful,
7
# but WITHOUT ANY WARRANTY; without even the implied warranty of
8
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9
# GNU General Public License for more details.
10
11
# You should have received a copy of the GNU General Public License
12
# along with this program; if not, write to the Free Software
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
14
208.2.1 by Robert Collins
Better module docstring.
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. 
323 by Jelmer Vernooij
Add gsend command.
22
gcommit           GTK+ commit dialog.
242.1.2 by Adeodato Simó
Fix gconflicts docstring.
23
gconflicts        GTK+ conflicts. 
208.2.1 by Robert Collins
Better module docstring.
24
gdiff             Show differences in working tree in a GTK+ Window. 
25
ginit             Initialise a new branch.
26
gmissing          GTK+ missing revisions dialog. 
27
gpreferences      GTK+ preferences dialog. 
323 by Jelmer Vernooij
Add gsend command.
28
gpush             GTK+ push.
29
gsend             GTK+ send merge directive.
30
gstatus           GTK+ status dialog.
208.2.1 by Robert Collins
Better module docstring.
31
gtags             Manage branch tags.
32
visualise         Graphically visualise this branch. 
33
"""
73 by Jelmer Vernooij
Release 0.9, list myself as maintainer.
34
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
35
import bzrlib
36
287 by Jelmer Vernooij
Use standard version tuple.
37
version_info = (0, 92, 0, 'dev', 0)
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
38
287 by Jelmer Vernooij
Use standard version tuple.
39
if version_info[3] == 'final':
40
    version_string = '%d.%d.%d' % version_info[:3]
41
else:
42
    version_string = '%d.%d.%d%s%d' % version_info
43
__version__ = version_string
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
44
45
def check_bzrlib_version(desired):
46
    """Check that bzrlib is compatible.
47
48
    If version is < bzr-gtk version, assume incompatible.
49
    If version == bzr-gtk version, assume completely compatible
50
    If version == bzr-gtk version + 1, assume compatible, with deprecations
51
    Otherwise, assume incompatible.
52
    """
53
    desired_plus = (desired[0], desired[1]+1)
54
    bzrlib_version = bzrlib.version_info[:2]
203 by Aaron Bentley
Don't warn if bzrlib is dev version of next release
55
    if bzrlib_version == desired or (bzrlib_version == desired_plus and
56
                                     bzrlib.version_info[3] == 'dev'):
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
57
        return
58
    try:
59
        from bzrlib.trace import warning
60
    except ImportError:
61
        # get the message out any way we can
62
        from warnings import warn as warning
63
    if bzrlib_version < desired:
207 by Aaron Bentley
Import BzrError before using it
64
        from bzrlib.errors import BzrError
271 by Jelmer Vernooij
Add common widget for selecting branches.
65
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
66
                ' %s.' % (bzrlib.__version__, __version__))
287 by Jelmer Vernooij
Use standard version tuple.
67
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
68
    else:
69
        warning('bzr-gtk is not up to date with installed bzr version %s.'
70
                ' \nThere should be a newer version available, e.g. %i.%i.' 
71
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
72
73
287 by Jelmer Vernooij
Use standard version tuple.
74
if version_info[2] == "final":
75
    check_bzrlib_version(version_info[:2])
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
76
146 by Jelmer Vernooij
Move more code to top-level directory.
77
from bzrlib.trace import warning
78
if __name__ != 'bzrlib.plugins.gtk':
79
    warning("Not running as bzrlib.plugins.gtk, things may break.")
80
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
81
from bzrlib.lazy_import import lazy_import
82
lazy_import(globals(), """
83
from bzrlib import (
84
    branch,
249 by Aaron Bentley
Add gselftest command
85
    builtins,
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
86
    errors,
87
    workingtree,
88
    )
89
""")
90
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
91
from bzrlib.commands import Command, register_command, display_command
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
92
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
93
from bzrlib.option import Option
94
126.1.5 by Szilveszter Farkas (Phanatic)
bzr gbranch should work now (Fixed: #77751)
95
import os.path
96
66.2.20 by Aaron Bentley
Nicer error when PyGTK not installed
97
def import_pygtk():
98
    try:
99
        import pygtk
100
    except ImportError:
101
        raise errors.BzrCommandError("PyGTK not installed.")
102
    pygtk.require('2.0')
103
    return pygtk
104
105
133 by Jelmer Vernooij
Actually use the ui factory.
106
def set_ui_factory():
177 by Jelmer Vernooij
Register commands all at once.
107
    import_pygtk()
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
108
    from ui import GtkUIFactory
133 by Jelmer Vernooij
Actually use the ui factory.
109
    import bzrlib.ui
110
    bzrlib.ui.ui_factory = GtkUIFactory()
111
112
247 by Jelmer Vernooij
Use application path to find icons.
113
def data_path():
114
    return os.path.dirname(__file__)
115
116
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
117
class GTKCommand(Command):
118
    """Abstract class providing GTK specific run commands."""
119
120
    def open_display(self):
121
        pygtk = import_pygtk()
122
        try:
123
            import gtk
124
        except RuntimeError, e:
125
            if str(e) == "could not open display":
126
                raise NoDisplayError
127
        set_ui_factory()
173.1.3 by Robert Collins
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.
128
        return gtk
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
129
130
    def run(self):
131
        self.open_display()
132
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
133
        dialog.run()
134
135
136
class cmd_gbranch(GTKCommand):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
137
    """GTK+ branching.
138
    
139
    """
140
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
141
    def get_gtk_dialog(self, path):
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
142
        from bzrlib.plugins.gtk.branch import BranchDialog
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
143
        return BranchDialog(path)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
144
145
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
146
class cmd_gcheckout(GTKCommand):
126.1.18 by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog.
147
    """ GTK+ checkout.
148
    
149
    """
150
    
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
151
    def get_gtk_dialog(self, path):
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
152
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
153
        return CheckoutDialog(path)
126.1.18 by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog.
154
155
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
156
157
class cmd_gpush(GTKCommand):
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
158
    """ GTK+ push.
159
    
160
    """
161
    takes_args = [ "location?" ]
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
162
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
163
    def run(self, location="."):
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
164
        (br, path) = branch.Branch.open_containing(location)
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
165
        self.open_display()
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
166
        from push import PushDialog
233 by Jelmer Vernooij
Get rid of test button in push.
167
        dialog = PushDialog(br.repository, br.last_revision(), br)
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
168
        dialog.run()
169
170
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
171
172
class cmd_gdiff(GTKCommand):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
173
    """Show differences in working tree in a GTK+ Window.
174
    
175
    Otherwise, all changes for the tree are listed.
176
    """
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
177
    takes_args = ['filename?']
58.1.1 by Aaron Bentley
gdiff takes -r arguments
178
    takes_options = ['revision']
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
179
180
    @display_command
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
181
    def run(self, revision=None, filename=None):
133 by Jelmer Vernooij
Actually use the ui factory.
182
        set_ui_factory()
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
183
        wt = workingtree.WorkingTree.open_containing(".")[0]
161 by Aaron Bentley
Fix gannotate interaction with dirstate
184
        wt.lock_read()
185
        try:
186
            branch = wt.branch
187
            if revision is not None:
188
                if len(revision) == 1:
189
                    tree1 = wt
190
                    revision_id = revision[0].in_history(branch).rev_id
191
                    tree2 = branch.repository.revision_tree(revision_id)
192
                elif len(revision) == 2:
193
                    revision_id_0 = revision[0].in_history(branch).rev_id
194
                    tree2 = branch.repository.revision_tree(revision_id_0)
195
                    revision_id_1 = revision[1].in_history(branch).rev_id
196
                    tree1 = branch.repository.revision_tree(revision_id_1)
197
            else:
58.1.1 by Aaron Bentley
gdiff takes -r arguments
198
                tree1 = wt
161 by Aaron Bentley
Fix gannotate interaction with dirstate
199
                tree2 = tree1.basis_tree()
200
201
            from diff import DiffWindow
202
            import gtk
203
            window = DiffWindow()
204
            window.connect("destroy", gtk.main_quit)
205
            window.set_diff("Working Tree", tree1, tree2)
206
            if filename is not None:
207
                tree_filename = wt.relpath(filename)
208
                try:
209
                    window.set_file(tree_filename)
210
                except NoSuchFile:
188.3.1 by John Arbash Meinel
Use tree.path2id to avoid getting 'Object Not Locked' errors.
211
                    if (tree1.path2id(tree_filename) is None and 
212
                        tree2.path2id(tree_filename) is None):
161 by Aaron Bentley
Fix gannotate interaction with dirstate
213
                        raise NotVersionedError(filename)
214
                    raise BzrCommandError('No changes found for file "%s"' % 
215
                                          filename)
216
            window.show()
217
218
            gtk.main()
219
        finally:
220
            wt.unlock()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
221
222
208.2.2 by Robert Collins
Add inspect window to bzr commity-notify.
223
def start_viz_window(branch, revision, limit=None):
224
    """Start viz on branch with revision revision.
225
    
226
    :return: The viz window object.
227
    """
228
    from viz.branchwin import BranchWindow
315 by Daniel Schierbeck
Removed BranchWindow.set_branch(), used constructor instead.
229
    return BranchWindow(branch, revision, limit)
208.2.2 by Robert Collins
Add inspect window to bzr commity-notify.
230
231
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
232
class cmd_visualise(Command):
233
    """Graphically visualise this branch.
234
235
    Opens a graphical window to allow you to see the history of the branch
236
    and relationships between revisions in a visual manner,
237
238
    The default starting point is latest revision on the branch, you can
239
    specify a starting point with -r revision.
240
    """
241
    takes_options = [
242
        "revision",
208.2.7 by Vincent Ladeuil
Fix option help strings to comply with the style guide.
243
        Option('limit', "Maximum number of revisions to display.",
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
244
               int, 'count')]
245
    takes_args = [ "location?" ]
246
    aliases = [ "visualize", "vis", "viz" ]
247
248
    def run(self, location=".", revision=None, limit=None):
133 by Jelmer Vernooij
Actually use the ui factory.
249
        set_ui_factory()
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
250
        (br, path) = branch.Branch.open_containing(location)
251
        br.lock_read()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
252
        try:
253
            if revision is None:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
254
                revid = br.last_revision()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
255
                if revid is None:
256
                    return
257
            else:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
258
                (revno, revid) = revision[0].in_history(br)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
259
152 by Jelmer Vernooij
Cleanup some more code.
260
            import gtk
208.2.2 by Robert Collins
Add inspect window to bzr commity-notify.
261
            pp = start_viz_window(br, revid, limit)
152 by Jelmer Vernooij
Cleanup some more code.
262
            pp.connect("destroy", lambda w: gtk.main_quit())
263
            pp.show()
264
            gtk.main()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
265
        finally:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
266
            br.unlock()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
267
268
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
269
class cmd_gannotate(GTKCommand):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
270
    """GTK+ annotate.
271
    
272
    Browse changes to FILENAME line by line in a GTK+ window.
273
    """
274
59.2.1 by Aaron Bentley
Gannotate takes a line number
275
    takes_args = ["filename", "line?"]
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
276
    takes_options = [
208.2.7 by Vincent Ladeuil
Fix option help strings to comply with the style guide.
277
        Option("all", help="Show annotations on all lines."),
278
        Option("plain", help="Don't highlight annotation lines."),
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
279
        Option("line", type=int, argname="lineno",
208.2.7 by Vincent Ladeuil
Fix option help strings to comply with the style guide.
280
               help="Jump to specified line number."),
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
281
        "revision",
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
282
    ]
283
    aliases = ["gblame", "gpraise"]
284
    
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
285
    def run(self, filename, all=False, plain=False, line='1', revision=None):
187 by Jelmer Vernooij
Fix gannotate.
286
        gtk = self.open_display()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
287
59.2.1 by Aaron Bentley
Gannotate takes a line number
288
        try:
289
            line = int(line)
290
        except ValueError:
291
            raise BzrCommandError('Line argument ("%s") is not a number.' % 
292
                                  line)
293
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
294
        from annotate.gannotate import GAnnotateWindow
295
        from annotate.config import GAnnotateConfig
177 by Jelmer Vernooij
Register commands all at once.
296
        from bzrlib.bzrdir import BzrDir
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
297
161 by Aaron Bentley
Fix gannotate interaction with dirstate
298
        wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
299
        if wt is not None:
300
            tree = wt
301
        else:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
302
            tree = br.basis_tree()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
303
66.2.18 by Aaron Bentley
Gannotate works with branches, not just trees
304
        file_id = tree.path2id(path)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
305
306
        if file_id is None:
307
            raise NotVersionedError(filename)
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
308
        if revision is not None:
309
            if len(revision) != 1:
310
                raise BzrCommandError("Only 1 revion may be specified.")
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
311
            revision_id = revision[0].in_history(br).rev_id
312
            tree = br.repository.revision_tree(revision_id)
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
313
        else:
66.2.18 by Aaron Bentley
Gannotate works with branches, not just trees
314
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
315
316
        window = GAnnotateWindow(all, plain)
317
        window.connect("destroy", lambda w: gtk.main_quit())
318
        window.set_title(path + " - gannotate")
319
        config = GAnnotateConfig(window)
320
        window.show()
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
321
        br.lock_read()
161 by Aaron Bentley
Fix gannotate interaction with dirstate
322
        if wt is not None:
323
            wt.lock_read()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
324
        try:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
325
            window.annotate(tree, br, file_id)
161 by Aaron Bentley
Fix gannotate interaction with dirstate
326
            window.jump_to_line(line)
327
            gtk.main()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
328
        finally:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
329
            br.unlock()
161 by Aaron Bentley
Fix gannotate interaction with dirstate
330
            if wt is not None:
331
                wt.unlock()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
332
333
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
334
335
class cmd_gcommit(GTKCommand):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
336
    """GTK+ commit dialog
337
338
    Graphical user interface for committing revisions"""
339
    
145 by Jelmer Vernooij
Fix some strings, import.
340
    aliases = [ "gci" ]
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
341
    takes_args = []
342
    takes_options = []
343
344
    def run(self, filename=None):
93.1.17 by Alexander Belchenko
gcommit reworked again.
345
        import os
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
346
        self.open_display()
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
347
        from commit import CommitDialog
93.1.17 by Alexander Belchenko
gcommit reworked again.
348
        from bzrlib.errors import (BzrCommandError,
349
                                   NotBranchError,
178 by Jelmer Vernooij
Remove unneeded imports.
350
                                   NoWorkingTree)
93.1.17 by Alexander Belchenko
gcommit reworked again.
351
352
        wt = None
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
353
        br = None
93.1.17 by Alexander Belchenko
gcommit reworked again.
354
        try:
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
355
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
356
            br = wt.branch
93.1.17 by Alexander Belchenko
gcommit reworked again.
357
        except NoWorkingTree, e:
358
            path = e.base
195.2.1 by Szilveszter Farkas (Phanatic)
NotBranchError exception shouldn't be handled. (Fixes: #113394)
359
            (br, path) = branch.Branch.open_containing(path)
93.1.17 by Alexander Belchenko
gcommit reworked again.
360
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
361
        commit = CommitDialog(wt, path, not br)
135 by Jelmer Vernooij
Throw out the old CommitDialog code and use the new code instead, also for 'gcommit'.
362
        commit.run()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
363
364
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
365
250 by Aaron Bentley
oops- revert status change
366
class cmd_gstatus(GTKCommand):
157 by Jelmer Vernooij
Add gstatus command.
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
184 by Jelmer Vernooij
Fix gstatus
378
        gtk = self.open_display()
157 by Jelmer Vernooij
Add gstatus command.
379
        from status import StatusDialog
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
380
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
157 by Jelmer Vernooij
Add gstatus command.
381
        status = StatusDialog(wt, wt_path)
382
        status.connect("destroy", gtk.main_quit)
383
        status.run()
384
385
323 by Jelmer Vernooij
Add gsend command.
386
class cmd_gsend(GTKCommand):
387
    """GTK+ send merge directive.
388
389
    """
390
    def run(self):
391
        (br, path) = branch.Branch.open_containing(".")
324 by Jelmer Vernooij
Add very simple "Send Merge Directive" window.
392
        gtk = self.open_display()
323 by Jelmer Vernooij
Add gsend command.
393
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
324 by Jelmer Vernooij
Add very simple "Send Merge Directive" window.
394
        from StringIO import StringIO
323 by Jelmer Vernooij
Add gsend command.
395
        dialog = SendMergeDirectiveDialog(br)
324 by Jelmer Vernooij
Add very simple "Send Merge Directive" window.
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
            
323 by Jelmer Vernooij
Add gsend command.
404
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
405
406
class cmd_gconflicts(GTKCommand):
323 by Jelmer Vernooij
Add gsend command.
407
    """GTK+ conflicts.
126.1.24 by Szilveszter Farkas (Phanatic)
Implemented Conflicts dialog. Added gconflicts command.
408
    
242.1.2 by Adeodato Simó
Fix gconflicts docstring.
409
    Select files from the list of conflicts and run an external utility to
410
    resolve them.
126.1.24 by Szilveszter Farkas (Phanatic)
Implemented Conflicts dialog. Added gconflicts command.
411
    """
412
    def run(self):
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
413
        (wt, path) = workingtree.WorkingTree.open_containing('.')
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
414
        self.open_display()
126.1.24 by Szilveszter Farkas (Phanatic)
Implemented Conflicts dialog. Added gconflicts command.
415
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
416
        dialog = ConflictsDialog(wt)
417
        dialog.run()
418
157 by Jelmer Vernooij
Add gstatus command.
419
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
420
class cmd_gpreferences(GTKCommand):
171 by Jelmer Vernooij
Initial work on a preferences dialog in GTK+, including a list of plugins with metadata browser.
421
    """ GTK+ preferences dialog.
422
423
    """
424
    def run(self):
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
425
        self.open_display()
171 by Jelmer Vernooij
Initial work on a preferences dialog in GTK+, including a list of plugins with metadata browser.
426
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
427
        dialog = PreferencesWindow()
428
        dialog.run()
429
430
175 by Jelmer Vernooij
Add very simple gmissing command.
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
177 by Jelmer Vernooij
Register commands all at once.
466
188.1.1 by Szilveszter Farkas (Phanatic)
Inital implementation of the Initialize dialog. Not fully functional yet.
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
190.1.1 by Szilveszter Farkas (Phanatic)
Added 'gtags' command and basic Tags window (just a skeleton).
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
177 by Jelmer Vernooij
Register commands all at once.
486
commands = [
323 by Jelmer Vernooij
Add gsend command.
487
    cmd_gannotate, 
488
    cmd_gbranch,
489
    cmd_gcheckout, 
490
    cmd_gcommit, 
491
    cmd_gconflicts, 
492
    cmd_gdiff,
493
    cmd_ginit,
177 by Jelmer Vernooij
Register commands all at once.
494
    cmd_gmissing, 
495
    cmd_gpreferences, 
323 by Jelmer Vernooij
Add gsend command.
496
    cmd_gpush, 
497
    cmd_gsend,
177 by Jelmer Vernooij
Register commands all at once.
498
    cmd_gstatus,
323 by Jelmer Vernooij
Add gsend command.
499
    cmd_gtags,
500
    cmd_visualise
177 by Jelmer Vernooij
Register commands all at once.
501
    ]
502
503
for cmd in commands:
504
    register_command(cmd)
175 by Jelmer Vernooij
Add very simple gmissing command.
505
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
506
173.1.3 by Robert Collins
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.
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):
211 by Jelmer Vernooij
Move notification area code into separate file.
515
        from notify import NotifyPopupMenu
173.1.3 by Robert Collins
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.
516
        gtk = self.open_display()
211 by Jelmer Vernooij
Move notification area code into separate file.
517
        menu = NotifyPopupMenu()
247 by Jelmer Vernooij
Use application path to find icons.
518
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
211 by Jelmer Vernooij
Move notification area code into separate file.
519
        icon.connect('popup-menu', menu.display)
210 by Jelmer Vernooij
Add notification area icon for commit-notify.
520
173.1.3 by Robert Collins
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.
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)
211 by Jelmer Vernooij
Move notification area code into separate file.
537
182.1.1 by Robert Collins
Update commit-notify to use new dbus api, and show remote URL's.
538
        def catch_branch(revision_id, urls):
539
            # TODO: show all the urls, or perhaps choose the 'best'.
540
            url = urls[0]
173.1.3 by Robert Collins
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.
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)
208.2.2 by Robert Collins
Add inspect window to bzr commity-notify.
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()
208.2.3 by Robert Collins
Add a Branch button to commit-notify.
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()
208.2.4 by Robert Collins
Unbreak inspect of commits due to misunderstanding of pynotify api.
566
                nw.add_action("inspect", "Inspect", start_viz, None)
567
                nw.add_action("branch", "Branch", start_branch, None)
173.1.3 by Robert Collins
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.
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
249 by Aaron Bentley
Add gselftest command
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
253 by Aaron Bentley
Avoid encoding problems from pygtk
590
        import sys
591
        default_encoding = sys.getdefaultencoding()
249 by Aaron Bentley
Add gselftest command
592
        # prevent gtk from blowing up later
593
        gtk = import_pygtk()
253 by Aaron Bentley
Avoid encoding problems from pygtk
594
        # prevent gtk from messing with default encoding
249 by Aaron Bentley
Add gselftest command
595
        import pynotify
253 by Aaron Bentley
Avoid encoding problems from pygtk
596
        if sys.getdefaultencoding() != default_encoding:
597
            reload(sys)
598
            sys.setdefaultencoding(default_encoding)
249 by Aaron Bentley
Add gselftest command
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
152 by Jelmer Vernooij
Cleanup some more code.
615
import gettext
616
gettext.install('olive-gtk')
617
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
618
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
619
class NoDisplayError(BzrCommandError):
620
    """gtk could not find a proper display"""
621
622
    def __str__(self):
133 by Jelmer Vernooij
Actually use the ui factory.
623
        return "No DISPLAY. Unable to run GTK+ application."
624
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
625
140 by Jelmer Vernooij
add framework for tests.
626
def test_suite():
627
    from unittest import TestSuite
628
    import tests
163 by Aaron Bentley
Prevent test suite from causing default-encoding changes
629
    import sys
630
    default_encoding = sys.getdefaultencoding()
631
    try:
632
        result = TestSuite()
633
        result.addTest(tests.test_suite())
634
    finally:
170.1.2 by Aaron Bentley
Test suite only fixes encoding if it's changed. Fixes test_selftest bug.
635
        if sys.getdefaultencoding() != default_encoding:
636
            reload(sys)
637
            sys.setdefaultencoding(default_encoding)
140 by Jelmer Vernooij
add framework for tests.
638
    return result