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