/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. 
432 by Aaron Bentley
Misc updates
25
ghandle-patch     Display and optionally merge a merge directive or patch.
208.2.1 by Robert Collins
Better module docstring.
26
ginit             Initialise a new branch.
27
gmissing          GTK+ missing revisions dialog. 
28
gpreferences      GTK+ preferences dialog. 
323 by Jelmer Vernooij
Add gsend command.
29
gpush             GTK+ push.
30
gsend             GTK+ send merge directive.
31
gstatus           GTK+ status dialog.
208.2.1 by Robert Collins
Better module docstring.
32
gtags             Manage branch tags.
33
visualise         Graphically visualise this branch. 
34
"""
73 by Jelmer Vernooij
Release 0.9, list myself as maintainer.
35
278.1.22 by John Arbash Meinel
Add a test-gtk command to make testing faster
36
import sys
37
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
38
import bzrlib
39
416 by Szilveszter Farkas (Phanatic)
Start working on 0.94
40
version_info = (0, 94, 0, 'dev', 0)
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
41
287 by Jelmer Vernooij
Use standard version tuple.
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
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
47
423.1.1 by Jelmer Vernooij
Allow bzr-gtk and Bazaar versions to be out of sync. No longer warn about
48
required_bzrlib = (1, 0)
49
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
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:
207 by Aaron Bentley
Import BzrError before using it
62
        from bzrlib.errors import BzrError
271 by Jelmer Vernooij
Add common widget for selecting branches.
63
        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).
64
                ' %s.' % (bzrlib.__version__, __version__))
287 by Jelmer Vernooij
Use standard version tuple.
65
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
66
67
287 by Jelmer Vernooij
Use standard version tuple.
68
if version_info[2] == "final":
423.1.1 by Jelmer Vernooij
Allow bzr-gtk and Bazaar versions to be out of sync. No longer warn about
69
    check_bzrlib_version(required_bzrlib)
137 by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron).
70
146 by Jelmer Vernooij
Move more code to top-level directory.
71
from bzrlib.trace import warning
72
if __name__ != 'bzrlib.plugins.gtk':
73
    warning("Not running as bzrlib.plugins.gtk, things may break.")
74
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
75
from bzrlib.lazy_import import lazy_import
76
lazy_import(globals(), """
77
from bzrlib import (
78
    branch,
249 by Aaron Bentley
Add gselftest command
79
    builtins,
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
80
    errors,
426 by Aaron Bentley
Start support for Merge Directives
81
    merge_directive,
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
82
    workingtree,
83
    )
84
""")
85
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
86
from bzrlib.commands import Command, register_command, display_command
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
87
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
88
from bzrlib.option import Option
89
126.1.5 by Szilveszter Farkas (Phanatic)
bzr gbranch should work now (Fixed: #77751)
90
import os.path
91
66.2.20 by Aaron Bentley
Nicer error when PyGTK not installed
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
133 by Jelmer Vernooij
Actually use the ui factory.
101
def set_ui_factory():
177 by Jelmer Vernooij
Register commands all at once.
102
    import_pygtk()
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
103
    from ui import GtkUIFactory
133 by Jelmer Vernooij
Actually use the ui factory.
104
    import bzrlib.ui
105
    bzrlib.ui.ui_factory = GtkUIFactory()
106
107
247 by Jelmer Vernooij
Use application path to find icons.
108
def data_path():
109
    return os.path.dirname(__file__)
110
111
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
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()
173.1.3 by Robert Collins
Add new command 'commit-notify' to listen for commits on dbus and show them via pynotify.
123
        return gtk
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
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):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
132
    """GTK+ branching.
133
    
134
    """
135
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
136
    def get_gtk_dialog(self, path):
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
137
        from bzrlib.plugins.gtk.branch import BranchDialog
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
138
        return BranchDialog(path)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
139
140
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
141
class cmd_gcheckout(GTKCommand):
126.1.18 by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog.
142
    """ GTK+ checkout.
143
    
144
    """
145
    
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
146
    def get_gtk_dialog(self, path):
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
147
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
148
        return CheckoutDialog(path)
126.1.18 by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog.
149
150
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
151
152
class cmd_gpush(GTKCommand):
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
153
    """ GTK+ push.
154
    
155
    """
156
    takes_args = [ "location?" ]
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
157
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
158
    def run(self, location="."):
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
159
        (br, path) = branch.Branch.open_containing(location)
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
160
        self.open_display()
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
161
        from push import PushDialog
233 by Jelmer Vernooij
Get rid of test button in push.
162
        dialog = PushDialog(br.repository, br.last_revision(), br)
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
163
        dialog.run()
164
165
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
166
167
class cmd_gdiff(GTKCommand):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
168
    """Show differences in working tree in a GTK+ Window.
169
    
170
    Otherwise, all changes for the tree are listed.
171
    """
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
172
    takes_args = ['filename?']
58.1.1 by Aaron Bentley
gdiff takes -r arguments
173
    takes_options = ['revision']
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
174
175
    @display_command
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
176
    def run(self, revision=None, filename=None):
133 by Jelmer Vernooij
Actually use the ui factory.
177
        set_ui_factory()
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
178
        wt = workingtree.WorkingTree.open_containing(".")[0]
161 by Aaron Bentley
Fix gannotate interaction with dirstate
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:
58.1.1 by Aaron Bentley
gdiff takes -r arguments
193
                tree1 = wt
161 by Aaron Bentley
Fix gannotate interaction with dirstate
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:
188.3.1 by John Arbash Meinel
Use tree.path2id to avoid getting 'Object Not Locked' errors.
206
                    if (tree1.path2id(tree_filename) is None and 
207
                        tree2.path2id(tree_filename) is None):
161 by Aaron Bentley
Fix gannotate interaction with dirstate
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()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
216
217
208.2.2 by Robert Collins
Add inspect window to bzr commity-notify.
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
    """
423.2.2 by Daniel Schierbeck
Moved the branch window class to the viz package.
223
    from viz import BranchWindow
315 by Daniel Schierbeck
Removed BranchWindow.set_branch(), used constructor instead.
224
    return BranchWindow(branch, revision, limit)
208.2.2 by Robert Collins
Add inspect window to bzr commity-notify.
225
226
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
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",
208.2.7 by Vincent Ladeuil
Fix option help strings to comply with the style guide.
238
        Option('limit', "Maximum number of revisions to display.",
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
239
               int, 'count')]
240
    takes_args = [ "location?" ]
241
    aliases = [ "visualize", "vis", "viz" ]
242
243
    def run(self, location=".", revision=None, limit=None):
133 by Jelmer Vernooij
Actually use the ui factory.
244
        set_ui_factory()
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
245
        (br, path) = branch.Branch.open_containing(location)
365 by Daniel Schierbeck
Fixed locks and made tagging work.
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)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
252
365 by Daniel Schierbeck
Fixed locks and made tagging work.
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()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
258
259
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
260
class cmd_gannotate(GTKCommand):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
261
    """GTK+ annotate.
262
    
263
    Browse changes to FILENAME line by line in a GTK+ window.
264
    """
265
59.2.1 by Aaron Bentley
Gannotate takes a line number
266
    takes_args = ["filename", "line?"]
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
267
    takes_options = [
208.2.7 by Vincent Ladeuil
Fix option help strings to comply with the style guide.
268
        Option("all", help="Show annotations on all lines."),
269
        Option("plain", help="Don't highlight annotation lines."),
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
270
        Option("line", type=int, argname="lineno",
208.2.7 by Vincent Ladeuil
Fix option help strings to comply with the style guide.
271
               help="Jump to specified line number."),
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
272
        "revision",
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
273
    ]
274
    aliases = ["gblame", "gpraise"]
275
    
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
276
    def run(self, filename, all=False, plain=False, line='1', revision=None):
187 by Jelmer Vernooij
Fix gannotate.
277
        gtk = self.open_display()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
278
59.2.1 by Aaron Bentley
Gannotate takes a line number
279
        try:
280
            line = int(line)
281
        except ValueError:
282
            raise BzrCommandError('Line argument ("%s") is not a number.' % 
283
                                  line)
284
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
285
        from annotate.gannotate import GAnnotateWindow
286
        from annotate.config import GAnnotateConfig
177 by Jelmer Vernooij
Register commands all at once.
287
        from bzrlib.bzrdir import BzrDir
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
288
161 by Aaron Bentley
Fix gannotate interaction with dirstate
289
        wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
290
        if wt is not None:
291
            tree = wt
292
        else:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
293
            tree = br.basis_tree()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
294
66.2.18 by Aaron Bentley
Gannotate works with branches, not just trees
295
        file_id = tree.path2id(path)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
296
297
        if file_id is None:
298
            raise NotVersionedError(filename)
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
299
        if revision is not None:
300
            if len(revision) != 1:
301
                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
302
            revision_id = revision[0].in_history(br).rev_id
303
            tree = br.repository.revision_tree(revision_id)
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
304
        else:
66.2.18 by Aaron Bentley
Gannotate works with branches, not just trees
305
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
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()
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
312
        br.lock_read()
161 by Aaron Bentley
Fix gannotate interaction with dirstate
313
        if wt is not None:
314
            wt.lock_read()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
315
        try:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
316
            window.annotate(tree, br, file_id)
161 by Aaron Bentley
Fix gannotate interaction with dirstate
317
            window.jump_to_line(line)
318
            gtk.main()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
319
        finally:
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
320
            br.unlock()
161 by Aaron Bentley
Fix gannotate interaction with dirstate
321
            if wt is not None:
322
                wt.unlock()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
323
324
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
325
326
class cmd_gcommit(GTKCommand):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
327
    """GTK+ commit dialog
328
329
    Graphical user interface for committing revisions"""
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
330
145 by Jelmer Vernooij
Fix some strings, import.
331
    aliases = [ "gci" ]
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
332
    takes_args = []
333
    takes_options = []
334
335
    def run(self, filename=None):
93.1.17 by Alexander Belchenko
gcommit reworked again.
336
        import os
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
337
        self.open_display()
142 by Jelmer Vernooij
Move some files to the top-level directory, add first test.
338
        from commit import CommitDialog
93.1.17 by Alexander Belchenko
gcommit reworked again.
339
        from bzrlib.errors import (BzrCommandError,
340
                                   NotBranchError,
178 by Jelmer Vernooij
Remove unneeded imports.
341
                                   NoWorkingTree)
93.1.17 by Alexander Belchenko
gcommit reworked again.
342
343
        wt = None
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
344
        br = None
93.1.17 by Alexander Belchenko
gcommit reworked again.
345
        try:
157.1.5 by Aaron Bentley
Use lazy_import to reduce rocks time by .015s
346
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
157.2.1 by Vincent Ladeuil
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
347
            br = wt.branch
93.1.17 by Alexander Belchenko
gcommit reworked again.
348
        except NoWorkingTree, e:
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
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()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
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
278.1.22 by John Arbash Meinel
Add a test-gtk command to make testing faster
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',
330.6.2 by Aaron Bentley
Fix option grammar
620
                            help='Stop when one test fails.'),
621
                     Option('benchmark', help='Run the benchmarks.'),
278.1.22 by John Arbash Meinel
Add a test-gtk command to make testing faster
622
                     Option('lsprof-timed',
330.6.2 by Aaron Bentley
Fix option grammar
623
                     help='Generate lsprof output for benchmarked'
278.1.22 by John Arbash Meinel
Add a test-gtk command to make testing faster
624
                          ' sections of code.'),
625
                     Option('list-only',
330.6.2 by Aaron Bentley
Fix option grammar
626
                     help='List the tests instead of running them.'),
278.1.22 by John Arbash Meinel
Add a test-gtk command to make testing faster
627
                     Option('randomize', type=str, argname="SEED",
330.6.2 by Aaron Bentley
Fix option grammar
628
                     help='Randomize the order of tests using the given'
629
                          ' seed or "now" for the current time.'),
278.1.22 by John Arbash Meinel
Add a test-gtk command to make testing faster
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
424 by Aaron Bentley
Add ghandle-patch
677
class cmd_ghandle_patch(GTKCommand):
432 by Aaron Bentley
Misc updates
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
    """
424 by Aaron Bentley
Add ghandle-patch
684
685
    takes_args = ['path']
686
687
    def run(self, path):
427 by Aaron Bentley
Add merge button when displaying merge directives
688
        from bzrlib.plugins.gtk.diff import DiffWindow, MergeDirectiveWindow
426 by Aaron Bentley
Start support for Merge Directives
689
        lines = open(path, 'rb').readlines()
690
        try:
691
            directive = merge_directive.MergeDirective.from_lines(lines)
692
        except errors.NotAMergeDirective:
427 by Aaron Bentley
Add merge button when displaying merge directives
693
            window = DiffWindow()
426 by Aaron Bentley
Start support for Merge Directives
694
            window.set_diff_text(path, lines)
695
        else:
428 by Aaron Bentley
Get merging working
696
            window = MergeDirectiveWindow(directive)
426 by Aaron Bentley
Start support for Merge Directives
697
            window.set_diff_text(path, directive.patch.splitlines(True))
424 by Aaron Bentley
Add ghandle-patch
698
        window.show()
699
        gtk = self.open_display()
700
        window.connect("destroy", gtk.main_quit)
701
        gtk.main()
702
703
704
register_command(cmd_ghandle_patch)
705
706
152 by Jelmer Vernooij
Cleanup some more code.
707
import gettext
708
gettext.install('olive-gtk')
709
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
710
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
711
class NoDisplayError(BzrCommandError):
712
    """gtk could not find a proper display"""
713
714
    def __str__(self):
133 by Jelmer Vernooij
Actually use the ui factory.
715
        return "No DISPLAY. Unable to run GTK+ application."
716
173.1.2 by Robert Collins
Minor refactoring of __init__ to have less duplication.
717
140 by Jelmer Vernooij
add framework for tests.
718
def test_suite():
719
    from unittest import TestSuite
720
    import tests
163 by Aaron Bentley
Prevent test suite from causing default-encoding changes
721
    import sys
722
    default_encoding = sys.getdefaultencoding()
723
    try:
724
        result = TestSuite()
330.6.4 by Aaron Bentley
Allow test suite to run without pygtk
725
        try:
726
            import_pygtk()
727
        except errors.BzrCommandError:
728
            return result
163 by Aaron Bentley
Prevent test suite from causing default-encoding changes
729
        result.addTest(tests.test_suite())
730
    finally:
170.1.2 by Aaron Bentley
Test suite only fixes encoding if it's changed. Fixes test_selftest bug.
731
        if sys.getdefaultencoding() != default_encoding:
732
            reload(sys)
733
            sys.setdefaultencoding(default_encoding)
140 by Jelmer Vernooij
add framework for tests.
734
    return result