18
from bzrlib.plugins.gtk import _i18n
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
17
20
from linegraph import linegraph, same_branch
18
21
from graphcell import CellRendererGraph
19
22
from treemodel import TreeModel
20
23
from bzrlib.revision import NULL_REVISION
22
class TreeView(gtk.ScrolledWindow):
26
class TreeView(gtk.VBox):
24
28
__gproperties__ = {
25
29
'branch': (gobject.TYPE_PYOBJECT,
32
36
'The currently selected revision',
33
37
gobject.PARAM_READWRITE),
39
'revision-number': (gobject.TYPE_STRING,
41
'The number of the selected revision',
43
gobject.PARAM_READABLE),
45
'children': (gobject.TYPE_PYOBJECT,
47
'Children of the currently selected revision',
48
gobject.PARAM_READABLE),
50
'parents': (gobject.TYPE_PYOBJECT,
52
'Parents to the currently selected revision',
53
gobject.PARAM_READABLE),
35
55
'revno-column-visible': (gobject.TYPE_BOOLEAN,
56
'Revision number column',
37
57
'Show revision number column',
39
59
gobject.PARAM_READWRITE),
61
'graph-column-visible': (gobject.TYPE_BOOLEAN,
65
gobject.PARAM_READWRITE),
41
67
'date-column-visible': (gobject.TYPE_BOOLEAN,
43
69
'Show date column',
45
gobject.PARAM_READWRITE)
71
gobject.PARAM_READWRITE),
73
'compact': (gobject.TYPE_BOOLEAN,
75
'Break ancestry lines to save space',
77
gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
79
'mainline-only': (gobject.TYPE_BOOLEAN,
81
'Only show the mainline history.',
83
gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
50
'revisions-loaded': (gobject.SIGNAL_RUN_FIRST,
53
88
'revision-selected': (gobject.SIGNAL_RUN_FIRST,
91
'revision-activated': (gobject.SIGNAL_RUN_FIRST,
93
(gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
'tag-added': (gobject.SIGNAL_RUN_FIRST,
96
(gobject.TYPE_STRING, gobject.TYPE_STRING))
58
def __init__(self, branch, start, maxnum, broken_line_length=None):
99
def __init__(self, branch, start, maxnum, compact=True):
59
100
"""Create a new TreeView.
61
102
:param branch: Branch object for branch to show.
65
106
:param broken_line_length: After how much lines to break
68
gtk.ScrolledWindow.__init__(self)
70
self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
71
self.set_shadow_type(gtk.SHADOW_IN)
73
self.construct_treeview()
109
gtk.VBox.__init__(self, spacing=0)
111
loading_msg_widget = ProgressPanel()
112
ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
113
self.pack_start(loading_msg_widget, expand=False, fill=True)
115
self.scrolled_window = gtk.ScrolledWindow()
116
self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
117
gtk.POLICY_AUTOMATIC)
118
self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
119
self.scrolled_window.show()
120
self.pack_start(self.scrolled_window, expand=True, fill=True)
122
self.scrolled_window.add(self.construct_treeview())
75
125
self.branch = branch
77
gobject.idle_add(self.populate, start, maxnum,
80
126
self.revision = None
130
self.compact = compact
132
gobject.idle_add(self.populate)
84
134
self.connect("destroy", lambda x: self.branch.unlock())
86
136
def do_get_property(self, property):
87
137
if property.name == 'revno-column-visible':
88
138
return self.revno_column.get_visible()
139
elif property.name == 'graph-column-visible':
140
return self.graph_column.get_visible()
89
141
elif property.name == 'date-column-visible':
90
142
return self.date_column.get_visible()
143
elif property.name == 'compact':
145
elif property.name == 'mainline-only':
146
return self.mainline_only
91
147
elif property.name == 'branch':
92
148
return self.branch
93
149
elif property.name == 'revision':
150
return self.model.get_value(self.iter, treemodel.REVISION)
151
elif property.name == 'revision-number':
152
return self.model.get_value(self.iter, treemodel.REVNO)
153
elif property.name == 'children':
154
return self.model.get_value(self.iter, treemodel.CHILDREN)
155
elif property.name == 'parents':
156
return self.model.get_value(self.iter, treemodel.PARENTS)
96
158
raise AttributeError, 'unknown property %s' % property.name
98
160
def do_set_property(self, property, value):
99
161
if property.name == 'revno-column-visible':
100
162
self.revno_column.set_visible(value)
163
elif property.name == 'graph-column-visible':
164
self.graph_column.set_visible(value)
101
165
elif property.name == 'date-column-visible':
102
166
self.date_column.set_visible(value)
167
elif property.name == 'compact':
169
elif property.name == 'mainline-only':
170
self.mainline_only = value
103
171
elif property.name == 'branch':
104
172
self.branch = value
105
173
elif property.name == 'revision':
125
196
:return: list of revision ids.
198
return self.get_property('children')
129
200
def get_parents(self):
130
201
"""Return the parents of the currently selected revision.
132
203
:return: list of revision ids.
205
return self.get_property('parents')
207
def add_tag(self, tag, revid=None):
208
if revid is None: revid = self.revision.revision_id
214
self.branch.lock_write()
215
self.model.add_tag(tag, revid)
220
self.branch.lock_read()
222
self.emit('tag-added', tag, revid)
225
gobject.idle_add(self.populate, self.get_revision())
231
self.branch.lock_write()
236
self.branch.lock_read()
137
239
"""Signal handler for the Back button."""
138
(path, col) = self.treeview.get_cursor()
139
revision = self.model[path][treemodel.REVISION]
140
parents = self.model[path][treemodel.PARENTS]
240
parents = self.get_parents()
141
241
if not len(parents):
144
244
for parent_id in parents:
145
245
parent_index = self.index[parent_id]
146
246
parent = self.model[parent_index][treemodel.REVISION]
147
if same_branch(revision, parent):
148
self.treeview.set_cursor(parent_index)
247
if same_branch(self.get_revision(), parent):
248
self.set_revision(parent)
151
self.treeview.set_cursor(self.index[parents[0]])
152
self.treeview.grab_focus()
251
self.set_revision_id(parents[0])
154
253
def forward(self):
155
254
"""Signal handler for the Forward button."""
156
(path, col) = self.treeview.get_cursor()
157
revision = self.model[path][treemodel.REVISION]
158
children = self.model[path][treemodel.CHILDREN]
255
children = self.get_children()
159
256
if not len(children):
162
259
for child_id in children:
163
260
child_index = self.index[child_id]
164
261
child = self.model[child_index][treemodel.REVISION]
165
if same_branch(child, revision):
166
self.treeview.set_cursor(child_index)
262
if same_branch(child, self.get_revision()):
263
self.set_revision(child)
169
self.treeview.set_cursor(self.index[children[0]])
170
self.treeview.grab_focus()
266
self.set_revision_id(children[0])
172
def populate(self, start, maxnum, broken_line_length=None):
268
def populate(self, revision=None):
173
269
"""Fill the treeview with contents.
175
271
:param start: Revision id of revision to start with.
178
274
:param broken_line_length: After how much lines branches \
179
275
should be broken.
181
self.branch.lock_read()
182
(linegraphdata, index, columns_len) = linegraph(self.branch.repository,
187
self.model = TreeModel(self.branch.repository, linegraphdata)
188
self.graph_cell.columns_len = columns_len
189
width = self.graph_cell.get_size(self.treeview)[2]
190
self.graph_column.set_fixed_width(width)
191
self.graph_column.set_max_width(width)
193
self.treeview.set_model(self.model)
194
self.treeview.set_cursor(0)
195
self.emit('revisions-loaded')
199
def show_diff(self, revid=None, parentid=None):
200
"""Open a new window to show a diff between the given revisions."""
201
from bzrlib.plugins.gtk.diff import DiffWindow
202
window = DiffWindow(parent=self)
205
revid = self.revision.revision_id
207
if parentid is None and len(self.parents) > 0:
208
parentid = self.parents[0]
211
parentid = NULL_REVISION
213
rev_tree = self.branch.repository.revision_tree(revid)
214
parent_tree = self.branch.repository.revision_tree(parentid)
216
description = revid + " - " + self.branch.nick
217
window.set_diff(description, rev_tree, parent_tree)
278
self.progress_bar = ui.ui_factory.nested_progress_bar()
279
self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
283
broken_line_length = 32
285
broken_line_length = None
287
show_graph = self.graph_column.get_visible()
289
self.branch.lock_read()
290
(linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
298
self.model = TreeModel(self.branch, linegraphdata)
299
self.graph_cell.columns_len = columns_len
300
width = self.graph_cell.get_size(self.treeview)[2]
303
self.graph_column.set_fixed_width(width)
304
self.graph_column.set_max_width(width)
306
self.treeview.set_model(self.model)
308
if not revision or revision == NULL_REVISION:
309
self.treeview.set_cursor(0)
311
self.set_revision(revision)
315
self.progress_bar.finished()
220
317
def construct_treeview(self):
221
318
self.treeview = gtk.TreeView()
240
337
self.treeview.set_property('fixed-height-mode', True)
242
self.add(self.treeview)
243
339
self.treeview.show()
245
341
cell = gtk.CellRendererText()
246
342
cell.set_property("width-chars", 15)
247
343
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
248
344
self.revno_column = gtk.TreeViewColumn("Revision No")
249
self.revno_column.set_resizable(True)
345
self.revno_column.set_resizable(False)
250
346
self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
251
347
self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
252
348
self.revno_column.pack_start(cell, expand=True)
256
352
self.graph_cell = CellRendererGraph()
257
353
self.graph_column = gtk.TreeViewColumn()
258
self.graph_column.set_resizable(True)
354
self.graph_column.set_resizable(False)
259
355
self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
260
self.graph_column.pack_start(self.graph_cell, expand=False)
356
self.graph_column.pack_start(self.graph_cell, expand=True)
261
357
self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
358
self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
262
359
self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
263
360
self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
264
361
self.treeview.append_column(self.graph_column)
266
363
cell = gtk.CellRendererText()
267
364
cell.set_property("width-chars", 65)
268
365
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
269
self.msg_column = gtk.TreeViewColumn("Message")
270
self.msg_column.set_resizable(True)
271
self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
272
self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
273
self.msg_column.pack_start(cell, expand=True)
274
self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
275
self.treeview.append_column(self.msg_column)
366
self.summary_column = gtk.TreeViewColumn("Summary")
367
self.summary_column.set_resizable(False)
368
self.summary_column.set_expand(True)
369
self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
370
self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
371
self.summary_column.pack_start(cell, expand=True)
372
self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
373
self.treeview.append_column(self.summary_column)
277
375
cell = gtk.CellRendererText()
278
376
cell.set_property("width-chars", 15)
279
377
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
280
378
self.committer_column = gtk.TreeViewColumn("Committer")
281
self.committer_column.set_resizable(True)
379
self.committer_column.set_resizable(False)
282
380
self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
283
self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
381
self.committer_column.set_fixed_width(200)
284
382
self.committer_column.pack_start(cell, expand=True)
285
self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
383
self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
286
384
self.treeview.append_column(self.committer_column)
288
386
cell = gtk.CellRendererText()
290
388
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
291
389
self.date_column = gtk.TreeViewColumn("Date")
292
390
self.date_column.set_visible(False)
293
self.date_column.set_resizable(True)
391
self.date_column.set_resizable(False)
294
392
self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
295
self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
393
self.date_column.set_fixed_width(130)
296
394
self.date_column.pack_start(cell, expand=True)
297
395
self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
298
396
self.treeview.append_column(self.date_column)
300
400
def _on_selection_changed(self, treeview):
301
401
"""callback for when the treeview changes."""
302
402
(path, focus) = treeview.get_cursor()
303
403
if path is not None:
304
iter = self.model.get_iter(path)
305
self.revision = self.model.get_value(iter, treemodel.REVISION)
306
self.parents = self.model.get_value(iter, treemodel.PARENTS)
307
self.children = self.model.get_value(iter, treemodel.CHILDREN)
404
self.iter = self.model.get_iter(path)
309
405
self.emit('revision-selected')
311
407
def _on_revision_selected(self, widget, event):
314
410
menu = RevisionPopupMenu(self.branch.repository,
315
411
[self.get_revision().revision_id],
413
menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
317
414
menu.popup(None, None, None, event.button, event.get_time())
319
416
def _on_revision_activated(self, widget, path, col):
320
# TODO: more than one parent
321
"""Callback for when a treeview row gets activated."""
322
revision_id = self.model[path][treemodel.REVID]
323
parents = self.model[path][treemodel.PARENTS]
325
if len(parents) == 0:
328
parent_id = parents[0]
330
self.show_diff(revision_id, parent_id)
331
self.treeview.grab_focus()
417
self.emit('revision-activated', path, col)