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 logview.py
- browse files at revision 324.2.4
- compare with another revision
- download diff
- download tarball
- view history from revision 324.2.4
- Committer: Daniel Schierbeck
- Date: 2007-10-30 15:46:43 UTC
- mto: (326.1.1 dev)
- mto: This revision was merged to the branch mainline in revision 327.
- Revision ID: daniel.schierbeck@gmail.com-20071030154643-b2s7zov2tob96fvw
Added 'Changes' page to logview.
- files added:
- tests/test_viz.py
- files removed:
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- preferences/__init__.py => preferences.py
- branchview/graphcell.py => viz/graphcell.py
- branchview/linegraph.py => viz/linegraph.py
- branchview/treemodel.py => viz/treemodel.py
- branchview/treeview.py => viz/treeview.py
- files modified:
- AUTHORS
added
removed
logview.py
19
19
pygtk.require("2.0")
20
20
import gtk
21
21
import pango
22
import gobject
23
import webbrowser
22
import gtksourceview
23
import sys
24
25
from cStringIO import StringIO
24
26
25
27
from bzrlib.osutils import format_date
26
from bzrlib.util.bencode import bdecode
27
from bzrlib.testament import Testament
28
29
from bzrlib.plugins.gtk import icon_path
30
31
try:
32
from bzrlib.plugins.gtk import seahorse
33
except ImportError:
34
has_seahorse = False
35
else:
36
has_seahorse = True
37
38
PAGE_GENERAL = 0
39
PAGE_RELATIONS = 1
40
PAGE_SIGNATURE = 2
41
PAGE_BUGS = 3
42
43
44
def _open_link(widget, uri):
45
for cmd in ['sensible-browser', 'xdg-open']:
46
if webbrowser._iscommand(cmd):
47
webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
48
webbrowser.open(uri)
49
50
gtk.link_button_set_uri_hook(_open_link)
51
52
class BugsTab(gtk.VBox):
53
54
def __init__(self):
55
super(BugsTab, self).__init__(False, 6)
56
57
table = gtk.Table(rows=2, columns=2)
58
59
table.set_row_spacings(6)
60
table.set_col_spacing(0, 16)
61
62
image = gtk.Image()
63
image.set_from_file(icon_path("bug.png"))
64
table.attach(image, 0, 1, 0, 1, gtk.FILL)
65
66
align = gtk.Alignment(0.0, 0.1)
67
self.label = gtk.Label()
68
align.add(self.label)
69
table.attach(align, 1, 2, 0, 1, gtk.FILL)
70
71
treeview = self.construct_treeview()
72
table.attach(treeview, 1, 2, 1, 2, gtk.FILL | gtk.EXPAND)
73
74
self.set_border_width(6)
75
self.pack_start(table, expand=False)
76
77
self.clear()
78
self.show_all()
79
80
def set_revision(self, revision):
81
if revision is None:
82
return
83
84
self.clear()
85
bugs_text = revision.properties.get('bugs', '')
86
for bugline in bugs_text.splitlines():
87
(url, status) = bugline.split(" ")
88
if status == "fixed":
89
self.add_bug(url, status)
90
91
if self.num_bugs == 0:
92
return
93
elif self.num_bugs == 1:
94
label = "bug"
95
else:
96
label = "bugs"
97
98
self.label.set_markup("<b>Bugs fixed</b>\n" +
99
"This revision claims to fix " +
100
"%d %s." % (self.num_bugs, label))
101
102
def construct_treeview(self):
103
self.bugs = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
104
self.treeview = gtk.TreeView(self.bugs)
105
self.treeview.set_headers_visible(False)
106
107
uri_column = gtk.TreeViewColumn('Bug URI', gtk.CellRendererText(), text=0)
108
self.treeview.append_column(uri_column)
109
110
self.treeview.connect('row-activated', self.on_row_activated)
111
112
win = gtk.ScrolledWindow()
113
win.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
114
win.set_shadow_type(gtk.SHADOW_IN)
115
win.add(self.treeview)
116
117
return win
118
119
def clear(self):
120
self.num_bugs = 0
121
self.bugs.clear()
122
self.set_sensitive(False)
123
self.label.set_markup("<b>No bugs fixed</b>\n" +
124
"This revision does not claim to fix any bugs.")
125
126
def add_bug(self, url, status):
127
self.num_bugs += 1
128
self.bugs.append([url, status])
129
self.set_sensitive(True)
130
131
def get_num_bugs(self):
132
return self.num_bugs
133
134
def on_row_activated(self, treeview, path, column):
135
uri = self.bugs.get_value(self.bugs.get_iter(path), 0)
136
_open_link(self, uri)
137
138
139
class SignatureTab(gtk.VBox):
140
141
def __init__(self, repository):
142
self.key = None
143
self.revision = None
144
self.repository = repository
145
146
super(SignatureTab, self).__init__(False, 6)
147
signature_box = gtk.Table(rows=3, columns=3)
148
signature_box.set_col_spacing(0, 16)
149
signature_box.set_col_spacing(1, 12)
150
signature_box.set_row_spacings(6)
151
152
self.signature_image = gtk.Image()
153
signature_box.attach(self.signature_image, 0, 1, 0, 1, gtk.FILL)
154
155
align = gtk.Alignment(0.0, 0.1)
156
self.signature_label = gtk.Label()
157
align.add(self.signature_label)
158
signature_box.attach(align, 1, 3, 0, 1, gtk.FILL)
159
160
align = gtk.Alignment(0.0, 0.5)
161
self.signature_key_id_label = gtk.Label()
162
self.signature_key_id_label.set_markup("<b>Key Id:</b>")
163
align.add(self.signature_key_id_label)
164
signature_box.attach(align, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
165
166
align = gtk.Alignment(0.0, 0.5)
167
self.signature_key_id = gtk.Label()
168
self.signature_key_id.set_selectable(True)
169
align.add(self.signature_key_id)
170
signature_box.attach(align, 2, 3, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
171
172
align = gtk.Alignment(0.0, 0.5)
173
self.signature_fingerprint_label = gtk.Label()
174
self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
175
align.add(self.signature_fingerprint_label)
176
signature_box.attach(align, 1, 2, 2, 3, gtk.FILL, gtk.FILL)
177
178
align = gtk.Alignment(0.0, 0.5)
179
self.signature_fingerprint = gtk.Label()
180
self.signature_fingerprint.set_selectable(True)
181
align.add(self.signature_fingerprint)
182
signature_box.attach(align, 2, 3, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
183
184
align = gtk.Alignment(0.0, 0.5)
185
self.signature_trust_label = gtk.Label()
186
self.signature_trust_label.set_markup("<b>Trust:</b>")
187
align.add(self.signature_trust_label)
188
signature_box.attach(align, 1, 2, 3, 4, gtk.FILL, gtk.FILL)
189
190
align = gtk.Alignment(0.0, 0.5)
191
self.signature_trust = gtk.Label()
192
self.signature_trust.set_selectable(True)
193
align.add(self.signature_trust)
194
signature_box.attach(align, 2, 3, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
195
196
self.set_border_width(6)
197
self.pack_start(signature_box, expand=False)
198
self.show_all()
199
200
def set_revision(self, revision):
201
self.revision = revision
202
revid = revision.revision_id
203
204
if self.repository.has_signature_for_revision_id(revid):
205
crypttext = self.repository.get_signature_text(revid)
206
self.show_signature(crypttext)
207
else:
208
self.show_no_signature()
209
210
def show_no_signature(self):
211
self.signature_key_id_label.hide()
212
self.signature_key_id.set_text("")
213
214
self.signature_fingerprint_label.hide()
215
self.signature_fingerprint.set_text("")
216
217
self.signature_trust_label.hide()
218
self.signature_trust.set_text("")
219
220
self.signature_image.set_from_file(icon_path("sign-unknown.png"))
221
self.signature_label.set_markup("<b>Authenticity unknown</b>\n" +
222
"This revision has not been signed.")
223
224
def show_signature(self, crypttext):
225
(cleartext, key) = seahorse.verify(crypttext)
226
227
assert cleartext is not None
228
229
inv = self.repository.get_inventory(self.revision.revision_id)
230
expected_testament = Testament(self.revision, inv).as_short_text()
231
if expected_testament != cleartext:
232
self.signature_image.set_from_file(icon_path("sign-bad.png"))
233
self.signature_label.set_markup("<b>Signature does not match repository data</b>\n" +
234
"The signature plaintext is different from the expected testament plaintext.")
235
return
236
237
if key and key.is_available():
238
if key.is_trusted():
239
if key.get_display_name() == self.revision.committer:
240
self.signature_image.set_from_file(icon_path("sign-ok.png"))
241
self.signature_label.set_markup("<b>Authenticity confirmed</b>\n" +
242
"This revision has been signed with " +
243
"a trusted key.")
244
else:
245
self.signature_image.set_from_file(icon_path("sign-bad.png"))
246
self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
247
"Revision committer is not the same as signer.")
248
else:
249
self.signature_image.set_from_file(icon_path("sign-bad.png"))
250
self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
251
"This revision has been signed, but the " +
252
"key is not trusted.")
253
else:
254
self.show_no_signature()
255
self.signature_image.set_from_file(icon_path("sign-bad.png"))
256
self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
257
"Signature key not available.")
258
return
259
260
trust = key.get_trust()
261
262
if trust <= seahorse.TRUST_NEVER:
263
trust_text = 'never trusted'
264
elif trust == seahorse.TRUST_UNKNOWN:
265
trust_text = 'not trusted'
266
elif trust == seahorse.TRUST_MARGINAL:
267
trust_text = 'marginally trusted'
268
elif trust == seahorse.TRUST_FULL:
269
trust_text = 'fully trusted'
270
elif trust == seahorse.TRUST_ULTIMATE:
271
trust_text = 'ultimately trusted'
272
273
self.signature_key_id_label.show()
274
self.signature_key_id.set_text(key.get_id())
275
276
fingerprint = key.get_fingerprint()
277
if fingerprint == "":
278
fingerprint = '<span foreground="dim grey">N/A</span>'
279
280
self.signature_fingerprint_label.show()
281
self.signature_fingerprint.set_markup(fingerprint)
282
283
self.signature_trust_label.show()
284
self.signature_trust.set_text('This key is ' + trust_text)
285
286
287
class RevisionView(gtk.Notebook):
28
from bzrlib.diff import show_diff_trees
29
30
class LogView(gtk.Notebook):
288
31
""" Custom widget for commit log details.
289
32
290
33
A variety of bzr tools may need to implement such a thing. This is a
291
34
start.
292
35
"""
293
36
294
__gproperties__ = {
295
'branch': (
296
gobject.TYPE_PYOBJECT,
297
'Branch',
298
'The branch holding the revision being displayed',
299
gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
300
),
301
302
'revision': (
303
gobject.TYPE_PYOBJECT,
304
'Revision',
305
'The revision being displayed',
306
gobject.PARAM_READWRITE
307
),
308
309
'children': (
310
gobject.TYPE_PYOBJECT,
311
'Children',
312
'Child revisions',
313
gobject.PARAM_READWRITE
314
),
315
316
'file-id': (
317
gobject.TYPE_PYOBJECT,
318
'File Id',
319
'The file id',
320
gobject.PARAM_READWRITE
321
)
322
}
323
324
def __init__(self, branch=None, repository=None):
37
def __init__(self, revision=None, scroll=True, tags=[],
38
show_children=False, branch=None):
325
39
gtk.Notebook.__init__(self)
326
327
self._revision = None
328
self._branch = branch
329
if branch is not None:
330
self._repository = branch.repository
331
else:
332
self._repository = repository
40
self.show_children = show_children
333
41
334
42
self._create_general()
335
43
self._create_relations()
336
# Disabled because testaments aren't verified yet:
337
if has_seahorse:
338
self._create_signature()
339
self._create_file_info_view()
340
self._create_bugs()
341
342
self.set_current_page(PAGE_GENERAL)
343
self.connect_after('switch-page', self._switch_page_cb)
44
self._create_changes()
344
45
345
46
self._show_callback = None
47
self._go_callback = None
346
48
self._clicked_callback = None
347
49
348
self._revision = None
349
50
self._branch = branch
350
51
351
self.update_tags()
352
353
self.set_file_id(None)
354
355
def do_get_property(self, property):
356
if property.name == 'branch':
357
return self._branch
358
elif property.name == 'revision':
359
return self._revision
360
elif property.name == 'children':
361
return self._children
362
elif property.name == 'file-id':
363
return self._file_id
364
else:
365
raise AttributeError, 'unknown property %s' % property.name
366
367
def do_set_property(self, property, value):
368
if property.name == 'branch':
369
self._branch = value
370
elif property.name == 'revision':
371
self._set_revision(value)
372
elif property.name == 'children':
373
self.set_children(value)
374
elif property.name == 'file-id':
375
self._file_id = value
376
else:
377
raise AttributeError, 'unknown property %s' % property.name
52
if revision is not None:
53
self.set_revision(revision, tags=tags)
378
54
379
55
def set_show_callback(self, callback):
380
56
self._show_callback = callback
381
57
382
def set_file_id(self, file_id):
383
"""Set a specific file id that we want to track.
384
385
This just effects the display of a per-file commit message.
386
If it is set to None, then all commit messages will be shown.
387
"""
388
self.set_property('file-id', file_id)
389
390
def set_revision(self, revision):
391
if revision != self._revision:
392
self.set_property('revision', revision)
393
394
def get_revision(self):
395
return self.get_property('revision')
396
397
def _set_revision(self, revision):
398
if revision is None: return
399
58
def set_go_callback(self, callback):
59
self._go_callback = callback
60
61
def set_revision(self, revision, tags=[], children=[]):
400
62
self._revision = revision
63
self.revision_id.set_text(revision.revision_id)
401
64
if revision.committer is not None:
402
65
self.committer.set_text(revision.committer)
403
66
else:
414
77
if revision.timestamp is not None:
415
78
self.timestamp.set_text(format_date(revision.timestamp,
416
79
revision.timezone))
80
self.message_buffer.set_text(revision.message)
417
81
try:
418
82
self.branchnick_label.set_text(revision.properties['branch-nick'])
419
83
except KeyError:
423
87
self.parents_widgets,
424
88
self.parents_table)
425
89
426
file_info = revision.properties.get('file-info', None)
427
if file_info is not None:
428
file_info = bdecode(file_info.encode('UTF-8'))
429
430
if file_info:
431
if self._file_id is None:
432
text = []
433
for fi in file_info:
434
text.append('%(path)s\n%(message)s' % fi)
435
self.file_info_buffer.set_text('\n'.join(text))
436
self.file_info_box.show()
437
else:
438
text = []
439
for fi in file_info:
440
if fi['file_id'] == self._file_id:
441
text.append(fi['message'])
442
if text:
443
self.file_info_buffer.set_text('\n'.join(text))
444
self.file_info_box.show()
445
else:
446
self.file_info_box.hide()
447
else:
448
self.file_info_box.hide()
449
450
def update_tags(self):
451
if self._branch is not None and self._branch.supports_tags():
452
self._tagdict = self._branch.tags.get_reverse_tag_dict()
453
else:
454
self._tagdict = {}
455
456
self._add_tags()
457
458
def _update_signature(self, widget, param):
459
if self.get_current_page() == PAGE_SIGNATURE:
460
self.signature_table.set_revision(self._revision)
461
462
def _update_bugs(self, widget, param):
463
self.bugs_page.set_revision(self._revision)
464
label = self.get_tab_label(self.bugs_page)
465
label.set_sensitive(self.bugs_page.get_num_bugs() != 0)
466
467
def set_children(self, children):
468
self._add_parents_or_children(children,
469
self.children_widgets,
470
self.children_table)
471
472
def _switch_page_cb(self, notebook, page, page_num):
473
if page_num == PAGE_SIGNATURE:
474
self.signature_table.set_revision(self._revision)
475
476
90
if self.show_children:
91
self._add_parents_or_children(children,
92
self.children_widgets,
93
self.children_table)
94
95
self._add_tags(tags)
96
self._set_diff()
97
98
def _set_diff(self):
99
parentid = self._revision.parent_ids[0]
100
revid = self._revision.revision_id
101
102
(parent_tree, rev_tree) = self._branch.repository.revision_trees([parentid,
103
revid])
104
105
s = StringIO()
106
show_diff_trees(parent_tree, rev_tree, s, None)
107
self.diff_buffer.set_text(s.getvalue().decode(sys.getdefaultencoding(), 'replace'))
477
108
478
109
def _show_clicked_cb(self, widget, revid, parentid):
479
110
"""Callback for when the show button for a parent is clicked."""
481
112
482
113
def _go_clicked_cb(self, widget, revid):
483
114
"""Callback for when the go button for a parent is clicked."""
484
485
def _add_tags(self, *args):
486
if self._revision is None:
487
return
488
489
if self._tagdict.has_key(self._revision.revision_id):
490
tags = self._tagdict[self._revision.revision_id]
491
else:
492
tags = []
493
115
self._go_callback(revid)
116
117
def _add_tags(self, tags):
494
118
if tags == []:
495
119
self.tags_list.hide()
496
120
self.tags_label.hide()
497
121
return
498
122
499
self.tags_list.set_text(", ".join(tags))
500
123
for widget in self.tags_widgets:
124
self.tags_list.remove(widget)
125
126
self.tags_widgets = []
127
128
for tag in tags:
129
widget = gtk.Label(tag)
130
widget.set_selectable(True)
131
self.tags_widgets.append(widget)
132
self.tags_list.add(widget)
501
133
self.tags_list.show_all()
502
134
self.tags_label.show_all()
503
135
532
164
hbox.pack_start(button, expand=False, fill=True)
533
165
button.show()
534
166
535
button = gtk.Button(revid)
536
button.connect("clicked",
537
lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
167
if self._go_callback is not None:
168
button = gtk.Button(revid)
169
button.connect("clicked", self._go_clicked_cb, revid)
170
else:
171
button = gtk.Label(revid)
538
172
button.set_use_underline(False)
539
173
hbox.pack_start(button, expand=False, fill=True)
540
174
button.show()
551
185
vbox = gtk.VBox(False, 6)
552
186
vbox.set_border_width(6)
553
187
vbox.pack_start(self._create_parents(), expand=False, fill=True)
554
vbox.pack_start(self._create_children(), expand=False, fill=True)
188
if self.show_children:
189
vbox.pack_start(self._create_children(), expand=False, fill=True)
555
190
self.append_page(vbox, tab_label=gtk.Label("Relations"))
556
191
vbox.show()
557
192
558
def _create_signature(self):
559
self.signature_table = SignatureTab(self._repository)
560
self.append_page(self.signature_table, tab_label=gtk.Label('Signature'))
561
self.connect_after('notify::revision', self._update_signature)
562
193
def _create_changes(self):
194
slm = gtksourceview.SourceLanguagesManager()
195
196
self.diff_buffer = gtksourceview.SourceBuffer()
197
self.diff_buffer.set_language(slm.get_language_from_mime_type("text/x-patch"))
198
self.diff_buffer.set_highlight(True)
199
200
sourceview = gtksourceview.SourceView(self.diff_buffer)
201
sourceview.set_editable(False)
202
sourceview.modify_font(pango.FontDescription("Monospace"))
203
204
sourceview.show()
205
206
win = gtk.ScrolledWindow()
207
win.add(sourceview)
208
209
self.append_page(win, tab_label=gtk.Label("Changes"))
210
win.show()
211
563
212
def _create_headers(self):
564
213
self.table = gtk.Table(rows=5, columns=2)
565
214
self.table.set_row_spacings(6)
575
224
label.show()
576
225
577
226
align = gtk.Alignment(0.0, 0.5)
578
revision_id = gtk.Label()
579
revision_id.set_selectable(True)
580
self.connect('notify::revision',
581
lambda w, p: revision_id.set_text(self._revision.revision_id))
582
align.add(revision_id)
227
self.revision_id = gtk.Label()
228
self.revision_id.set_selectable(True)
229
align.add(self.revision_id)
583
230
self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
584
231
align.show()
585
revision_id.show()
232
self.revision_id.show()
586
233
587
234
align = gtk.Alignment(1.0, 0.5)
588
235
self.author_label = gtk.Label()
658
305
self.tags_label.show()
659
306
660
307
align = gtk.Alignment(0.0, 0.5)
661
self.tags_list = gtk.Label()
308
self.tags_list = gtk.VBox()
662
309
align.add(self.tags_list)
663
310
self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
664
311
align.show()
665
312
self.tags_list.show()
666
667
self.connect('notify::revision', self._add_tags)
313
self.tags_widgets = []
668
314
669
315
return self.table
316
670
317
671
318
def _create_parents(self):
672
319
hbox = gtk.HBox(True, 3)
703
350
align.show()
704
351
705
352
return table
353
354
706
355
707
356
def _create_message_view(self):
708
msg_buffer = gtk.TextBuffer()
709
self.connect('notify::revision',
710
lambda w, p: msg_buffer.set_text(self._revision.message))
357
self.message_buffer = gtk.TextBuffer()
711
358
window = gtk.ScrolledWindow()
712
359
window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
713
360
window.set_shadow_type(gtk.SHADOW_IN)
714
tv = gtk.TextView(msg_buffer)
361
tv = gtk.TextView(self.message_buffer)
715
362
tv.set_editable(False)
716
363
tv.set_wrap_mode(gtk.WRAP_WORD)
717
718
364
tv.modify_font(pango.FontDescription("Monospace"))
719
365
tv.show()
720
366
window.add(tv)
721
367
window.show()
722
368
return window
723
369
724
def _create_bugs(self):
725
self.bugs_page = BugsTab()
726
self.connect_after('notify::revision', self._update_bugs)
727
self.append_page(self.bugs_page, tab_label=gtk.Label('Bugs'))
728
729
def _create_file_info_view(self):
730
self.file_info_box = gtk.VBox(False, 6)
731
self.file_info_box.set_border_width(6)
732
self.file_info_buffer = gtk.TextBuffer()
733
window = gtk.ScrolledWindow()
734
window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
735
window.set_shadow_type(gtk.SHADOW_IN)
736
tv = gtk.TextView(self.file_info_buffer)
737
tv.set_editable(False)
738
tv.set_wrap_mode(gtk.WRAP_WORD)
739
tv.modify_font(pango.FontDescription("Monospace"))
740
tv.show()
741
window.add(tv)
742
window.show()
743
self.file_info_box.pack_start(window)
744
self.file_info_box.hide() # Only shown when there are per-file messages
745
self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
746
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0