/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: Jelmer Vernooij
  • Date: 2008-06-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

Show diffs side-by-side

added added

removed removed

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