/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
15
"""GTK+ frontends to Bazaar commands """
73 by Jelmer Vernooij
Release 0.9, list myself as maintainer.
16
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
17
from bzrlib.commands import Command, register_command, display_command
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
18
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
19
from bzrlib.commands import Command, register_command
20
from bzrlib.option import Option
21
from bzrlib.branch import Branch
22
from bzrlib.workingtree import WorkingTree
23
from bzrlib.bzrdir import BzrDir
24
77 by Jelmer Vernooij
Prepare for 0.10.0
25
__version__ = '0.10.0'
73 by Jelmer Vernooij
Release 0.9, list myself as maintainer.
26
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
27
class cmd_gbranch(Command):
28
    """GTK+ branching.
29
    
30
    """
31
32
    def run(self):
33
        import pygtk
34
        pygtk.require("2.0")
35
        try:
36
            import gtk
37
        except RuntimeError, e:
38
            if str(e) == "could not open display":
39
                raise NoDisplayError
40
55.1.3 by Jelmer Vernooij
Implement simple command for cloning branches
41
        from clone import CloneDialog
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
42
55.1.3 by Jelmer Vernooij
Implement simple command for cloning branches
43
        window = CloneDialog()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
44
        if window.run() == gtk.RESPONSE_OK:
55.1.3 by Jelmer Vernooij
Implement simple command for cloning branches
45
            bzrdir = BzrDir.open(window.url)
46
            bzrdir.sprout(window.dest_path)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
47
48
register_command(cmd_gbranch)
49
50
class cmd_gdiff(Command):
51
    """Show differences in working tree in a GTK+ Window.
52
    
53
    Otherwise, all changes for the tree are listed.
54
    """
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
55
    takes_args = ['filename?']
58.1.1 by Aaron Bentley
gdiff takes -r arguments
56
    takes_options = ['revision']
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
57
58
    @display_command
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
59
    def run(self, revision=None, filename=None):
58.1.1 by Aaron Bentley
gdiff takes -r arguments
60
        wt = WorkingTree.open_containing(".")[0]
61
        branch = wt.branch
62
        if revision is not None:
63
            if len(revision) == 1:
64
                tree1 = wt
65
                revision_id = revision[0].in_history(branch).rev_id
66
                tree2 = branch.repository.revision_tree(revision_id)
67
            elif len(revision) == 2:
68
                revision_id_0 = revision[0].in_history(branch).rev_id
69
                tree2 = branch.repository.revision_tree(revision_id_0)
70
                revision_id_1 = revision[1].in_history(branch).rev_id
71
                tree1 = branch.repository.revision_tree(revision_id_1)
72
        else:
73
            tree1 = wt
74
            tree2 = tree1.basis_tree()
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
75
58 by Jelmer Vernooij
[merge] Home
76
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
77
        import gtk
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
78
        window = DiffWindow()
79
        window.connect("destroy", lambda w: gtk.main_quit())
80
        window.set_diff("Working Tree", tree1, tree2)
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
81
        if filename is not None:
82
            tree_filename = tree1.relpath(filename)
83
            try:
84
                window.set_file(tree_filename)
85
            except NoSuchFile:
86
                if (tree1.inventory.path2id(tree_filename) is None and 
87
                    tree2.inventory.path2id(tree_filename) is None):
88
                    raise NotVersionedError(filename)
89
                raise BzrCommandError('No changes found for file "%s"' % 
90
                                      filename)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
91
        window.show()
92
93
        gtk.main()
94
95
register_command(cmd_gdiff)
96
97
class cmd_visualise(Command):
98
    """Graphically visualise this branch.
99
100
    Opens a graphical window to allow you to see the history of the branch
101
    and relationships between revisions in a visual manner,
102
103
    The default starting point is latest revision on the branch, you can
104
    specify a starting point with -r revision.
105
    """
106
    takes_options = [
107
        "revision",
108
        Option('limit', "maximum number of revisions to display",
109
               int, 'count')]
110
    takes_args = [ "location?" ]
111
    aliases = [ "visualize", "vis", "viz" ]
112
113
    def run(self, location=".", revision=None, limit=None):
114
        (branch, path) = Branch.open_containing(location)
115
        branch.lock_read()
116
        branch.repository.lock_read()
117
        try:
118
            if revision is None:
119
                revid = branch.last_revision()
120
                if revid is None:
121
                    return
122
            else:
123
                (revno, revid) = revision[0].in_history(branch)
124
125
            from viz.bzrkapp import BzrkApp
126
                
127
            app = BzrkApp()
128
            app.show(branch, revid, limit)
129
        finally:
130
            branch.repository.unlock()
131
            branch.unlock()
132
        app.main()
133
134
135
register_command(cmd_visualise)
136
137
class cmd_gannotate(Command):
138
    """GTK+ annotate.
139
    
140
    Browse changes to FILENAME line by line in a GTK+ window.
141
    """
142
59.2.1 by Aaron Bentley
Gannotate takes a line number
143
    takes_args = ["filename", "line?"]
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
144
    takes_options = [
145
        Option("all", help="show annotations on all lines"),
146
        Option("plain", help="don't highlight annotation lines"),
147
        Option("line", type=int, argname="lineno",
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
148
               help="jump to specified line number"),
149
        "revision",
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
150
    ]
151
    aliases = ["gblame", "gpraise"]
152
    
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
153
    def run(self, filename, all=False, plain=False, line='1', revision=None):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
154
        import pygtk
155
        pygtk.require("2.0")
156
157
        try:
158
            import gtk
159
        except RuntimeError, e:
160
            if str(e) == "could not open display":
161
                raise NoDisplayError
162
59.2.1 by Aaron Bentley
Gannotate takes a line number
163
        try:
164
            line = int(line)
165
        except ValueError:
166
            raise BzrCommandError('Line argument ("%s") is not a number.' % 
167
                                  line)
168
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
169
        from annotate.gannotate import GAnnotateWindow
170
        from annotate.config import GAnnotateConfig
171
172
        (wt, path) = WorkingTree.open_containing(filename)
173
        branch = wt.branch
174
175
        file_id = wt.path2id(path)
176
177
        if file_id is None:
178
            raise NotVersionedError(filename)
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
179
        if revision is not None:
180
            if len(revision) != 1:
181
                raise BzrCommandError("Only 1 revion may be specified.")
182
            revision_id = revision[0].in_history(branch).rev_id
183
        else:
184
            revision_id = None
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
185
186
        window = GAnnotateWindow(all, plain)
187
        window.connect("destroy", lambda w: gtk.main_quit())
188
        window.set_title(path + " - gannotate")
189
        config = GAnnotateConfig(window)
190
        window.show()
191
        branch.lock_read()
192
        try:
66.2.1 by Aaron Bentley
Gannotate takes a revision argument
193
            window.annotate(branch, file_id, revision_id)
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
194
        finally:
195
            branch.unlock()
196
        window.jump_to_line(line)
197
        
198
        gtk.main()
199
200
register_command(cmd_gannotate)
201
202
class cmd_gcommit(Command):
203
    """GTK+ commit dialog
204
205
    Graphical user interface for committing revisions"""
206
    
207
    takes_args = []
208
    takes_options = []
209
210
    def run(self, filename=None):
211
        import pygtk
212
        pygtk.require("2.0")
213
214
        try:
215
            import gtk
216
        except RuntimeError, e:
217
            if str(e) == "could not open display":
218
                raise NoDisplayError
219
220
        from commit import GCommitDialog
221
        from bzrlib.commit import Commit
222
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
223
           StrictCommitFailed)
224
225
        (wt, path) = WorkingTree.open_containing(filename)
226
        branch = wt.branch
227
228
        file_id = wt.path2id(path)
229
230
        if file_id is None:
231
            raise NotVersionedError(filename)
232
233
        dialog = GCommitDialog(wt)
234
        dialog.set_title(path + " - Commit")
235
        if dialog.run() != gtk.RESPONSE_CANCEL:
236
            Commit().commit(working_tree=wt,message=dialog.message,
237
                specific_files=dialog.specific_files)
238
239
register_command(cmd_gcommit)
240
241
class NoDisplayError(BzrCommandError):
242
    """gtk could not find a proper display"""
243
244
    def __str__(self):
245
        return "No DISPLAY. gannotate is disabled."