17
17
from linegraph import linegraph, same_branch
18
18
from graphcell import CellRendererGraph
19
19
from treemodel import TreeModel
20
from bzrlib.revision import NULL_REVISION
22
21
class TreeView(gtk.ScrolledWindow):
25
'branch': (gobject.TYPE_PYOBJECT,
27
'The Bazaar branch being visualized',
28
gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
30
'revision': (gobject.TYPE_PYOBJECT,
32
'The currently selected revision',
33
gobject.PARAM_READWRITE),
35
'revision-number': (gobject.TYPE_STRING,
37
'The number of the selected revision',
39
gobject.PARAM_READABLE),
41
'children': (gobject.TYPE_PYOBJECT,
43
'Children of the currently selected revision',
44
gobject.PARAM_READABLE),
46
'parents': (gobject.TYPE_PYOBJECT,
48
'Parents to the currently selected revision',
49
gobject.PARAM_READABLE),
51
'revno-column-visible': (gobject.TYPE_BOOLEAN,
53
'Show revision number column',
55
gobject.PARAM_READWRITE),
57
'date-column-visible': (gobject.TYPE_BOOLEAN,
61
gobject.PARAM_READWRITE),
63
'compact': (gobject.TYPE_BOOLEAN,
65
'Break ancestry lines to save space',
67
gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
72
'revisions-loaded': (gobject.SIGNAL_RUN_FIRST,
75
'revision-selected': (gobject.SIGNAL_RUN_FIRST,
24
'revisions-loaded': (gobject.SIGNAL_RUN_FIRST,
27
'revision-selected': (gobject.SIGNAL_RUN_FIRST,
80
def __init__(self, branch, start, maxnum, compact=True):
32
def __init__(self, branch, start, maxnum, broken_line_length=None):
81
33
"""Create a new TreeView.
83
35
:param branch: Branch object for branch to show.
95
47
self.construct_treeview()
98
49
self.branch = branch
102
self.compact = compact
104
gobject.idle_add(self.populate)
106
self.connect("destroy", lambda x: self.branch.unlock())
108
def do_get_property(self, property):
109
if property.name == 'revno-column-visible':
110
return self.revno_column.get_visible()
111
elif property.name == 'date-column-visible':
112
return self.date_column.get_visible()
113
elif property.name == 'compact':
115
elif property.name == 'branch':
117
elif property.name == 'revision':
118
return self.model.get_value(self.iter, treemodel.REVISION)
119
elif property.name == 'revision-number':
120
return self.model.get_value(self.iter, treemodel.REVNO)
121
elif property.name == 'children':
122
return self.model.get_value(self.iter, treemodel.CHILDREN)
123
elif property.name == 'parents':
124
return self.model.get_value(self.iter, treemodel.PARENTS)
126
raise AttributeError, 'unknown property %s' % property.name
128
def do_set_property(self, property, value):
129
if property.name == 'revno-column-visible':
130
self.revno_column.set_visible(value)
131
elif property.name == 'date-column-visible':
132
self.date_column.set_visible(value)
133
elif property.name == 'compact':
135
elif property.name == 'branch':
137
elif property.name == 'revision':
138
self.set_revision_id(value.revision_id)
140
raise AttributeError, 'unknown property %s' % property.name
50
self.branch.lock_read()
52
gobject.idle_add(self.populate, start, maxnum,
59
self.connect('destroy', lambda w: self.branch.unlock())
142
61
def get_revision(self):
143
62
"""Return revision id of currently selected revision, or None."""
144
return self.get_property('revision')
146
def set_revision(self, revision):
147
self.set_property('revision', revision)
149
def set_revision_id(self, revid):
65
def set_revision(self, revid):
150
66
"""Change the currently selected revision.
152
68
:param revid: Revision id of revision to display.
160
76
:return: list of revision ids.
162
return self.get_property('children')
164
80
def get_parents(self):
165
81
"""Return the parents of the currently selected revision.
167
83
:return: list of revision ids.
169
return self.get_property('parents')
172
gobject.idle_add(self.populate, self.get_revision())
178
self.branch.lock_write()
183
self.branch.lock_read()
186
88
"""Signal handler for the Back button."""
187
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]
188
92
if not len(parents):
191
95
for parent_id in parents:
192
96
parent_index = self.index[parent_id]
193
97
parent = self.model[parent_index][treemodel.REVISION]
194
if same_branch(self.get_revision(), parent):
195
self.set_revision(parent)
98
if same_branch(revision, parent):
99
self.treeview.set_cursor(parent_index)
198
self.set_revision_id(parents[0])
102
self.treeview.set_cursor(self.index[parents[0]])
103
self.treeview.grab_focus()
200
105
def forward(self):
201
106
"""Signal handler for the Forward button."""
202
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]
203
110
if not len(children):
206
113
for child_id in children:
207
114
child_index = self.index[child_id]
208
115
child = self.model[child_index][treemodel.REVISION]
209
if same_branch(child, self.get_revision()):
210
self.set_revision(child)
116
if same_branch(child, revision):
117
self.treeview.set_cursor(child_index)
213
self.set_revision_id(children[0])
120
self.treeview.set_cursor(self.index[children[0]])
121
self.treeview.grab_focus()
215
def populate(self, revision=None):
123
def populate(self, start, maxnum, broken_line_length=None):
216
124
"""Fill the treeview with contents.
218
126
:param start: Revision id of revision to start with.
242
143
self.graph_column.set_max_width(width)
243
144
self.index = index
244
145
self.treeview.set_model(self.model)
247
self.treeview.set_cursor(0)
249
self.set_revision(revision)
146
self.treeview.set_cursor(0)
251
147
self.emit('revisions-loaded')
255
def show_diff(self, revid=None, parentid=None):
151
def show_diff(self, branch, revid, parentid):
256
152
"""Open a new window to show a diff between the given revisions."""
257
153
from bzrlib.plugins.gtk.diff import DiffWindow
258
154
window = DiffWindow(parent=self)
260
parents = self.get_parents()
263
revid = self.get_revision().revision_id
265
if parentid is None and len(parents) > 0:
266
parentid = parents[0]
269
parentid = NULL_REVISION
271
rev_tree = self.branch.repository.revision_tree(revid)
272
parent_tree = self.branch.repository.revision_tree(parentid)
274
description = revid + " - " + self.branch.nick
155
(parent_tree, rev_tree) = branch.repository.revision_trees([parentid,
157
description = revid + " - " + branch.nick
275
158
window.set_diff(description, rev_tree, parent_tree)
303
186
cell = gtk.CellRendererText()
304
187
cell.set_property("width-chars", 15)
305
188
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
306
self.revno_column = gtk.TreeViewColumn("Revision No")
307
self.revno_column.set_resizable(True)
308
self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
309
self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
310
self.revno_column.pack_start(cell, expand=True)
311
self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
312
self.treeview.append_column(self.revno_column)
189
column = gtk.TreeViewColumn("Revision No")
190
column.set_resizable(True)
191
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
192
column.set_fixed_width(cell.get_size(self.treeview)[2])
193
column.pack_start(cell, expand=True)
194
column.add_attribute(cell, "text", treemodel.REVNO)
195
self.treeview.append_column(column)
314
197
self.graph_cell = CellRendererGraph()
315
198
self.graph_column = gtk.TreeViewColumn()
324
207
cell = gtk.CellRendererText()
325
208
cell.set_property("width-chars", 65)
326
209
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
327
self.msg_column = gtk.TreeViewColumn("Message")
328
self.msg_column.set_resizable(True)
329
self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
330
self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
331
self.msg_column.pack_start(cell, expand=True)
332
self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
333
self.treeview.append_column(self.msg_column)
210
column = gtk.TreeViewColumn("Message")
211
column.set_resizable(True)
212
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
213
column.set_fixed_width(cell.get_size(self.treeview)[2])
214
column.pack_start(cell, expand=True)
215
column.add_attribute(cell, "text", treemodel.MESSAGE)
216
self.treeview.append_column(column)
335
218
cell = gtk.CellRendererText()
336
219
cell.set_property("width-chars", 15)
337
220
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
338
self.committer_column = gtk.TreeViewColumn("Committer")
339
self.committer_column.set_resizable(True)
340
self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
341
self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
342
self.committer_column.pack_start(cell, expand=True)
343
self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
344
self.treeview.append_column(self.committer_column)
346
cell = gtk.CellRendererText()
347
cell.set_property("width-chars", 20)
348
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
349
self.date_column = gtk.TreeViewColumn("Date")
350
self.date_column.set_visible(False)
351
self.date_column.set_resizable(True)
352
self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
354
self.date_column.pack_start(cell, expand=True)
355
self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
356
self.treeview.append_column(self.date_column)
358
def _on_selection_changed(self, treeview):
221
column = gtk.TreeViewColumn("Committer")
222
column.set_resizable(True)
223
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
224
column.set_fixed_width(cell.get_size(self.treeview)[2])
225
column.pack_start(cell, expand=True)
226
column.add_attribute(cell, "text", treemodel.COMMITER)
227
self.treeview.append_column(column)
229
def _on_selection_changed(self, selection, *args):
359
230
"""callback for when the treeview changes."""
360
(path, focus) = treeview.get_cursor()
362
self.iter = self.model.get_iter(path)
231
(model, selected_rows) = selection.get_selected_rows()
232
if len(selected_rows) > 0:
233
iter = self.model.get_iter(selected_rows[0])
234
self.revision = self.model.get_value(iter, treemodel.REVISION)
235
self.parents = self.model.get_value(iter, treemodel.PARENTS)
236
self.children = self.model.get_value(iter, treemodel.CHILDREN)
363
238
self.emit('revision-selected')
365
240
def _on_revision_selected(self, widget, event):