18
from bzrlib.plugins.gtk import _i18n
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
20
17
from linegraph import linegraph, same_branch
21
18
from graphcell import CellRendererGraph
22
19
from treemodel import TreeModel
23
from bzrlib.revision import NULL_REVISION
26
class TreeView(gtk.VBox):
29
'branch': (gobject.TYPE_PYOBJECT,
31
'The Bazaar branch being visualized',
32
gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
34
'revision': (gobject.TYPE_PYOBJECT,
36
'The currently selected revision',
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),
55
'revno-column-visible': (gobject.TYPE_BOOLEAN,
56
'Revision number column',
57
'Show revision number column',
59
gobject.PARAM_READWRITE),
61
'graph-column-visible': (gobject.TYPE_BOOLEAN,
65
gobject.PARAM_READWRITE),
67
'date-column-visible': (gobject.TYPE_BOOLEAN,
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),
21
class TreeView(gtk.ScrolledWindow):
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)),
97
'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
24
'revisions-loaded': (gobject.SIGNAL_RUN_FIRST,
27
'revision-selected': (gobject.SIGNAL_RUN_FIRST,
101
def __init__(self, branch, start, maxnum, compact=True):
32
def __init__(self, branch, start, maxnum, broken_line_length=None):
102
33
"""Create a new TreeView.
104
35
:param branch: Branch object for branch to show.
108
39
:param broken_line_length: After how much lines to break
111
gtk.VBox.__init__(self, spacing=0)
113
self.progress_widget = ProgressPanel()
114
self.pack_start(self.progress_widget, expand=False, fill=True)
115
if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
116
# We'are using our own ui, let's tell it to use our widget.
117
ui.ui_factory.set_progress_bar_widget(self.progress_widget)
119
self.scrolled_window = gtk.ScrolledWindow()
120
self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
121
gtk.POLICY_AUTOMATIC)
122
self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
123
self.scrolled_window.show()
124
self.pack_start(self.scrolled_window, expand=True, fill=True)
126
self.scrolled_window.add(self.construct_treeview())
42
gtk.ScrolledWindow.__init__(self)
44
self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
45
self.set_shadow_type(gtk.SHADOW_IN)
47
self.construct_treeview()
129
49
self.branch = branch
50
self.branch.lock_read()
52
gobject.idle_add(self.populate, start, maxnum,
130
55
self.revision = None
135
self.compact = compact
137
gobject.idle_add(self.populate)
139
self.connect("destroy", self._on_destroy)
141
def _on_destroy(self, *ignored):
143
if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
144
# We'are using our own ui, let's tell it to stop using our widget.
145
ui.ui_factory.set_progress_bar_widget(None)
147
def do_get_property(self, property):
148
if property.name == 'revno-column-visible':
149
return self.revno_column.get_visible()
150
elif property.name == 'graph-column-visible':
151
return self.graph_column.get_visible()
152
elif property.name == 'date-column-visible':
153
return self.date_column.get_visible()
154
elif property.name == 'compact':
156
elif property.name == 'mainline-only':
157
return self.mainline_only
158
elif property.name == 'branch':
160
elif property.name == 'revision':
161
return self.model.get_value(self.model.get_iter(self.path),
163
elif property.name == 'revision-number':
164
return self.model.get_value(self.model.get_iter(self.path),
166
elif property.name == 'children':
167
return self.model.get_value(self.model.get_iter(self.path),
169
elif property.name == 'parents':
170
return self.model.get_value(self.model.get_iter(self.path),
173
raise AttributeError, 'unknown property %s' % property.name
175
def do_set_property(self, property, value):
176
if property.name == 'revno-column-visible':
177
self.revno_column.set_visible(value)
178
elif property.name == 'graph-column-visible':
179
self.graph_column.set_visible(value)
180
elif property.name == 'date-column-visible':
181
self.date_column.set_visible(value)
182
elif property.name == 'compact':
184
elif property.name == 'mainline-only':
185
self.mainline_only = value
186
elif property.name == 'branch':
188
elif property.name == 'revision':
189
self.set_revision_id(value.revision_id)
191
raise AttributeError, 'unknown property %s' % property.name
59
self.connect('destroy', lambda w: self.branch.unlock())
193
61
def get_revision(self):
194
62
"""Return revision id of currently selected revision, or None."""
195
return self.get_property('revision')
197
def has_revision_id(self, revision_id):
198
return (revision_id in self.index)
200
def set_revision(self, revision):
201
self.set_property('revision', revision)
203
def set_revision_id(self, revid):
65
def set_revision(self, revid):
204
66
"""Change the currently selected revision.
206
68
:param revid: Revision id of revision to display.
214
76
:return: list of revision ids.
216
return self.get_property('children')
218
80
def get_parents(self):
219
81
"""Return the parents of the currently selected revision.
221
83
:return: list of revision ids.
223
return self.get_property('parents')
225
def add_tag(self, tag, revid=None):
226
if revid is None: revid = self.revision.revision_id
232
self.branch.lock_write()
233
self.model.add_tag(tag, revid)
238
self.branch.lock_read()
240
self.emit('tag-added', tag, revid)
243
gobject.idle_add(self.populate, self.get_revision())
249
self.branch.lock_write()
254
self.branch.lock_read()
257
88
"""Signal handler for the Back button."""
258
parents = self.get_parents()
89
(path, col) = self.treeview.get_cursor()
90
revision = self.model[path][treemodel.REVISION]
91
parents = self.model[path][treemodel.PARENTS]
259
92
if not len(parents):
262
95
for parent_id in parents:
263
96
parent_index = self.index[parent_id]
264
97
parent = self.model[parent_index][treemodel.REVISION]
265
if same_branch(self.get_revision(), parent):
266
self.set_revision(parent)
98
if same_branch(revision, parent):
99
self.treeview.set_cursor(parent_index)
269
self.set_revision_id(parents[0])
102
self.treeview.set_cursor(self.index[parents[0]])
103
self.treeview.grab_focus()
271
105
def forward(self):
272
106
"""Signal handler for the Forward button."""
273
children = self.get_children()
107
(path, col) = self.treeview.get_cursor()
108
revision = self.model[path][treemodel.REVISION]
109
children = self.model[path][treemodel.CHILDREN]
274
110
if not len(children):
277
113
for child_id in children:
278
114
child_index = self.index[child_id]
279
115
child = self.model[child_index][treemodel.REVISION]
280
if same_branch(child, self.get_revision()):
281
self.set_revision(child)
116
if same_branch(child, revision):
117
self.treeview.set_cursor(child_index)
284
self.set_revision_id(children[0])
120
self.treeview.set_cursor(self.index[children[0]])
121
self.treeview.grab_focus()
286
def populate(self, revision=None):
123
def populate(self, start, maxnum, broken_line_length=None):
287
124
"""Fill the treeview with contents.
289
126
:param start: Revision id of revision to start with.
292
129
:param broken_line_length: After how much lines branches \
293
130
should be broken.
296
if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
297
# We'are using our own ui, let's tell it to use our widget.
298
ui.ui_factory.set_progress_bar_widget(self.progress_widget)
299
self.progress_bar = ui.ui_factory.nested_progress_bar()
300
self.progress_bar.update("Loading ancestry graph", 0, 5)
304
broken_line_length = 32
306
broken_line_length = None
308
show_graph = self.graph_column.get_visible()
310
self.branch.lock_read()
311
(linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
319
self.model = TreeModel(self.branch, linegraphdata)
320
self.graph_cell.columns_len = columns_len
321
width = self.graph_cell.get_size(self.treeview)[2]
324
self.graph_column.set_fixed_width(width)
325
self.graph_column.set_max_width(width)
327
self.treeview.set_model(self.model)
329
if not revision or revision == NULL_REVISION:
330
self.treeview.set_cursor(0)
332
self.set_revision(revision)
334
self.emit('refreshed')
337
self.progress_bar.finished()
132
(linegraphdata, index, columns_len) = linegraph(self.branch.repository,
137
self.model = TreeModel(self.branch.repository, linegraphdata)
138
self.graph_cell.columns_len = columns_len
139
width = self.graph_cell.get_size(self.treeview)[2]
140
self.graph_column.set_fixed_width(width)
141
self.graph_column.set_max_width(width)
143
self.treeview.set_model(self.model)
144
self.treeview.set_cursor(0)
145
self.emit('revisions-loaded')
149
def show_diff(self, branch, revid, parentid):
150
"""Open a new window to show a diff between the given revisions."""
151
from bzrlib.plugins.gtk.diff import DiffWindow
152
window = DiffWindow(parent=self)
153
(parent_tree, rev_tree) = branch.repository.revision_trees([parentid,
155
description = revid + " - " + branch.nick
156
window.set_diff(description, rev_tree, parent_tree)
339
159
def construct_treeview(self):
340
160
self.treeview = gtk.TreeView()
342
162
self.treeview.set_rules_hint(True)
343
163
self.treeview.set_search_column(treemodel.REVNO)
345
# Fix old PyGTK bug - by JAM
346
set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
347
if set_tooltip is not None:
348
set_tooltip(treemodel.MESSAGE)
164
self.treeview.set_tooltip_column(treemodel.MESSAGE)
350
self._prev_cursor_path = None
351
self.treeview.connect("cursor-changed",
166
self.treeview.get_selection().connect("changed",
352
167
self._on_selection_changed)
354
169
self.treeview.connect("row-activated",
360
175
self.treeview.set_property('fixed-height-mode', True)
177
self.add(self.treeview)
362
178
self.treeview.show()
364
180
cell = gtk.CellRendererText()
365
181
cell.set_property("width-chars", 15)
366
182
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
367
self.revno_column = gtk.TreeViewColumn("Revision No")
368
self.revno_column.set_resizable(False)
369
self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
370
self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
371
self.revno_column.pack_start(cell, expand=True)
372
self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
373
self.treeview.append_column(self.revno_column)
183
column = gtk.TreeViewColumn("Revision No")
184
column.set_resizable(True)
185
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
186
column.set_fixed_width(cell.get_size(self.treeview)[2])
187
column.pack_start(cell, expand=True)
188
column.add_attribute(cell, "text", treemodel.REVNO)
189
self.treeview.append_column(column)
375
191
self.graph_cell = CellRendererGraph()
376
192
self.graph_column = gtk.TreeViewColumn()
377
self.graph_column.set_resizable(False)
193
self.graph_column.set_resizable(True)
378
194
self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
379
self.graph_column.pack_start(self.graph_cell, expand=True)
195
self.graph_column.pack_start(self.graph_cell, expand=False)
380
196
self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
381
self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
382
197
self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
383
198
self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
384
199
self.treeview.append_column(self.graph_column)
386
201
cell = gtk.CellRendererText()
387
202
cell.set_property("width-chars", 65)
388
203
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
389
self.summary_column = gtk.TreeViewColumn("Summary")
390
self.summary_column.set_resizable(False)
391
self.summary_column.set_expand(True)
392
self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
393
self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
394
self.summary_column.pack_start(cell, expand=True)
395
self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
396
self.treeview.append_column(self.summary_column)
204
column = gtk.TreeViewColumn("Message")
205
column.set_resizable(True)
206
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
207
column.set_fixed_width(cell.get_size(self.treeview)[2])
208
column.pack_start(cell, expand=True)
209
column.add_attribute(cell, "text", treemodel.MESSAGE)
210
self.treeview.append_column(column)
398
212
cell = gtk.CellRendererText()
399
213
cell.set_property("width-chars", 15)
400
214
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
401
self.committer_column = gtk.TreeViewColumn("Committer")
402
self.committer_column.set_resizable(False)
403
self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
404
self.committer_column.set_fixed_width(200)
405
self.committer_column.pack_start(cell, expand=True)
406
self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
407
self.treeview.append_column(self.committer_column)
215
column = gtk.TreeViewColumn("Committer")
216
column.set_resizable(True)
217
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
218
column.set_fixed_width(cell.get_size(self.treeview)[2])
219
column.pack_start(cell, expand=True)
220
column.add_attribute(cell, "text", treemodel.COMMITER)
221
self.treeview.append_column(column)
409
cell = gtk.CellRendererText()
410
cell.set_property("width-chars", 20)
411
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
412
self.date_column = gtk.TreeViewColumn("Date")
413
self.date_column.set_visible(False)
414
self.date_column.set_resizable(False)
415
self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
416
self.date_column.set_fixed_width(130)
417
self.date_column.pack_start(cell, expand=True)
418
self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
419
self.treeview.append_column(self.date_column)
423
def _on_selection_changed(self, treeview):
223
def _on_selection_changed(self, selection, *args):
424
224
"""callback for when the treeview changes."""
425
(path, focus) = treeview.get_cursor()
426
if (path is not None) and (path != self._prev_cursor_path):
427
self._prev_cursor_path = path # avoid emitting twice per click
225
(model, selected_rows) = selection.get_selected_rows()
226
if len(selected_rows) > 0:
227
iter = self.model.get_iter(selected_rows[0])
228
self.revision = self.model.get_value(iter, treemodel.REVISION)
229
self.parents = self.model.get_value(iter, treemodel.PARENTS)
230
self.children = self.model.get_value(iter, treemodel.CHILDREN)
429
232
self.emit('revision-selected')
431
234
def _on_revision_selected(self, widget, event):
432
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
235
from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
433
236
if event.button == 3:
434
menu = RevisionMenu(self.branch.repository,
237
menu = RevisionPopupMenu(self.branch.repository,
435
238
[self.get_revision().revision_id],
437
menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
438
240
menu.popup(None, None, None, event.button, event.get_time())
440
242
def _on_revision_activated(self, widget, path, col):
441
self.emit('revision-activated', path, col)
243
# TODO: more than one parent
244
"""Callback for when a treeview row gets activated."""
245
revision_id = self.model[path][treemodel.REVID]
246
parents = self.model[path][treemodel.PARENTS]
247
if len(parents) == 0:
248
# Ignore revisions without parent
250
parent_id = parents[0]
251
self.show_diff(self.branch, revision_id, parent_id)
252
self.treeview.grab_focus()