53
50
def construct(self):
54
51
"""Construct the window contents."""
52
vbox = gtk.VBox(spacing=0)
55
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
55
57
paned = gtk.VPaned()
56
58
paned.pack1(self.construct_top(), resize=True, shrink=False)
57
paned.pack2(self.construct_bottom(), resize=True, shrink=True)
59
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
61
vbox.pack_start(paned, expand=True, fill=True)
62
vbox.set_focus_child(paned)
61
66
def construct_top(self):
62
67
"""Construct the top-half of the window."""
63
vbox = gtk.VBox(spacing=6)
64
vbox.set_border_width(12)
67
68
scrollwin = gtk.ScrolledWindow()
68
69
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
69
70
scrollwin.set_shadow_type(gtk.SHADOW_IN)
70
vbox.pack_start(scrollwin, expand=True, fill=True)
73
73
self.treeview = gtk.TreeView()
74
74
self.treeview.set_rules_hint(True)
75
75
self.treeview.set_search_column(4)
76
76
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
77
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
78
self.treeview.connect("button-release-event",
79
self._treeview_row_mouseclick)
77
80
scrollwin.add(self.treeview)
78
81
self.treeview.show()
80
83
cell = CellRendererGraph()
81
84
column = gtk.TreeViewColumn()
82
column.set_resizable(False)
85
column.set_resizable(True)
83
86
column.pack_start(cell, expand=False)
84
87
column.add_attribute(cell, "node", 1)
85
88
column.add_attribute(cell, "in-lines", 2)
112
115
column.add_attribute(cell, "text", 6)
113
116
self.treeview.append_column(column)
115
hbox = gtk.HBox(False, spacing=6)
116
vbox.pack_start(hbox, expand=False, fill=False)
120
def construct_navigation(self):
121
"""Construct the navigation buttons."""
123
frame.set_shadow_type(gtk.SHADOW_OUT)
126
hbox = gtk.HBox(spacing=12)
119
130
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
131
self.back_button.set_relief(gtk.RELIEF_NONE)
120
132
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
122
134
self.back_button.connect("clicked", self._back_clicked_cb)
124
136
self.back_button.show()
126
138
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
139
self.fwd_button.set_relief(gtk.RELIEF_NONE)
127
140
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
129
142
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
130
143
hbox.pack_start(self.fwd_button, expand=False, fill=True)
131
144
self.fwd_button.show()
135
148
def construct_bottom(self):
136
149
"""Construct the bottom half of the window."""
137
label = gtk.Label("test")
142
def set_branch(self, branch, start):
150
from bzrlib.plugins.gtk.logview import LogView
151
self.logview = LogView()
152
(width, height) = self.get_size()
153
self.logview.set_size_request(width, int(height / 2.5))
155
self.logview.set_show_callback(self._show_clicked_cb)
156
self.logview.set_go_callback(self._go_clicked_cb)
159
def set_branch(self, branch, start, maxnum):
143
160
"""Set the branch and start position for this window.
145
162
Creates a new TreeModel and populates it with information about
146
163
the new branch before updating the window title and model of the
149
168
# [ revision, node, last_lines, lines, message, committer, timestamp ]
150
169
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
151
170
gobject.TYPE_PYOBJECT,
153
172
gobject.TYPE_PYOBJECT,
175
self.set_title(branch.nick + " - bzrk")
176
gobject.idle_add(self.populate_model, start, maxnum)
178
def populate_model(self, start, maxnum):
159
(revids, self.revisions, colours, self.children) \
160
= distances(branch, start)
161
for revision, node, lines in graph(revids, self.revisions, colours):
182
(self.revisions, colours, self.children, self.parent_ids,
183
merge_sorted) = distances(self.branch.repository, start)
184
for (index, (revision, node, lines)) in enumerate(graph(
185
self.revisions, colours, merge_sorted)):
186
# FIXME: at this point we should be able to show the graph order
187
# and lines with no message or commit data - and then incrementally
188
# fill the timestamp, committer etc data as desired.
162
189
message = revision.message.split("\n")[0]
163
190
if revision.committer is not None:
164
191
timestamp = format_date(revision.timestamp, revision.timezone)
168
self.model.append([ revision, node, last_lines, lines,
169
message, revision.committer, timestamp ])
194
self.model.append([revision, node, last_lines, lines,
195
message, revision.committer, timestamp])
170
196
self.index[revision] = index
173
197
last_lines = lines
175
self.set_title(os.path.basename(branch.base) + " - bzrk")
198
if maxnum is not None and index > maxnum:
176
200
self.treeview.set_model(self.model)
178
204
def _treeview_cursor_cb(self, *args):
179
205
"""Callback for when the treeview cursor changes."""
180
206
(path, col) = self.treeview.get_cursor()
181
207
revision = self.model[path][0]
183
self.back_button.set_sensitive(len(revision.parent_ids) > 0)
209
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
184
210
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
212
if self.branch.supports_tags():
213
tagdict = self.branch.tags.get_reverse_tag_dict()
214
if tagdict.has_key(revision.revision_id):
215
tags = tagdict[revision.revision_id]
216
self.logview.set_revision(revision, tags)
186
218
def _back_clicked_cb(self, *args):
187
219
"""Callback for when the back button is clicked."""
188
220
(path, col) = self.treeview.get_cursor()
189
221
revision = self.model[path][0]
190
if not len(revision.parent_ids):
222
if not len(self.parent_ids[revision]):
193
for parent_id in revision.parent_ids:
225
for parent_id in self.parent_ids[revision]:
194
226
parent = self.revisions[parent_id]
195
227
if same_branch(revision, parent):
196
228
self.treeview.set_cursor(self.index[parent])
199
next = self.revisions[revision.parent_ids[0]]
231
next = self.revisions[self.parent_ids[revision][0]]
200
232
self.treeview.set_cursor(self.index[next])
233
self.treeview.grab_focus()
202
235
def _fwd_clicked_cb(self, *args):
203
236
"""Callback for when the forward button is clicked."""
214
247
prev = list(self.children[revision])[0]
215
248
self.treeview.set_cursor(self.index[prev])
249
self.treeview.grab_focus()
251
def _go_clicked_cb(self, revid):
252
"""Callback for when the go button for a parent is clicked."""
253
self.treeview.set_cursor(self.index[self.revisions[revid]])
254
self.treeview.grab_focus()
256
def show_diff(self, branch, revid, parentid):
257
"""Open a new window to show a diff between the given revisions."""
258
from bzrlib.plugins.gtk.diff import DiffWindow
259
window = DiffWindow()
260
(parent_tree, rev_tree) = branch.repository.revision_trees([parentid,
262
description = revid + " - " + branch.nick
263
window.set_diff(description, rev_tree, parent_tree)
266
def _show_clicked_cb(self, revid, parentid):
267
"""Callback for when the show button for a parent is clicked."""
268
self.show_diff(self.branch, revid, parentid)
269
self.treeview.grab_focus()
271
def _treeview_row_mouseclick(self, widget, event):
272
from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
273
if event.button == 3:
274
menu = RevisionPopupMenu(self.branch.repository,
275
[x.revision_id for x in self.selected_revisions()],
277
menu.popup(None, None, None, event.button, event.get_time())
279
def selected_revision(self, path):
280
return self.model[path][0]
282
def selected_revisions(self):
283
return [self.selected_revision(path) for path in \
284
self.treeview.get_selection().get_selected_rows()[1]]
286
def _treeview_row_activated_cb(self, widget, path, col):
287
# TODO: more than one parent
288
"""Callback for when a treeview row gets activated."""
289
revision = self.selected_revision(path)
290
if len(self.parent_ids[revision]) == 0:
291
# Ignore revisions without parent
293
parent_id = self.parent_ids[revision][0]
294
self.show_diff(self.branch, revision.revision_id, parent_id)
295
self.treeview.grab_focus()
added
removed
viz/branchwin.py
