/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 revisionview.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:
revisionview.py
19
19
pygtk.require("2.0")
20
20
import gtk
21
21
import pango
 
22
import gobject
22
23
 
23
24
from bzrlib.osutils import format_date
 
25
from bzrlib.util.bencode import bdecode
24
26
 
25
 
class LogView(gtk.Notebook):
 
27
class RevisionView(gtk.Notebook):
26
28
    """ Custom widget for commit log details.
27
29
 
28
30
    A variety of bzr tools may need to implement such a thing. This is a
29
31
    start.
30
32
    """
31
33
 
32
 
    def __init__(self, revision=None, scroll=True, tags=[],
33
 
                 show_children=False, branch=None):
 
34
    __gproperties__ = {
 
35
        'branch': (
 
36
            gobject.TYPE_PYOBJECT,
 
37
            'Branch',
 
38
            'The branch holding the revision being displayed',
 
39
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
40
        ),
 
41
 
 
42
        'revision': (
 
43
            gobject.TYPE_PYOBJECT,
 
44
            'Revision',
 
45
            'The revision being displayed',
 
46
            gobject.PARAM_READWRITE
 
47
        ),
 
48
 
 
49
        'children': (
 
50
            gobject.TYPE_PYOBJECT,
 
51
            'Children',
 
52
            'Child revisions',
 
53
            gobject.PARAM_READWRITE
 
54
        ),
 
55
 
 
56
        'file-id': (
 
57
            gobject.TYPE_PYOBJECT,
 
58
            'File Id',
 
59
            'The file id',
 
60
            gobject.PARAM_READWRITE
 
61
        )
 
62
    }
 
63
 
 
64
 
 
65
    def __init__(self, branch=None):
34
66
        gtk.Notebook.__init__(self)
35
 
        self.show_children = show_children
36
67
 
37
68
        self._create_general()
38
69
        self._create_relations()
 
70
        self._create_file_info_view()
39
71
 
40
72
        self.set_current_page(0)
41
73
        
42
74
        self._show_callback = None
43
 
        self._go_callback = None
44
75
        self._clicked_callback = None
45
76
 
 
77
        self._revision = None
46
78
        self._branch = branch
47
79
 
48
 
        if revision is not None:
49
 
            self.set_revision(revision, tags=tags)
 
80
        if self._branch is not None and self._branch.supports_tags():
 
81
            self._tagdict = self._branch.tags.get_reverse_tag_dict()
 
82
        else:
 
83
            self._tagdict = {}
 
84
 
 
85
        self.set_file_id(None)
 
86
 
 
87
    def do_get_property(self, property):
 
88
        if property.name == 'branch':
 
89
            return self._branch
 
90
        elif property.name == 'revision':
 
91
            return self._revision
 
92
        elif property.name == 'children':
 
93
            return self._children
 
94
        elif property.name == 'file-id':
 
95
            return self._file_id
 
96
        else:
 
97
            raise AttributeError, 'unknown property %s' % property.name
 
98
 
 
99
    def do_set_property(self, property, value):
 
100
        if property.name == 'branch':
 
101
            self._branch = value
 
102
        elif property.name == 'revision':
 
103
            self._set_revision(value)
 
104
        elif property.name == 'children':
 
105
            self.set_children(value)
 
106
        elif property.name == 'file-id':
 
107
            self._file_id = value
 
108
        else:
 
109
            raise AttributeError, 'unknown property %s' % property.name
50
110
 
51
111
    def set_show_callback(self, callback):
52
112
        self._show_callback = callback
53
113
 
54
 
    def set_go_callback(self, callback):
55
 
        self._go_callback = callback
56
 
 
57
 
    def set_revision(self, revision, tags=[], children=[]):
 
114
    def set_file_id(self, file_id):
 
115
        """Set a specific file id that we want to track.
 
116
 
 
117
        This just effects the display of a per-file commit message.
 
118
        If it is set to None, then all commit messages will be shown.
 
119
        """
 
120
        self.set_property('file-id', file_id)
 
121
 
 
122
    def set_revision(self, revision):
 
123
        if revision != self._revision:
 
124
            self.set_property('revision', revision)
 
125
 
 
126
    def get_revision(self):
 
127
        return self.get_property('revision')
 
128
 
 
129
    def _set_revision(self, revision):
 
130
        if revision is None: return
 
131
 
58
132
        self._revision = revision
59
 
        self.revision_id.set_text(revision.revision_id)
60
133
        if revision.committer is not None:
61
134
            self.committer.set_text(revision.committer)
62
135
        else:
73
146
        if revision.timestamp is not None:
74
147
            self.timestamp.set_text(format_date(revision.timestamp,
75
148
                                                revision.timezone))
76
 
        self.message_buffer.set_text(revision.message)
77
149
        try:
78
150
            self.branchnick_label.set_text(revision.properties['branch-nick'])
79
151
        except KeyError:
83
155
                                      self.parents_widgets,
84
156
                                      self.parents_table)
85
157
        
86
 
        if self.show_children:
87
 
            self._add_parents_or_children(children,
88
 
                                          self.children_widgets,
89
 
                                          self.children_table)
90
 
        
91
 
        self._add_tags(tags)
 
158
        file_info = revision.properties.get('file-info', None)
 
159
        if file_info is not None:
 
160
            file_info = bdecode(file_info.encode('UTF-8'))
 
161
 
 
162
        if file_info:
 
163
            if self._file_id is None:
 
164
                text = []
 
165
                for fi in file_info:
 
166
                    text.append('%(path)s\n%(message)s' % fi)
 
167
                self.file_info_buffer.set_text('\n'.join(text))
 
168
                self.file_info_box.show()
 
169
            else:
 
170
                text = []
 
171
                for fi in file_info:
 
172
                    if fi['file_id'] == self._file_id:
 
173
                        text.append(fi['message'])
 
174
                if text:
 
175
                    self.file_info_buffer.set_text('\n'.join(text))
 
176
                    self.file_info_box.show()
 
177
                else:
 
178
                    self.file_info_box.hide()
 
179
        else:
 
180
            self.file_info_box.hide()
 
181
 
 
182
    def set_children(self, children):
 
183
        self._add_parents_or_children(children,
 
184
                                      self.children_widgets,
 
185
                                      self.children_table)
92
186
 
93
187
    def _show_clicked_cb(self, widget, revid, parentid):
94
188
        """Callback for when the show button for a parent is clicked."""
96
190
 
97
191
    def _go_clicked_cb(self, widget, revid):
98
192
        """Callback for when the go button for a parent is clicked."""
99
 
        self._go_callback(revid)
100
193
 
101
 
    def _add_tags(self, tags):
 
194
    def _add_tags(self, *args):
 
195
        if self._tagdict.has_key(self._revision.revision_id):
 
196
            tags = self._tagdict[self._revision.revision_id]
 
197
        else:
 
198
            tags = []
 
199
            
102
200
        if tags == []:
103
201
            self.tags_list.hide()
104
202
            self.tags_label.hide()
148
246
                hbox.pack_start(button, expand=False, fill=True)
149
247
                button.show()
150
248
 
151
 
            if self._go_callback is not None:
152
 
                button = gtk.Button(revid)
153
 
                button.connect("clicked", self._go_clicked_cb, revid)
154
 
            else:
155
 
                button = gtk.Label(revid)
 
249
            button = gtk.Button(revid)
 
250
            button.connect("clicked",
 
251
                    lambda w, r: self.set_revision(self._branch.repository.get_revision(r)), revid)
156
252
            button.set_use_underline(False)
157
253
            hbox.pack_start(button, expand=False, fill=True)
158
254
            button.show()
169
265
        vbox = gtk.VBox(False, 6)
170
266
        vbox.set_border_width(6)
171
267
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
172
 
        if self.show_children:
173
 
            vbox.pack_start(self._create_children(), expand=False, fill=True)
 
268
        vbox.pack_start(self._create_children(), expand=False, fill=True)
174
269
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
175
270
        vbox.show()
176
271
 
189
284
        label.show()
190
285
 
191
286
        align = gtk.Alignment(0.0, 0.5)
192
 
        self.revision_id = gtk.Label()
193
 
        self.revision_id.set_selectable(True)
194
 
        align.add(self.revision_id)
 
287
        revision_id = gtk.Label()
 
288
        revision_id.set_selectable(True)
 
289
        self.connect('notify::revision', 
 
290
                lambda w, p: revision_id.set_text(self._revision.revision_id))
 
291
        align.add(revision_id)
195
292
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
196
293
        align.show()
197
 
        self.revision_id.show()
 
294
        revision_id.show()
198
295
 
199
296
        align = gtk.Alignment(1.0, 0.5)
200
297
        self.author_label = gtk.Label()
277
374
        self.tags_list.show()
278
375
        self.tags_widgets = []
279
376
 
 
377
        self.connect('notify::revision', self._add_tags)
 
378
 
280
379
        return self.table
281
380
 
282
381
    
315
414
        align.show()
316
415
 
317
416
        return table
318
 
    
319
 
 
320
417
 
321
418
    def _create_message_view(self):
322
 
        self.message_buffer = gtk.TextBuffer()
 
419
        msg_buffer = gtk.TextBuffer()
 
420
        self.connect('notify::revision',
 
421
                lambda w, p: msg_buffer.set_text(self._revision.message))
323
422
        window = gtk.ScrolledWindow()
324
423
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
325
424
        window.set_shadow_type(gtk.SHADOW_IN)
326
 
        tv = gtk.TextView(self.message_buffer)
 
425
        tv = gtk.TextView(msg_buffer)
327
426
        tv.set_editable(False)
328
427
        tv.set_wrap_mode(gtk.WRAP_WORD)
329
428
        tv.modify_font(pango.FontDescription("Monospace"))
332
431
        window.show()
333
432
        return window
334
433
 
 
434
    def _create_file_info_view(self):
 
435
        self.file_info_box = gtk.VBox(False, 6)
 
436
        self.file_info_box.set_border_width(6)
 
437
        self.file_info_buffer = gtk.TextBuffer()
 
438
        window = gtk.ScrolledWindow()
 
439
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
440
        window.set_shadow_type(gtk.SHADOW_IN)
 
441
        tv = gtk.TextView(self.file_info_buffer)
 
442
        tv.set_editable(False)
 
443
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
444
        tv.modify_font(pango.FontDescription("Monospace"))
 
445
        tv.show()
 
446
        window.add(tv)
 
447
        window.show()
 
448
        self.file_info_box.pack_start(window)
 
449
        self.file_info_box.hide() # Only shown when there are per-file messages
 
450
        self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
 
451