/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: Jelmer Vernooij
  • Date: 2007-10-26 17:02:18 UTC
  • Revision ID: jelmer@samba.org-20071026170218-pepec3wazqr3ghhb
Add very simple "Send Merge Directive" window.

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
 
from gi.repository import Gtk
10
 
from gi.repository import GObject
11
 
from gi.repository import Pango
12
 
 
13
 
from bzrlib import ui
14
 
from bzrlib.revision import NULL_REVISION
15
 
 
16
 
from bzrlib.plugins.gtk import lock
17
 
from bzrlib.plugins.gtk.ui import ProgressPanel
18
 
from bzrlib.plugins.gtk.branchview import treemodel
19
 
from bzrlib.plugins.gtk.branchview.linegraph import linegraph, same_branch
20
 
from bzrlib.plugins.gtk.branchview.graphcell import CellRendererGraph
21
 
 
22
 
 
23
 
class TreeView(Gtk.VBox):
24
 
 
25
 
    __gproperties__ = {
26
 
        'branch': (GObject.TYPE_PYOBJECT,
27
 
                   'Branch',
28
 
                   'The Bazaar branch being visualized',
29
 
                   GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE),
30
 
 
31
 
        'revision': (GObject.TYPE_PYOBJECT,
32
 
                     'Revision',
33
 
                     'The currently selected revision',
34
 
                     GObject.PARAM_READWRITE),
35
 
 
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
 
        'revno-column-visible': (GObject.TYPE_BOOLEAN,
53
 
                                 'Revision number column',
54
 
                                 'Show revision number column',
55
 
                                 True,
56
 
                                 GObject.PARAM_READWRITE),
57
 
 
58
 
        'graph-column-visible': (GObject.TYPE_BOOLEAN,
59
 
                                 'Graph column',
60
 
                                 'Show graph column',
61
 
                                 True,
62
 
                                 GObject.PARAM_READWRITE),
63
 
 
64
 
        'date-column-visible': (GObject.TYPE_BOOLEAN,
65
 
                                 'Date',
66
 
                                 'Show date column',
67
 
                                 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),
81
 
 
82
 
    }
 
9
import sys
 
10
import string
 
11
import gtk
 
12
import gobject
 
13
import pango
 
14
import re
 
15
import treemodel
 
16
 
 
17
from linegraph import linegraph, same_branch
 
18
from graphcell import CellRendererGraph
 
19
from treemodel import TreeModel
 
20
 
 
21
class TreeView(gtk.ScrolledWindow):
83
22
 
84
23
    __gsignals__ = {
85
 
        'revision-selected': (GObject.SignalFlags.RUN_FIRST,
86
 
                              None,
87
 
                              ()),
88
 
        'revision-activated': (GObject.SignalFlags.RUN_FIRST,
89
 
                              None,
90
 
                              (GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT)),
91
 
        'tag-added': (GObject.SignalFlags.RUN_FIRST,
92
 
                              None,
93
 
                              (GObject.TYPE_STRING, GObject.TYPE_STRING)),
94
 
        'refreshed': (GObject.SignalFlags.RUN_FIRST, None,
95
 
                              ())
 
24
            'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
25
                                 gobject.TYPE_NONE,
 
26
                                 ()),
 
27
            'revision-selected': (gobject.SIGNAL_RUN_FIRST,
 
28
                                  gobject.TYPE_NONE,
 
29
                                  ())
96
30
    }
97
31
 
98
 
    def __init__(self, branch, start, maxnum, compact=True):
 
32
    def __init__(self, branch, start, maxnum):
99
33
        """Create a new TreeView.
100
34
 
101
35
        :param branch: Branch object for branch to show.
102
36
        :param start: Revision id of top revision.
103
37
        :param maxnum: Maximum number of revisions to display, 
104
38
                       None for no limit.
105
 
        :param broken_line_length: After how much lines to break 
106
 
                                   branches.
107
39
        """
108
 
        super(TreeView, self).__init__(homogeneous=False, spacing=0)
109
 
 
110
 
        self.progress_widget = ProgressPanel()
111
 
        self.pack_start(self.progress_widget, False, True, 0)
112
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
113
 
            # We'are using our own ui, let's tell it to use our widget.
114
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
115
 
 
116
 
        self.scrolled_window = Gtk.ScrolledWindow()
117
 
        self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC,
118
 
                                        Gtk.PolicyType.AUTOMATIC)
119
 
        self.scrolled_window.set_shadow_type(Gtk.ShadowType.IN)
120
 
        self.scrolled_window.show()
121
 
        self.pack_start(self.scrolled_window, True, True, 0)
122
 
 
123
 
        self.scrolled_window.add(self.construct_treeview())
124
 
 
125
 
        self.path = None
 
40
        gtk.ScrolledWindow.__init__(self)
 
41
 
 
42
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
43
        self.set_shadow_type(gtk.SHADOW_IN)
 
44
 
 
45
        self.construct_treeview()
 
46
 
126
47
        self.branch = branch
 
48
        self.branch.lock_read()
 
49
 
 
50
        gobject.idle_add(self.populate, start, maxnum)
 
51
 
127
52
        self.revision = None
128
 
        self.index = {}
129
 
 
130
 
        self.start = start
131
 
        self.maxnum = maxnum
132
 
        self.compact = compact
133
 
 
134
 
        self.model = treemodel.BranchTreeModel(self.branch, [])
135
 
        GObject.idle_add(self.populate)
136
 
 
137
 
        self.connect("destroy", self._on_destroy)
138
 
 
139
 
    def _on_destroy(self, *ignored):
140
 
        self.branch.unlock()
141
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
142
 
            # We'are using our own ui, let's tell it to stop using our widget.
143
 
            ui.ui_factory.set_progress_bar_widget(None)
144
 
 
145
 
    def do_get_property(self, property):
146
 
        if property.name == 'revno-column-visible':
147
 
            return self.revno_column.get_visible()
148
 
        elif property.name == 'graph-column-visible':
149
 
            return self.graph_column.get_visible()
150
 
        elif property.name == 'date-column-visible':
151
 
            return self.date_column.get_visible()
152
 
        elif property.name == 'compact':
153
 
            return self.compact
154
 
        elif property.name == 'mainline-only':
155
 
            return self.mainline_only
156
 
        elif property.name == 'branch':
157
 
            return self.branch
158
 
        elif property.name == 'revision':
159
 
            if self.path is None:
160
 
                return None
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVISION)
163
 
        elif property.name == 'revision-number':
164
 
            if self.path is None:
165
 
                return None
166
 
            return self.model.get_value(self.model.get_iter(self.path),
167
 
                                        treemodel.REVNO)
168
 
        elif property.name == 'children':
169
 
            if self.path is None:
170
 
                return None
171
 
            return self.model.get_value(self.model.get_iter(self.path),
172
 
                                        treemodel.CHILDREN)
173
 
        elif property.name == 'parents':
174
 
            if self.path is None:
175
 
                return None
176
 
            return self.model.get_value(self.model.get_iter(self.path),
177
 
                                        treemodel.PARENTS)
178
 
        else:
179
 
            raise AttributeError, 'unknown property %s' % property.name
180
 
 
181
 
    def do_set_property(self, property, value):
182
 
        if property.name == 'revno-column-visible':
183
 
            self.revno_column.set_visible(value)
184
 
        elif property.name == 'graph-column-visible':
185
 
            self.graph_column.set_visible(value)
186
 
        elif property.name == 'date-column-visible':
187
 
            self.date_column.set_visible(value)
188
 
        elif property.name == 'compact':
189
 
            self.compact = value
190
 
        elif property.name == 'mainline-only':
191
 
            self.mainline_only = value
192
 
        elif property.name == 'branch':
193
 
            self.branch = value
194
 
        elif property.name == 'revision':
195
 
            self.set_revision_id(value.revision_id)
196
 
        else:
197
 
            raise AttributeError, 'unknown property %s' % property.name
 
53
        self.children = None
 
54
        self.parents  = None
 
55
 
 
56
        self.connect('destroy', lambda w: self.branch.unlock())
198
57
 
199
58
    def get_revision(self):
200
59
        """Return revision id of currently selected revision, or None."""
201
 
        return self.get_property('revision')
202
 
 
203
 
    def has_revision_id(self, revision_id):
204
 
        return (revision_id in self.index)
205
 
 
206
 
    def set_revision(self, revision):
207
 
        self.set_property('revision', revision)
208
 
 
209
 
    def set_revision_id(self, revid):
 
60
        return self.revision
 
61
 
 
62
    def set_revision(self, revid):
210
63
        """Change the currently selected revision.
211
64
 
212
65
        :param revid: Revision id of revision to display.
213
66
        """
214
 
        self.treeview.set_cursor(
215
 
            Gtk.TreePath(path=self.index[revid]), None, False)
 
67
        self.treeview.set_cursor(self.index[revid])
216
68
        self.treeview.grab_focus()
217
69
 
218
70
    def get_children(self):
220
72
 
221
73
        :return: list of revision ids.
222
74
        """
223
 
        return self.get_property('children')
 
75
        return self.children
224
76
 
225
77
    def get_parents(self):
226
78
        """Return the parents of the currently selected revision.
227
79
 
228
80
        :return: list of revision ids.
229
81
        """
230
 
        return self.get_property('parents')
231
 
 
232
 
    def add_tag(self, tag, revid=None):
233
 
        if revid is None: revid = self.revision.revision_id
234
 
 
235
 
        if lock.release(self.branch):
236
 
            try:
237
 
                lock.acquire(self.branch, lock.WRITE)
238
 
                self.model.add_tag(tag, revid)
239
 
            finally:
240
 
                lock.release(self.branch)
241
 
 
242
 
            lock.acquire(self.branch, lock.READ)
243
 
 
244
 
            self.emit('tag-added', tag, revid)
245
 
 
246
 
    def refresh(self):
247
 
        GObject.idle_add(self.populate, self.get_revision())
248
 
 
249
 
    def update(self):
250
 
        try:
251
 
            self.branch.unlock()
252
 
            try:
253
 
                self.branch.lock_write()
254
 
                self.branch.update()
255
 
            finally:
256
 
                self.branch.unlock()
257
 
        finally:
258
 
            self.branch.lock_read()
259
 
 
 
82
        return self.parents
 
83
        
260
84
    def back(self):
261
85
        """Signal handler for the Back button."""
262
 
        parents = self.get_parents()
263
 
        if not parents:
 
86
        (path, col) = self.treeview.get_cursor()
 
87
        revision = self.model[path][treemodel.REVISION]
 
88
        parents = self.model[path][treemodel.PARENTS]
 
89
        if not len(parents):
264
90
            return
265
91
 
266
92
        for parent_id in parents:
267
93
            parent_index = self.index[parent_id]
268
94
            parent = self.model[parent_index][treemodel.REVISION]
269
 
            if same_branch(self.get_revision(), parent):
270
 
                self.set_revision(parent)
 
95
            if same_branch(revision, parent):
 
96
                self.treeview.set_cursor(parent_index)
271
97
                break
272
98
        else:
273
 
            self.set_revision_id(parents[0])
 
99
            self.treeview.set_cursor(self.index[parents[0]])
 
100
        self.treeview.grab_focus()
274
101
 
275
102
    def forward(self):
276
103
        """Signal handler for the Forward button."""
277
 
        children = self.get_children()
278
 
        if not children:
 
104
        (path, col) = self.treeview.get_cursor()
 
105
        revision = self.model[path][treemodel.REVISION]
 
106
        children = self.model[path][treemodel.CHILDREN]
 
107
        if not len(children):
279
108
            return
280
109
 
281
110
        for child_id in children:
282
111
            child_index = self.index[child_id]
283
112
            child = self.model[child_index][treemodel.REVISION]
284
 
            if same_branch(child, self.get_revision()):
285
 
                self.set_revision(child)
 
113
            if same_branch(child, revision):
 
114
                self.treeview.set_cursor(child_index)
286
115
                break
287
116
        else:
288
 
            self.set_revision_id(children[0])
 
117
            self.treeview.set_cursor(self.index[children[0]])
 
118
        self.treeview.grab_focus()
289
119
 
290
 
    def populate(self, revision=None):
 
120
    def populate(self, start, maxnum):
291
121
        """Fill the treeview with contents.
292
122
 
293
123
        :param start: Revision id of revision to start with.
294
124
        :param maxnum: Maximum number of revisions to display, or None 
295
125
                       for no limit.
296
 
        :param broken_line_length: After how much lines branches \
297
 
                       should be broken.
298
126
        """
299
 
 
300
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
301
 
            # We'are using our own ui, let's tell it to use our widget.
302
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
303
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
304
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
305
 
 
306
 
        try:
307
 
            if self.compact:
308
 
                broken_line_length = 32
309
 
            else:
310
 
                broken_line_length = None
311
 
 
312
 
            show_graph = self.graph_column.get_visible()
313
 
 
314
 
            self.branch.lock_read()
315
 
            (linegraphdata, index, columns_len) = linegraph(
316
 
                self.branch.repository.get_graph(),
317
 
                self.start,
318
 
                self.maxnum, 
319
 
                broken_line_length,
320
 
                show_graph,
321
 
                self.mainline_only,
322
 
                self.progress_bar)
323
 
 
324
 
            self.model.set_line_graph_data(linegraphdata)
325
 
            self.graph_cell.columns_len = columns_len
326
 
            width = self.graph_cell.get_preferred_width(self.treeview)[1]
327
 
            if width > 500:
328
 
                width = 500
329
 
            elif width == 0:
330
 
                # The get_preferred_width() call got an insane value.
331
 
                width = 200
332
 
            self.graph_column.set_fixed_width(width)
333
 
            self.graph_column.set_max_width(width)
334
 
            self.index = index
335
 
            self.treeview.set_model(self.model)
336
 
 
337
 
            if not revision or revision == NULL_REVISION:
338
 
                self.treeview.set_cursor(Gtk.TreePath(path=0), None, False)
339
 
            else:
340
 
                self.set_revision(revision)
341
 
 
342
 
            self.emit('refreshed')
343
 
            return False
344
 
        finally:
345
 
            self.progress_bar.finished()
 
127
        (linegraphdata, index, columns_len) = linegraph(self.branch,
 
128
                                                        start,
 
129
                                                        maxnum)
 
130
 
 
131
        self.model = TreeModel(self.branch, linegraphdata)
 
132
        self.graph_cell.columns_len = columns_len
 
133
        width = self.graph_cell.get_size(self.treeview)[2]
 
134
        self.graph_column.set_fixed_width(width)
 
135
        self.graph_column.set_max_width(width)
 
136
        self.index = index
 
137
        self.treeview.set_model(self.model)
 
138
        self.treeview.set_cursor(0)
 
139
        self.emit('revisions-loaded')
 
140
 
 
141
        return False
 
142
 
 
143
    def show_diff(self, branch, revid, parentid):
 
144
        """Open a new window to show a diff between the given revisions."""
 
145
        from bzrlib.plugins.gtk.diff import DiffWindow
 
146
        window = DiffWindow(parent=self)
 
147
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
 
148
                                                                   revid])
 
149
        description = revid + " - " + branch.nick
 
150
        window.set_diff(description, rev_tree, parent_tree)
 
151
        window.show()
346
152
 
347
153
    def construct_treeview(self):
348
 
        self.treeview = Gtk.TreeView()
 
154
        self.treeview = gtk.TreeView()
349
155
 
350
156
        self.treeview.set_rules_hint(True)
351
 
        # combined revno/summary interactive search
352
 
        #
353
 
        # the row in a treemodel is considered "matched" if a REVNO *starts*
354
 
        # from the key (that is the key is found in a REVNO at the offset 0)
355
 
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
356
 
        # found case insensitively in a MESSAGE at any offset)
357
 
        def search_equal_func(model, column, key, iter, ignored):
358
 
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
359
 
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
360
 
 
361
 
        self.treeview.set_search_equal_func(search_equal_func, None)
362
 
        self.treeview.set_enable_search(True)
363
 
 
364
 
        self.treeview.set_tooltip_column(treemodel.MESSAGE)
365
 
        self.treeview.set_headers_visible(True)
366
 
 
367
 
        self._prev_cursor_path = None
368
 
        self.treeview.connect("cursor-changed",
 
157
        self.treeview.set_search_column(4)
 
158
 
 
159
        self.treeview.get_selection().connect("changed",
369
160
                self._on_selection_changed)
370
161
 
371
162
        self.treeview.connect("row-activated", 
376
167
 
377
168
        self.treeview.set_property('fixed-height-mode', True)
378
169
 
 
170
        self.add(self.treeview)
379
171
        self.treeview.show()
380
172
 
381
 
        cell = Gtk.CellRendererText()
 
173
        cell = gtk.CellRendererText()
382
174
        cell.set_property("width-chars", 15)
383
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
384
 
        self.revno_column = Gtk.TreeViewColumn("Revision No")
385
 
        self.revno_column.set_resizable(True)
386
 
        self.revno_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
387
 
        self.revno_column.set_fixed_width(
388
 
            cell.get_preferred_width(self.treeview)[1])
389
 
        self.revno_column.pack_start(cell, True)
390
 
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
391
 
        self.treeview.append_column(self.revno_column)
 
175
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
176
        column = gtk.TreeViewColumn("Revision No")
 
177
        column.set_resizable(True)
 
178
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
179
        column.set_fixed_width(cell.get_size(self.treeview)[2])
 
180
        column.pack_start(cell, expand=True)
 
181
        column.add_attribute(cell, "text", treemodel.REVNO)
 
182
        self.treeview.append_column(column)
392
183
 
393
184
        self.graph_cell = CellRendererGraph()
394
 
        self.graph_column = Gtk.TreeViewColumn()
 
185
        self.graph_column = gtk.TreeViewColumn()
395
186
        self.graph_column.set_resizable(True)
396
 
        self.graph_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
397
 
        self.graph_column.pack_start(self.graph_cell, True)
398
 
        self.graph_column.add_attribute(
399
 
            self.graph_cell, "node", treemodel.NODE)
400
 
        self.graph_column.add_attribute(
401
 
            self.graph_cell, "tags", treemodel.TAGS)
402
 
        self.graph_column.add_attribute(
403
 
            self.graph_cell, "in-lines", treemodel.LAST_LINES)
404
 
        self.graph_column.add_attribute(
405
 
            self.graph_cell, "out-lines", treemodel.LINES)
 
187
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
188
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
189
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
190
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
 
191
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
406
192
        self.treeview.append_column(self.graph_column)
407
193
 
408
 
        cell = Gtk.CellRendererText()
 
194
        cell = gtk.CellRendererText()
409
195
        cell.set_property("width-chars", 65)
410
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
411
 
        self.summary_column = Gtk.TreeViewColumn("Summary")
412
 
        self.summary_column.set_resizable(True)
413
 
        self.summary_column.set_expand(True)
414
 
        self.summary_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
415
 
        self.summary_column.set_fixed_width(
416
 
            cell.get_preferred_width(self.treeview)[1])
417
 
        self.summary_column.pack_start(cell, True)
418
 
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
419
 
        self.treeview.append_column(self.summary_column)
 
196
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
197
        column = gtk.TreeViewColumn("Message")
 
198
        column.set_resizable(True)
 
199
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
200
        column.set_fixed_width(cell.get_size(self.treeview)[2])
 
201
        column.pack_start(cell, expand=True)
 
202
        column.add_attribute(cell, "text", treemodel.MESSAGE)
 
203
        self.treeview.append_column(column)
420
204
 
421
 
        cell = Gtk.CellRendererText()
 
205
        cell = gtk.CellRendererText()
422
206
        cell.set_property("width-chars", 15)
423
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
424
 
        self.authors_column = Gtk.TreeViewColumn("Author(s)")
425
 
        self.authors_column.set_resizable(False)
426
 
        self.authors_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
427
 
        self.authors_column.set_fixed_width(200)
428
 
        self.authors_column.pack_start(cell, True)
429
 
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
430
 
        self.treeview.append_column(self.authors_column)
431
 
 
432
 
        cell = Gtk.CellRendererText()
433
 
        cell.set_property("width-chars", 20)
434
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
435
 
        self.date_column = Gtk.TreeViewColumn("Date")
436
 
        self.date_column.set_visible(False)
437
 
        self.date_column.set_resizable(True)
438
 
        self.date_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
439
 
        self.date_column.set_fixed_width(130)
440
 
        self.date_column.pack_start(cell, True)
441
 
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
442
 
        self.treeview.append_column(self.date_column)
443
 
 
444
 
        return self.treeview
445
 
 
446
 
    def _on_selection_changed(self, treeview):
 
207
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
208
        column = gtk.TreeViewColumn("Committer")
 
209
        column.set_resizable(True)
 
210
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
211
        column.set_fixed_width(cell.get_size(self.treeview)[2])
 
212
        column.pack_start(cell, expand=True)
 
213
        column.add_attribute(cell, "text", treemodel.COMMITER)
 
214
        self.treeview.append_column(column)
 
215
 
 
216
    def _on_selection_changed(self, selection, *args):
447
217
        """callback for when the treeview changes."""
448
 
        (path, focus) = treeview.get_cursor()
449
 
        if (path is not None) and (path != self._prev_cursor_path):
450
 
            self._prev_cursor_path = path # avoid emitting twice per click
451
 
            self.path = path
 
218
        (model, selected_rows) = selection.get_selected_rows()
 
219
        if len(selected_rows) > 0:
 
220
            iter = self.model.get_iter(selected_rows[0])
 
221
            self.revision = self.model.get_value(iter, treemodel.REVISION)
 
222
            self.parents = self.model.get_value(iter, treemodel.PARENTS)
 
223
            self.children = self.model.get_value(iter, treemodel.CHILDREN)
 
224
 
452
225
            self.emit('revision-selected')
453
226
 
454
227
    def _on_revision_selected(self, widget, event):
455
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
228
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
456
229
        if event.button == 3:
457
 
            revs = []
458
 
            rev = self.get_revision()
459
 
            if rev is not None:
460
 
                revs.append(rev.revision_id)
461
 
            menu = RevisionMenu(self.branch.repository, revs, self.branch)
462
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
463
 
            menu.popup(None, None, None, None, event.button, event.get_time())
 
230
            menu = RevisionPopupMenu(self.branch.repository, 
 
231
                [self.get_revision().revision_id],
 
232
                self.branch)
 
233
            menu.popup(None, None, None, event.button, event.get_time())
464
234
 
465
235
    def _on_revision_activated(self, widget, path, col):
466
 
        self.emit('revision-activated', path, col)
 
236
        # TODO: more than one parent
 
237
        """Callback for when a treeview row gets activated."""
 
238
        revision_id = self.model[path][treemodel.REVID]
 
239
        parents = self.model[path][treemodel.PARENTS]
 
240
        if len(parents) == 0:
 
241
            # Ignore revisions without parent
 
242
            return
 
243
        parent_id = parents[0]
 
244
        self.show_diff(self.branch, revision_id, parent_id)
 
245
        self.treeview.grab_focus()