/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
19
from bzrlib.errors import NotVersionedError, BzrCommandError
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
    """
54
    takes_args = []
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
58
    def run(self, revision=None, file_list=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)
80
        window.show()
81
82
        gtk.main()
83
84
register_command(cmd_gdiff)
85
86
class cmd_visualise(Command):
87
    """Graphically visualise this branch.
88
89
    Opens a graphical window to allow you to see the history of the branch
90
    and relationships between revisions in a visual manner,
91
92
    The default starting point is latest revision on the branch, you can
93
    specify a starting point with -r revision.
94
    """
95
    takes_options = [
96
        "revision",
97
        Option('limit', "maximum number of revisions to display",
98
               int, 'count')]
99
    takes_args = [ "location?" ]
100
    aliases = [ "visualize", "vis", "viz" ]
101
102
    def run(self, location=".", revision=None, limit=None):
103
        (branch, path) = Branch.open_containing(location)
104
        branch.lock_read()
105
        branch.repository.lock_read()
106
        try:
107
            if revision is None:
108
                revid = branch.last_revision()
109
                if revid is None:
110
                    return
111
            else:
112
                (revno, revid) = revision[0].in_history(branch)
113
114
            from viz.bzrkapp import BzrkApp
115
                
116
            app = BzrkApp()
117
            app.show(branch, revid, limit)
118
        finally:
119
            branch.repository.unlock()
120
            branch.unlock()
121
        app.main()
122
123
124
register_command(cmd_visualise)
125
126
class cmd_gannotate(Command):
127
    """GTK+ annotate.
128
    
129
    Browse changes to FILENAME line by line in a GTK+ window.
130
    """
131
59.2.1 by Aaron Bentley
Gannotate takes a line number
132
    takes_args = ["filename", "line?"]
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
133
    takes_options = [
134
        Option("all", help="show annotations on all lines"),
135
        Option("plain", help="don't highlight annotation lines"),
136
        Option("line", type=int, argname="lineno",
137
               help="jump to specified line number")
138
    ]
139
    aliases = ["gblame", "gpraise"]
140
    
59.2.1 by Aaron Bentley
Gannotate takes a line number
141
    def run(self, filename, all=False, plain=False, line='1'):
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
142
        import pygtk
143
        pygtk.require("2.0")
144
145
        try:
146
            import gtk
147
        except RuntimeError, e:
148
            if str(e) == "could not open display":
149
                raise NoDisplayError
150
59.2.1 by Aaron Bentley
Gannotate takes a line number
151
        try:
152
            line = int(line)
153
        except ValueError:
154
            raise BzrCommandError('Line argument ("%s") is not a number.' % 
155
                                  line)
156
55.1.2 by Jelmer Vernooij
Move commands to top-level __init__
157
        from annotate.gannotate import GAnnotateWindow
158
        from annotate.config import GAnnotateConfig
159
160
        (wt, path) = WorkingTree.open_containing(filename)
161
        branch = wt.branch
162
163
        file_id = wt.path2id(path)
164
165
        if file_id is None:
166
            raise NotVersionedError(filename)
167
168
        window = GAnnotateWindow(all, plain)
169
        window.connect("destroy", lambda w: gtk.main_quit())
170
        window.set_title(path + " - gannotate")
171
        config = GAnnotateConfig(window)
172
        window.show()
173
        branch.lock_read()
174
        try:
175
            window.annotate(branch, file_id)
176
        finally:
177
            branch.unlock()
178
        window.jump_to_line(line)
179
        
180
        gtk.main()
181
182
register_command(cmd_gannotate)
183
184
class cmd_gcommit(Command):
185
    """GTK+ commit dialog
186
187
    Graphical user interface for committing revisions"""
188
    
189
    takes_args = []
190
    takes_options = []
191
192
    def run(self, filename=None):
193
        import pygtk
194
        pygtk.require("2.0")
195
196
        try:
197
            import gtk
198
        except RuntimeError, e:
199
            if str(e) == "could not open display":
200
                raise NoDisplayError
201
202
        from commit import GCommitDialog
203
        from bzrlib.commit import Commit
204
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
205
           StrictCommitFailed)
206
207
        (wt, path) = WorkingTree.open_containing(filename)
208
        branch = wt.branch
209
210
        file_id = wt.path2id(path)
211
212
        if file_id is None:
213
            raise NotVersionedError(filename)
214
215
        dialog = GCommitDialog(wt)
216
        dialog.set_title(path + " - Commit")
217
        if dialog.run() != gtk.RESPONSE_CANCEL:
218
            Commit().commit(working_tree=wt,message=dialog.message,
219
                specific_files=dialog.specific_files)
220
221
register_command(cmd_gcommit)
222
223
class NoDisplayError(BzrCommandError):
224
    """gtk could not find a proper display"""
225
226
    def __str__(self):
227
        return "No DISPLAY. gannotate is disabled."