/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: Daniel Schierbeck
  • Date: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

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
from bzrlib.revision import NULL_REVISION
20
21
 
21
22
class TreeView(gtk.ScrolledWindow):
22
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',
 
53
                                 'Show revision number column',
 
54
                                 True,
 
55
                                 gobject.PARAM_READWRITE),
 
56
 
 
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
 
58
                                 'Date',
 
59
                                 'Show date column',
 
60
                                 False,
 
61
                                 gobject.PARAM_READWRITE),
 
62
 
 
63
        'compact': (gobject.TYPE_BOOLEAN,
 
64
                    'Compact view',
 
65
                    'Break ancestry lines to save space',
 
66
                    True,
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
 
68
 
 
69
    }
 
70
 
23
71
    __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
 
                                  ())
 
72
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
73
                             gobject.TYPE_NONE,
 
74
                             ()),
 
75
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
 
76
                              gobject.TYPE_NONE,
 
77
                              ())
30
78
    }
31
79
 
32
 
    def __init__(self, branch, start, maxnum):
 
80
    def __init__(self, branch, start, maxnum, compact=True):
 
81
        """Create a new TreeView.
 
82
 
 
83
        :param branch: Branch object for branch to show.
 
84
        :param start: Revision id of top revision.
 
85
        :param maxnum: Maximum number of revisions to display, 
 
86
                       None for no limit.
 
87
        :param broken_line_length: After how much lines to break 
 
88
                                   branches.
 
89
        """
33
90
        gtk.ScrolledWindow.__init__(self)
34
91
 
35
92
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
37
94
 
38
95
        self.construct_treeview()
39
96
 
 
97
        self.iter   = None
40
98
        self.branch = branch
41
 
        self.branch.lock_read()
42
 
 
43
 
        gobject.idle_add(self.populate, start, maxnum)
44
 
 
45
 
        self.revision = None
46
 
        self.children = None
47
 
        self.parents  = None
48
 
 
49
 
        self.connect('destroy', lambda w: self.branch.unlock())
 
99
 
 
100
        self.start = start
 
101
        self.maxnum = maxnum
 
102
        self.compact = compact
 
103
 
 
104
        gobject.idle_add(self.populate)
 
105
 
 
106
        self.connect("destroy", lambda x: self.branch.unlock())
 
107
 
 
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':
 
114
            return self.compact
 
115
        elif property.name == 'branch':
 
116
            return self.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)
 
125
        else:
 
126
            raise AttributeError, 'unknown property %s' % property.name
 
127
 
 
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':
 
134
            self.compact = value
 
135
        elif property.name == 'branch':
 
136
            self.branch = value
 
137
        elif property.name == 'revision':
 
138
            self.set_revision_id(value.revision_id)
 
139
        else:
 
140
            raise AttributeError, 'unknown property %s' % property.name
50
141
 
51
142
    def get_revision(self):
52
 
        return self.revision
53
 
 
54
 
    def set_revision(self, revid):
 
143
        """Return revision id of currently selected revision, or None."""
 
144
        return self.get_property('revision')
 
145
 
 
146
    def set_revision(self, revision):
 
147
        self.set_property('revision', revision)
 
148
 
 
149
    def set_revision_id(self, revid):
 
150
        """Change the currently selected revision.
 
151
 
 
152
        :param revid: Revision id of revision to display.
 
153
        """
55
154
        self.treeview.set_cursor(self.index[revid])
56
155
        self.treeview.grab_focus()
57
156
 
58
157
    def get_children(self):
59
 
        return self.children
 
158
        """Return the children of the currently selected revision.
 
159
 
 
160
        :return: list of revision ids.
 
161
        """
 
162
        return self.get_property('children')
60
163
 
61
164
    def get_parents(self):
62
 
        return self.parents
 
165
        """Return the parents of the currently selected revision.
 
166
 
 
167
        :return: list of revision ids.
 
168
        """
 
169
        return self.get_property('parents')
63
170
        
 
171
    def refresh(self):
 
172
        gobject.idle_add(self.populate, self.get_revision())
 
173
 
 
174
    def update(self):
 
175
        try:
 
176
            self.branch.unlock()
 
177
            try:
 
178
                self.branch.lock_write()
 
179
                self.branch.update()
 
180
            finally:
 
181
                self.branch.unlock()
 
182
        finally:
 
183
            self.branch.lock_read()
 
184
 
64
185
    def back(self):
65
 
        (path, col) = self.treeview.get_cursor()
66
 
        revision = self.model[path][treemodel.REVISION]
67
 
        parents = self.model[path][treemodel.PARENTS]
 
186
        """Signal handler for the Back button."""
 
187
        parents = self.get_parents()
68
188
        if not len(parents):
69
189
            return
70
190
 
71
191
        for parent_id in parents:
72
192
            parent_index = self.index[parent_id]
73
193
            parent = self.model[parent_index][treemodel.REVISION]
74
 
            if same_branch(revision, parent):
75
 
                self.treeview.set_cursor(parent_index)
 
194
            if same_branch(self.get_revision(), parent):
 
195
                self.set_revision(parent)
76
196
                break
77
197
        else:
78
 
            self.treeview.set_cursor(self.index[parents[0]])
79
 
        self.treeview.grab_focus()
 
198
            self.set_revision_id(parents[0])
80
199
 
81
200
    def forward(self):
82
 
        (path, col) = self.treeview.get_cursor()
83
 
        revision = self.model[path][treemodel.REVISION]
84
 
        children = self.model[path][treemodel.CHILDREN]
 
201
        """Signal handler for the Forward button."""
 
202
        children = self.get_children()
85
203
        if not len(children):
86
204
            return
87
205
 
88
206
        for child_id in children:
89
207
            child_index = self.index[child_id]
90
208
            child = self.model[child_index][treemodel.REVISION]
91
 
            if same_branch(child, revision):
92
 
                self.treeview.set_cursor(child_index)
 
209
            if same_branch(child, self.get_revision()):
 
210
                self.set_revision(child)
93
211
                break
94
212
        else:
95
 
            self.treeview.set_cursor(self.index[children[0]])
96
 
        self.treeview.grab_focus()
97
 
 
98
 
    def populate(self, start, maxnum):
99
 
        (linegraphdata, index, columns_len) = linegraph(self.branch,
100
 
                                                        start,
101
 
                                                        maxnum)
102
 
 
103
 
        self.model = TreeModel(self.branch, linegraphdata)
 
213
            self.set_revision_id(children[0])
 
214
 
 
215
    def populate(self, revision=None):
 
216
        """Fill the treeview with contents.
 
217
 
 
218
        :param start: Revision id of revision to start with.
 
219
        :param maxnum: Maximum number of revisions to display, or None 
 
220
                       for no limit.
 
221
        :param broken_line_length: After how much lines branches \
 
222
                       should be broken.
 
223
        """
 
224
 
 
225
        if self.compact:
 
226
            broken_line_length = 32
 
227
        else:
 
228
            broken_line_length = None
 
229
 
 
230
        self.branch.lock_read()
 
231
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
232
                                                        self.start,
 
233
                                                        self.maxnum, 
 
234
                                                        broken_line_length)
 
235
 
 
236
        self.model = TreeModel(self.branch.repository, linegraphdata)
104
237
        self.graph_cell.columns_len = columns_len
105
238
        width = self.graph_cell.get_size(self.treeview)[2]
 
239
        if width > 500:
 
240
            width = 500
106
241
        self.graph_column.set_fixed_width(width)
107
242
        self.graph_column.set_max_width(width)
108
243
        self.index = index
109
244
        self.treeview.set_model(self.model)
110
 
        self.treeview.set_cursor(0)
 
245
 
 
246
        if revision is None:
 
247
            self.treeview.set_cursor(0)
 
248
        else:
 
249
            self.set_revision(revision)
 
250
 
111
251
        self.emit('revisions-loaded')
112
252
 
113
253
        return False
114
254
 
115
 
    def show_diff(self, branch, revid, parentid):
 
255
    def show_diff(self, revid=None, parentid=None):
116
256
        """Open a new window to show a diff between the given revisions."""
117
257
        from bzrlib.plugins.gtk.diff import DiffWindow
118
258
        window = DiffWindow(parent=self)
119
 
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
120
 
                                                                   revid])
121
 
        description = revid + " - " + branch.nick
 
259
 
 
260
        parents = self.get_parents()
 
261
 
 
262
        if revid is None:
 
263
            revid = self.get_revision().revision_id
 
264
 
 
265
            if parentid is None and len(parents) > 0:
 
266
                parentid = parents[0]
 
267
 
 
268
        if parentid is None:
 
269
            parentid = NULL_REVISION
 
270
 
 
271
        rev_tree    = self.branch.repository.revision_tree(revid)
 
272
        parent_tree = self.branch.repository.revision_tree(parentid)
 
273
 
 
274
        description = revid + " - " + self.branch.nick
122
275
        window.set_diff(description, rev_tree, parent_tree)
123
276
        window.show()
124
277
 
126
279
        self.treeview = gtk.TreeView()
127
280
 
128
281
        self.treeview.set_rules_hint(True)
129
 
        self.treeview.set_search_column(4)
 
282
        self.treeview.set_search_column(treemodel.REVNO)
 
283
        
 
284
        # Fix old PyGTK bug - by JAM
 
285
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
 
286
        if set_tooltip is not None:
 
287
            set_tooltip(treemodel.MESSAGE)
130
288
 
131
 
        self.treeview.get_selection().connect("changed",
 
289
        self.treeview.connect("cursor-changed",
132
290
                self._on_selection_changed)
133
291
 
134
292
        self.treeview.connect("row-activated", 
145
303
        cell = gtk.CellRendererText()
146
304
        cell.set_property("width-chars", 15)
147
305
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
148
 
        column = gtk.TreeViewColumn("Revision No")
149
 
        column.set_resizable(True)
150
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
151
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
152
 
        column.pack_start(cell, expand=True)
153
 
        column.add_attribute(cell, "text", treemodel.REVNO)
154
 
        self.treeview.append_column(column)
 
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)
155
313
 
156
314
        self.graph_cell = CellRendererGraph()
157
315
        self.graph_column = gtk.TreeViewColumn()
166
324
        cell = gtk.CellRendererText()
167
325
        cell.set_property("width-chars", 65)
168
326
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
169
 
        column = gtk.TreeViewColumn("Message")
170
 
        column.set_resizable(True)
171
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
172
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
173
 
        column.pack_start(cell, expand=True)
174
 
        column.add_attribute(cell, "text", treemodel.MESSAGE)
175
 
        self.treeview.append_column(column)
 
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, "markup", treemodel.MESSAGE)
 
333
        self.treeview.append_column(self.msg_column)
176
334
 
177
335
        cell = gtk.CellRendererText()
178
336
        cell.set_property("width-chars", 15)
179
337
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
180
 
        column = gtk.TreeViewColumn("Committer")
181
 
        column.set_resizable(True)
182
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
183
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
184
 
        column.pack_start(cell, expand=True)
185
 
        column.add_attribute(cell, "text", treemodel.COMMITER)
186
 
        self.treeview.append_column(column)
187
 
 
188
 
    def _on_selection_changed(self, selection, *args):
 
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)
 
345
 
 
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)
 
357
 
 
358
    def _on_selection_changed(self, treeview):
189
359
        """callback for when the treeview changes."""
190
 
        (model, selected_rows) = selection.get_selected_rows()
191
 
        if len(selected_rows) > 0:
192
 
            iter = self.model.get_iter(selected_rows[0])
193
 
            self.revision = self.model.get_value(iter, treemodel.REVISION)
194
 
            self.parents = self.model.get_value(iter, treemodel.PARENTS)
195
 
            self.children = self.model.get_value(iter, treemodel.CHILDREN)
196
 
 
 
360
        (path, focus) = treeview.get_cursor()
 
361
        if path is not None:
 
362
            self.iter = self.model.get_iter(path)
197
363
            self.emit('revision-selected')
198
364
 
199
365
    def _on_revision_selected(self, widget, event):
209
375
        """Callback for when a treeview row gets activated."""
210
376
        revision_id = self.model[path][treemodel.REVID]
211
377
        parents = self.model[path][treemodel.PARENTS]
 
378
 
212
379
        if len(parents) == 0:
213
 
            # Ignore revisions without parent
214
 
            return
215
 
        parent_id = parents[0]
216
 
        self.show_diff(self.branch, revision_id, parent_id)
 
380
            parent_id = None
 
381
        else:
 
382
            parent_id = parents[0]
 
383
 
 
384
        self.show_diff(revision_id, parent_id)
217
385
        self.treeview.grab_focus()