/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/treeview.py

  • Committer: Daniel Schierbeck
  • Date: 2007-11-09 17:53:26 UTC
  • Revision ID: daniel.schierbeck@gmail.com-20071109175326-7aggg43pieersx4d
Fixed performance issue by only releasing the branch lock when the treeview is destroyed. This will surely fuck up the tagging code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/treeview.py
3
3
 
4
4
"""
5
5
 
6
 
__copyright__ = "Copyright © 2005 Canonical Ltd."
 
6
__copyright__ = "Copyright � 2005 Canonical Ltd."
7
7
__author__    = "Daniel Schierbeck <daniel.schierbeck@gmail.com>"
8
8
 
9
9
import sys
14
14
import re
15
15
import treemodel
16
16
 
17
 
from bzrlib.plugins.gtk import _i18n
18
17
from linegraph import linegraph, same_branch
19
18
from graphcell import CellRendererGraph
20
19
from treemodel import TreeModel
21
20
from bzrlib.revision import NULL_REVISION
22
21
 
23
 
class TreeView(gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
24
23
 
25
24
    __gproperties__ = {
26
25
        'branch': (gobject.TYPE_PYOBJECT,
33
32
                     'The currently selected revision',
34
33
                     gobject.PARAM_READWRITE),
35
34
 
36
 
        'revision-number': (gobject.TYPE_STRING,
37
 
                            'Revision number',
38
 
                            'The number of the selected revision',
39
 
                            '',
40
 
                            gobject.PARAM_READABLE),
41
 
 
42
 
        'children': (gobject.TYPE_PYOBJECT,
43
 
                     'Child revisions',
44
 
                     'Children of the currently selected revision',
45
 
                     gobject.PARAM_READABLE),
46
 
 
47
 
        'parents': (gobject.TYPE_PYOBJECT,
48
 
                    'Parent revisions',
49
 
                    'Parents to the currently selected revision',
50
 
                    gobject.PARAM_READABLE),
51
 
 
52
35
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
53
 
                                 'Revision number column',
 
36
                                 'Revision number',
54
37
                                 'Show revision number column',
55
38
                                 True,
56
39
                                 gobject.PARAM_READWRITE),
57
40
 
58
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
59
 
                                 'Graph column',
60
 
                                 'Show graph column',
61
 
                                 True,
62
 
                                 gobject.PARAM_READWRITE),
63
 
 
64
41
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
42
                                 'Date',
66
43
                                 'Show date column',
67
44
                                 False,
68
 
                                 gobject.PARAM_READWRITE),
69
 
 
70
 
        'compact': (gobject.TYPE_BOOLEAN,
71
 
                    'Compact view',
72
 
                    'Break ancestry lines to save space',
73
 
                    True,
74
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
75
 
 
76
 
        'mainline-only': (gobject.TYPE_BOOLEAN,
77
 
                    'Mainline only',
78
 
                    'Only show the mainline history.',
79
 
                    False,
80
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
45
                                 gobject.PARAM_READWRITE)
81
46
 
82
47
    }
83
48
 
87
52
                             ()),
88
53
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
54
                              gobject.TYPE_NONE,
90
 
                              ()),
91
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
92
 
                              gobject.TYPE_NONE,
93
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
 
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
 
                              gobject.TYPE_NONE,
96
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
55
                              ())
97
56
    }
98
57
 
99
 
    def __init__(self, branch, start, maxnum, compact=True):
 
58
    def __init__(self, branch, start, maxnum, broken_line_length=None):
100
59
        """Create a new TreeView.
101
60
 
102
61
        :param branch: Branch object for branch to show.
106
65
        :param broken_line_length: After how much lines to break 
107
66
                                   branches.
108
67
        """
109
 
        gtk.VBox.__init__(self, spacing=0)
110
 
 
111
 
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
112
 
        self.connect('revisions-loaded', 
113
 
                lambda x: self.loading_msg_box.hide())
114
 
 
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)
121
 
 
122
 
        self.scrolled_window.add(self.construct_treeview())
123
 
        
124
 
 
125
 
        self.iter = None
 
68
        gtk.ScrolledWindow.__init__(self)
 
69
 
 
70
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
71
        self.set_shadow_type(gtk.SHADOW_IN)
 
72
 
 
73
        self.construct_treeview()
 
74
 
126
75
        self.branch = branch
 
76
 
 
77
        gobject.idle_add(self.populate, start, maxnum, 
 
78
                         broken_line_length)
 
79
 
127
80
        self.revision = None
128
 
 
129
 
        self.start = start
130
 
        self.maxnum = maxnum
131
 
        self.compact = compact
132
 
 
133
 
        gobject.idle_add(self.populate)
 
81
        self.children = None
 
82
        self.parents  = None
134
83
 
135
84
        self.connect("destroy", lambda x: self.branch.unlock())
136
85
 
137
86
    def do_get_property(self, property):
138
87
        if property.name == 'revno-column-visible':
139
88
            return self.revno_column.get_visible()
140
 
        elif property.name == 'graph-column-visible':
141
 
            return self.graph_column.get_visible()
142
89
        elif property.name == 'date-column-visible':
143
90
            return self.date_column.get_visible()
144
 
        elif property.name == 'compact':
145
 
            return self.compact
146
 
        elif property.name == 'mainline-only':
147
 
            return self.mainline_only
148
91
        elif property.name == 'branch':
149
92
            return self.branch
150
93
        elif property.name == 'revision':
151
 
            return self.model.get_value(self.iter, treemodel.REVISION)
152
 
        elif property.name == 'revision-number':
153
 
            return self.model.get_value(self.iter, treemodel.REVNO)
154
 
        elif property.name == 'children':
155
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
156
 
        elif property.name == 'parents':
157
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
94
            return self.revision
158
95
        else:
159
96
            raise AttributeError, 'unknown property %s' % property.name
160
97
 
161
98
    def do_set_property(self, property, value):
162
99
        if property.name == 'revno-column-visible':
163
100
            self.revno_column.set_visible(value)
164
 
        elif property.name == 'graph-column-visible':
165
 
            self.graph_column.set_visible(value)
166
101
        elif property.name == 'date-column-visible':
167
102
            self.date_column.set_visible(value)
168
 
        elif property.name == 'compact':
169
 
            self.compact = value
170
 
        elif property.name == 'mainline-only':
171
 
            self.mainline_only = value
172
103
        elif property.name == 'branch':
173
104
            self.branch = value
174
105
        elif property.name == 'revision':
178
109
 
179
110
    def get_revision(self):
180
111
        """Return revision id of currently selected revision, or None."""
181
 
        return self.get_property('revision')
182
 
 
183
 
    def set_revision(self, revision):
184
 
        self.set_property('revision', revision)
 
112
        return self.revision
185
113
 
186
114
    def set_revision_id(self, revid):
187
115
        """Change the currently selected revision.
196
124
 
197
125
        :return: list of revision ids.
198
126
        """
199
 
        return self.get_property('children')
 
127
        return self.children
200
128
 
201
129
    def get_parents(self):
202
130
        """Return the parents of the currently selected revision.
203
131
 
204
132
        :return: list of revision ids.
205
133
        """
206
 
        return self.get_property('parents')
207
 
 
208
 
    def add_tag(self, tag, revid=None):
209
 
        if revid is None: revid = self.revision.revision_id
210
 
 
211
 
        try:
212
 
            self.branch.unlock()
213
 
 
214
 
            try:
215
 
                self.branch.lock_write()
216
 
                self.model.add_tag(tag, revid)
217
 
            finally:
218
 
                self.branch.unlock()
219
 
 
220
 
        finally:
221
 
            self.branch.lock_read()
222
 
 
223
 
        self.emit('tag-added', tag, revid)
 
134
        return self.parents
224
135
        
225
 
    def refresh(self):
226
 
        self.loading_msg_box.show()
227
 
        gobject.idle_add(self.populate, self.get_revision())
228
 
 
229
 
    def update(self):
230
 
        try:
231
 
            self.branch.unlock()
232
 
            try:
233
 
                self.branch.lock_write()
234
 
                self.branch.update()
235
 
            finally:
236
 
                self.branch.unlock()
237
 
        finally:
238
 
            self.branch.lock_read()
239
 
 
240
136
    def back(self):
241
137
        """Signal handler for the Back button."""
242
 
        parents = self.get_parents()
 
138
        (path, col) = self.treeview.get_cursor()
 
139
        revision = self.model[path][treemodel.REVISION]
 
140
        parents = self.model[path][treemodel.PARENTS]
243
141
        if not len(parents):
244
142
            return
245
143
 
246
144
        for parent_id in parents:
247
145
            parent_index = self.index[parent_id]
248
146
            parent = self.model[parent_index][treemodel.REVISION]
249
 
            if same_branch(self.get_revision(), parent):
250
 
                self.set_revision(parent)
 
147
            if same_branch(revision, parent):
 
148
                self.treeview.set_cursor(parent_index)
251
149
                break
252
150
        else:
253
 
            self.set_revision_id(parents[0])
 
151
            self.treeview.set_cursor(self.index[parents[0]])
 
152
        self.treeview.grab_focus()
254
153
 
255
154
    def forward(self):
256
155
        """Signal handler for the Forward button."""
257
 
        children = self.get_children()
 
156
        (path, col) = self.treeview.get_cursor()
 
157
        revision = self.model[path][treemodel.REVISION]
 
158
        children = self.model[path][treemodel.CHILDREN]
258
159
        if not len(children):
259
160
            return
260
161
 
261
162
        for child_id in children:
262
163
            child_index = self.index[child_id]
263
164
            child = self.model[child_index][treemodel.REVISION]
264
 
            if same_branch(child, self.get_revision()):
265
 
                self.set_revision(child)
 
165
            if same_branch(child, revision):
 
166
                self.treeview.set_cursor(child_index)
266
167
                break
267
168
        else:
268
 
            self.set_revision_id(children[0])
 
169
            self.treeview.set_cursor(self.index[children[0]])
 
170
        self.treeview.grab_focus()
269
171
 
270
 
    def populate(self, revision=None):
 
172
    def populate(self, start, maxnum, broken_line_length=None):
271
173
        """Fill the treeview with contents.
272
174
 
273
175
        :param start: Revision id of revision to start with.
276
178
        :param broken_line_length: After how much lines branches \
277
179
                       should be broken.
278
180
        """
279
 
 
280
 
        if self.compact:
281
 
            broken_line_length = 32
282
 
        else:
283
 
            broken_line_length = None
284
 
        
285
 
        show_graph = self.graph_column.get_visible()
286
 
 
287
181
        self.branch.lock_read()
288
182
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
289
 
                                                        (self.start,) , # Sequence of start revisions
290
 
                                                        self.maxnum, 
291
 
                                                        broken_line_length,
292
 
                                                        show_graph,
293
 
                                                        self.mainline_only)
 
183
                                                        start,
 
184
                                                        maxnum, 
 
185
                                                        broken_line_length)
294
186
 
295
 
        self.model = TreeModel(self.branch, linegraphdata)
 
187
        self.model = TreeModel(self.branch.repository, linegraphdata)
296
188
        self.graph_cell.columns_len = columns_len
297
189
        width = self.graph_cell.get_size(self.treeview)[2]
298
 
        if width > 500:
299
 
            width = 500
300
190
        self.graph_column.set_fixed_width(width)
301
191
        self.graph_column.set_max_width(width)
302
192
        self.index = index
303
193
        self.treeview.set_model(self.model)
304
 
 
305
 
        if not revision or revision == NULL_REVISION:
306
 
            self.treeview.set_cursor(0)
307
 
        else:
308
 
            self.set_revision(revision)
309
 
 
 
194
        self.treeview.set_cursor(0)
310
195
        self.emit('revisions-loaded')
311
196
 
312
197
        return False
313
198
 
 
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)
 
203
 
 
204
        if revid is None:
 
205
            revid = self.revision.revision_id
 
206
 
 
207
            if parentid is None and len(self.parents) > 0:
 
208
                parentid = self.parents[0]
 
209
 
 
210
        if parentid is None:
 
211
            parentid = NULL_REVISION
 
212
 
 
213
        rev_tree    = self.branch.repository.revision_tree(revid)
 
214
        parent_tree = self.branch.repository.revision_tree(parentid)
 
215
 
 
216
        description = revid + " - " + self.branch.nick
 
217
        window.set_diff(description, rev_tree, parent_tree)
 
218
        window.show()
 
219
 
314
220
    def construct_treeview(self):
315
221
        self.treeview = gtk.TreeView()
316
222
 
333
239
 
334
240
        self.treeview.set_property('fixed-height-mode', True)
335
241
 
 
242
        self.add(self.treeview)
336
243
        self.treeview.show()
337
244
 
338
245
        cell = gtk.CellRendererText()
339
246
        cell.set_property("width-chars", 15)
340
247
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
341
248
        self.revno_column = gtk.TreeViewColumn("Revision No")
342
 
        self.revno_column.set_resizable(False)
 
249
        self.revno_column.set_resizable(True)
343
250
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
344
251
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
345
252
        self.revno_column.pack_start(cell, expand=True)
348
255
 
349
256
        self.graph_cell = CellRendererGraph()
350
257
        self.graph_column = gtk.TreeViewColumn()
351
 
        self.graph_column.set_resizable(False)
 
258
        self.graph_column.set_resizable(True)
352
259
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
260
        self.graph_column.pack_start(self.graph_cell, expand=False)
354
261
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
355
 
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
356
262
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
357
263
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
358
264
        self.treeview.append_column(self.graph_column)
360
266
        cell = gtk.CellRendererText()
361
267
        cell.set_property("width-chars", 65)
362
268
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
363
 
        self.summary_column = gtk.TreeViewColumn("Summary")
364
 
        self.summary_column.set_resizable(False)
365
 
        self.summary_column.set_expand(True)
366
 
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
367
 
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
368
 
        self.summary_column.pack_start(cell, expand=True)
369
 
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
370
 
        self.treeview.append_column(self.summary_column)
 
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)
371
276
 
372
277
        cell = gtk.CellRendererText()
373
278
        cell.set_property("width-chars", 15)
374
279
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
375
280
        self.committer_column = gtk.TreeViewColumn("Committer")
376
 
        self.committer_column.set_resizable(False)
 
281
        self.committer_column.set_resizable(True)
377
282
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
378
 
        self.committer_column.set_fixed_width(200)
 
283
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
379
284
        self.committer_column.pack_start(cell, expand=True)
380
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
285
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
381
286
        self.treeview.append_column(self.committer_column)
382
287
 
383
288
        cell = gtk.CellRendererText()
385
290
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
386
291
        self.date_column = gtk.TreeViewColumn("Date")
387
292
        self.date_column.set_visible(False)
388
 
        self.date_column.set_resizable(False)
 
293
        self.date_column.set_resizable(True)
389
294
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
390
 
        self.date_column.set_fixed_width(130)
 
295
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
391
296
        self.date_column.pack_start(cell, expand=True)
392
297
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
393
298
        self.treeview.append_column(self.date_column)
394
 
        
395
 
        return self.treeview
396
 
    
397
 
    def construct_loading_msg(self):
398
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
399
 
                                                 gtk.ICON_SIZE_BUTTON)
400
 
        image_loading.show()
401
 
        
402
 
        label_loading = gtk.Label(
403
 
            _i18n("Please wait, loading ancestral graph..."))
404
 
        label_loading.set_alignment(0.0, 0.5)
405
 
        label_loading.show()
406
 
        
407
 
        self.loading_msg_box = gtk.HBox()
408
 
        self.loading_msg_box.set_spacing(5)
409
 
        self.loading_msg_box.set_border_width(5)        
410
 
        self.loading_msg_box.pack_start(image_loading, False, False)
411
 
        self.loading_msg_box.pack_start(label_loading, True, True)
412
 
        self.loading_msg_box.show()
413
 
        
414
 
        return self.loading_msg_box
415
299
 
416
300
    def _on_selection_changed(self, treeview):
417
301
        """callback for when the treeview changes."""
418
302
        (path, focus) = treeview.get_cursor()
419
303
        if path is not None:
420
 
            self.iter = self.model.get_iter(path)
 
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)
 
308
 
421
309
            self.emit('revision-selected')
422
310
 
423
311
    def _on_revision_selected(self, widget, event):
426
314
            menu = RevisionPopupMenu(self.branch.repository, 
427
315
                [self.get_revision().revision_id],
428
316
                self.branch)
429
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
430
317
            menu.popup(None, None, None, event.button, event.get_time())
431
318
 
432
319
    def _on_revision_activated(self, widget, path, col):
433
 
        self.emit('revision-activated', 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]
 
324
 
 
325
        if len(parents) == 0:
 
326
            parent_id = None
 
327
        else:
 
328
            parent_id = parents[0]
 
329
 
 
330
        self.show_diff(revision_id, parent_id)
 
331
        self.treeview.grab_focus()