/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 branchview/treeview.py

  • Committer: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

Show diffs side-by-side

added added

removed removed

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