/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
1 by Scott James Remnant
Commit the first version of bzrk.
1
# -*- coding: UTF-8 -*-
2
"""Branch window.
3
4
This module contains the code to manage the branch information window,
5
which contains both the revision graph and details panes.
6
"""
7
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
10
11
12
import gtk
13
import gobject
14
import pango
15
16
from bzrlib.osutils import format_date
17
256.2.5 by Gary van der Merwe
Oops - Renamed file without changeing import lines
18
from linegraph import linegraph, same_branch
1 by Scott James Remnant
Commit the first version of bzrk.
19
from graphcell import CellRendererGraph
20
21
22
class BranchWindow(gtk.Window):
23
    """Branch window.
24
25
    This object represents and manages a single window containing information
26
    for a particular branch.
27
    """
28
152 by Jelmer Vernooij
Cleanup some more code.
29
    def __init__(self):
1 by Scott James Remnant
Commit the first version of bzrk.
30
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
31
        self.set_border_width(0)
32
        self.set_title("bzrk")
33
34
        # Use three-quarters of the screen by default
35
        screen = self.get_screen()
4 by Scott James Remnant
Use the size of the first monitor rather than the entire screen
36
        monitor = screen.get_monitor_geometry(0)
37
        width = int(monitor.width * 0.75)
38
        height = int(monitor.height * 0.75)
1 by Scott James Remnant
Commit the first version of bzrk.
39
        self.set_default_size(width, height)
40
41
        # FIXME AndyFitz!
42
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
43
        self.set_icon(icon)
44
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
45
        self.accel_group = gtk.AccelGroup()
46
        self.add_accel_group(self.accel_group)
47
1 by Scott James Remnant
Commit the first version of bzrk.
48
        self.construct()
49
50
    def construct(self):
51
        """Construct the window contents."""
44 by David Allouche
reorganise branch window
52
        vbox = gtk.VBox(spacing=0)
53
        self.add(vbox)
54
55
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
56
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
57
        paned = gtk.VPaned()
58
        paned.pack1(self.construct_top(), resize=True, shrink=False)
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
59
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
60
        paned.show()
44 by David Allouche
reorganise branch window
61
        vbox.pack_start(paned, expand=True, fill=True)
62
        vbox.set_focus_child(paned)
63
64
        vbox.show()
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
65
66
    def construct_top(self):
67
        """Construct the top-half of the window."""
1 by Scott James Remnant
Commit the first version of bzrk.
68
        scrollwin = gtk.ScrolledWindow()
69
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
70
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
71
        scrollwin.show()
72
73
        self.treeview = gtk.TreeView()
74
        self.treeview.set_rules_hint(True)
75
        self.treeview.set_search_column(4)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
76
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
47 by Wouter van Heyst
rename _treeview_clicked_cb to correcter _treeview_row_activated_cb
77
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
226 by Jelmer Vernooij
Add context menu in bzrk.
78
        self.treeview.connect("button-release-event", 
79
                self._treeview_row_mouseclick)
1 by Scott James Remnant
Commit the first version of bzrk.
80
        scrollwin.add(self.treeview)
81
        self.treeview.show()
82
83
        cell = CellRendererGraph()
84
        column = gtk.TreeViewColumn()
45 by David Allouche
resizable graph column
85
        column.set_resizable(True)
1 by Scott James Remnant
Commit the first version of bzrk.
86
        column.pack_start(cell, expand=False)
87
        column.add_attribute(cell, "node", 1)
88
        column.add_attribute(cell, "in-lines", 2)
89
        column.add_attribute(cell, "out-lines", 3)
90
        self.treeview.append_column(column)
91
92
        cell = gtk.CellRendererText()
93
        cell.set_property("width-chars", 40)
94
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
95
        column = gtk.TreeViewColumn("Message")
96
        column.set_resizable(True)
97
        column.pack_start(cell, expand=True)
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
98
        column.add_attribute(cell, "text", 6)
1 by Scott James Remnant
Commit the first version of bzrk.
99
        self.treeview.append_column(column)
100
101
        cell = gtk.CellRendererText()
102
        cell.set_property("width-chars", 40)
103
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
104
        column = gtk.TreeViewColumn("Committer")
105
        column.set_resizable(True)
106
        column.pack_start(cell, expand=True)
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
107
        column.add_attribute(cell, "text", 7)
1 by Scott James Remnant
Commit the first version of bzrk.
108
        self.treeview.append_column(column)
109
110
        cell = gtk.CellRendererText()
111
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
112
        column = gtk.TreeViewColumn("Date")
113
        column.set_resizable(True)
114
        column.pack_start(cell, expand=True)
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
115
        column.add_attribute(cell, "text", 8)
1 by Scott James Remnant
Commit the first version of bzrk.
116
        self.treeview.append_column(column)
117
44 by David Allouche
reorganise branch window
118
        return scrollwin
119
120
    def construct_navigation(self):
121
        """Construct the navigation buttons."""
122
        frame = gtk.Frame()
123
        frame.set_shadow_type(gtk.SHADOW_OUT)
124
        frame.show()
125
        
126
        hbox = gtk.HBox(spacing=12)
127
        frame.add(hbox)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
128
        hbox.show()
129
130
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
44 by David Allouche
reorganise branch window
131
        self.back_button.set_relief(gtk.RELIEF_NONE)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
132
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
133
                                         0, 0)
134
        self.back_button.connect("clicked", self._back_clicked_cb)
135
        hbox.pack_start(self.back_button, expand=False, fill=True)
136
        self.back_button.show()
137
138
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
44 by David Allouche
reorganise branch window
139
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
140
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
141
                                        0, 0)
142
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
143
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
144
        self.fwd_button.show()
145
44 by David Allouche
reorganise branch window
146
        return frame
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
147
148
    def construct_bottom(self):
149
        """Construct the bottom half of the window."""
147 by Jelmer Vernooij
Remove a bunch of duplicate functionality.
150
        from bzrlib.plugins.gtk.logview import LogView
151
        self.logview = LogView()
44 by David Allouche
reorganise branch window
152
        (width, height) = self.get_size()
147 by Jelmer Vernooij
Remove a bunch of duplicate functionality.
153
        self.logview.set_size_request(width, int(height / 2.5))
154
        self.logview.show()
155
        self.logview.set_show_callback(self._show_clicked_cb)
156
        self.logview.set_go_callback(self._go_clicked_cb)
157
        return self.logview
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
158
40 by David Allouche
remove --robust, pyflakes fixes, update README
159
    def set_branch(self, branch, start, maxnum):
1 by Scott James Remnant
Commit the first version of bzrk.
160
        """Set the branch and start position for this window.
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
161
        
1 by Scott James Remnant
Commit the first version of bzrk.
162
        Creates a new TreeModel and populates it with information about
163
        the new branch before updating the window title and model of the
164
        treeview itself.
165
        """
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
166
        self.branch = branch
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
167
        
1 by Scott James Remnant
Commit the first version of bzrk.
168
        # [ revision, node, last_lines, lines, message, committer, timestamp ]
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
169
        self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
170
                                   gobject.TYPE_PYOBJECT,
171
                                   gobject.TYPE_PYOBJECT,
172
                                   gobject.TYPE_PYOBJECT,
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
173
                                   gobject.TYPE_PYOBJECT,
174
                                   gobject.TYPE_PYOBJECT,
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
175
                                   str, str, str)
176
        self.index = {}
256.2.6 by Gary van der Merwe
Implement color selection
177
        revids = []
178
        for (index, revid) in enumerate(reversed( \
179
                branch.repository.get_ancestry(branch.last_revision()))):
180
            if revid is not None:
181
                revids.append(revid)
182
                self.index[revid] = index
183
            if maxnum is not None and index > maxnum:
184
                break
185
        
186
        
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
187
        self.revisions = branch.repository.get_revisions(revids)
188
        revisionparents = branch.repository.get_graph().get_parents(revids)
189
        
190
        
1 by Scott James Remnant
Commit the first version of bzrk.
191
        last_lines = []
256.2.6 by Gary van der Merwe
Implement color selection
192
        for (index,(revision, node, lines, parents, children)) in enumerate( \
193
                linegraph(self.revisions, revisionparents, self.index)):
41 by David Allouche
restore --maxnum functionality, reflush some comments
194
            # FIXME: at this point we should be able to show the graph order
195
            # and lines with no message or commit data - and then incrementally
196
            # fill the timestamp, committer etc data as desired.
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
197
            
1 by Scott James Remnant
Commit the first version of bzrk.
198
            message = revision.message.split("\n")[0]
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
199
            
1 by Scott James Remnant
Commit the first version of bzrk.
200
            if revision.committer is not None:
201
                timestamp = format_date(revision.timestamp, revision.timezone)
202
            else:
203
                timestamp = None
41 by David Allouche
restore --maxnum functionality, reflush some comments
204
            self.model.append([revision, node, last_lines, lines,
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
205
                               parents, children, 
41 by David Allouche
restore --maxnum functionality, reflush some comments
206
                               message, revision.committer, timestamp])
1 by Scott James Remnant
Commit the first version of bzrk.
207
            last_lines = lines
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
208
        
36.1.2 by Jamie Wilkinson
put the branch nick in the titlebar instead of the path basename (which didn't work anyway)
209
        self.set_title(branch.nick + " - bzrk")
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
210
        self.treeview.set_model(self.model)
211
    def _treeview_cursor_cb(self, *args):
212
        """Callback for when the treeview cursor changes."""
213
        (path, col) = self.treeview.get_cursor()
214
        revision = self.model[path][0]
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
215
        parents = self.model[path][4]
216
        children = self.model[path][5]
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
217
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
218
        self.back_button.set_sensitive(len(parents) > 0)
219
        self.fwd_button.set_sensitive(len(children) > 0)
241 by Jelmer Vernooij
Show tags in bzr viz.
220
        tags = []
221
        if self.branch.supports_tags():
222
            tagdict = self.branch.tags.get_reverse_tag_dict()
223
            if tagdict.has_key(revision.revision_id):
224
                tags = tagdict[revision.revision_id]
225
        self.logview.set_revision(revision, tags)
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
226
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
227
    def _back_clicked_cb(self, *args):
228
        """Callback for when the back button is clicked."""
229
        (path, col) = self.treeview.get_cursor()
230
        revision = self.model[path][0]
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
231
        parents = self.model[path][4]
232
        if not len(parents):
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
233
            return
234
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
235
        for parent_id in parents:
236
            parent = self.revisions[self.index[parent_id]]
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
237
            if same_branch(revision, parent):
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
238
                self.treeview.set_cursor(self.index[parent_id])
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
239
                break
240
        else:
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
241
            self.treeview.set_cursor(self.index[parents[0]])
13 by Scott James Remnant
Keep the focus on the treeview
242
        self.treeview.grab_focus()
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
243
5 by Scott James Remnant
Reverse the meaning of the Back and Forward buttons so Back actually
244
    def _fwd_clicked_cb(self, *args):
245
        """Callback for when the forward button is clicked."""
246
        (path, col) = self.treeview.get_cursor()
247
        revision = self.model[path][0]
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
248
        children = self.model[path][5]
249
        if not len(children):
5 by Scott James Remnant
Reverse the meaning of the Back and Forward buttons so Back actually
250
            return
251
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
252
        for child_id in children:
253
            child = self.revisions[self.index[child_id]]
5 by Scott James Remnant
Reverse the meaning of the Back and Forward buttons so Back actually
254
            if same_branch(child, revision):
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
255
                self.treeview.set_cursor(self.index[child_id])
5 by Scott James Remnant
Reverse the meaning of the Back and Forward buttons so Back actually
256
                break
257
        else:
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
258
            self.treeview.set_cursor(self.index[children[0]])
13 by Scott James Remnant
Keep the focus on the treeview
259
        self.treeview.grab_focus()
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
260
147 by Jelmer Vernooij
Remove a bunch of duplicate functionality.
261
    def _go_clicked_cb(self, revid):
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
262
        """Callback for when the go button for a parent is clicked."""
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
263
        self.treeview.set_cursor(self.index[revid])
13 by Scott James Remnant
Keep the focus on the treeview
264
        self.treeview.grab_focus()
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
265
152 by Jelmer Vernooij
Cleanup some more code.
266
    def show_diff(self, branch, revid, parentid):
267
        """Open a new window to show a diff between the given revisions."""
268
        from bzrlib.plugins.gtk.diff import DiffWindow
269
        window = DiffWindow()
226 by Jelmer Vernooij
Add context menu in bzrk.
270
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
271
                                                                   revid])
152 by Jelmer Vernooij
Cleanup some more code.
272
        description = revid + " - " + branch.nick
273
        window.set_diff(description, rev_tree, parent_tree)
274
        window.show()
275
147 by Jelmer Vernooij
Remove a bunch of duplicate functionality.
276
    def _show_clicked_cb(self, revid, parentid):
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
277
        """Callback for when the show button for a parent is clicked."""
152 by Jelmer Vernooij
Cleanup some more code.
278
        self.show_diff(self.branch, revid, parentid)
13 by Scott James Remnant
Keep the focus on the treeview
279
        self.treeview.grab_focus()
46 by Wouter van Heyst
show diff on row activation, LP# 44591
280
226 by Jelmer Vernooij
Add context menu in bzrk.
281
    def _treeview_row_mouseclick(self, widget, event):
282
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
283
        if event.button == 3:
284
            menu = RevisionPopupMenu(self.branch.repository, 
230 by Jelmer Vernooij
Initial work towards supporting multiple revisions.
285
                [x.revision_id for x in self.selected_revisions()],
286
                self.branch)
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
287
            menu.popup(None, None, None, event.button, event.get_time())
226 by Jelmer Vernooij
Add context menu in bzrk.
288
289
    def selected_revision(self, path):
290
        return self.model[path][0]
291
292
    def selected_revisions(self):
293
        return [self.selected_revision(path) for path in \
294
                self.treeview.get_selection().get_selected_rows()[1]]
295
47 by Wouter van Heyst
rename _treeview_clicked_cb to correcter _treeview_row_activated_cb
296
    def _treeview_row_activated_cb(self, widget, path, col):
46 by Wouter van Heyst
show diff on row activation, LP# 44591
297
        # TODO: more than one parent
47 by Wouter van Heyst
rename _treeview_clicked_cb to correcter _treeview_row_activated_cb
298
        """Callback for when a treeview row gets activated."""
229 by Jelmer Vernooij
Fix regression.
299
        revision = self.selected_revision(path)
74 by Jelmer Vernooij
Fix exception when double-clicking revision without parents.
300
        if len(self.parent_ids[revision]) == 0:
301
            # Ignore revisions without parent
302
            return
46 by Wouter van Heyst
show diff on row activation, LP# 44591
303
        parent_id = self.parent_ids[revision][0]
152 by Jelmer Vernooij
Cleanup some more code.
304
        self.show_diff(self.branch, revision.revision_id, parent_id)
46 by Wouter van Heyst
show diff on row activation, LP# 44591
305
        self.treeview.grab_focus()
256.2.4 by Gary van der Merwe
First go at using bzrlib graph code
306
307
308