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
- browse files at revision 654.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 654.1.2
- Committer: Mark Lee
- Date: 2009-07-11 18:39:14 UTC
- mto: This revision was merged to the branch mainline in revision 661.
- Revision ID: bzr@lazymalevolence.com-20090711183914-zuii3et5skiv2njo
Re-ignore credits.pickle.
- files added:
- bzr-notify
- files removed:
- olive.glade
- files modified:
- .bzrignore
added
removed
revisionview.py
22
22
import gobject
23
23
import webbrowser
24
24
25
from bzrlib import trace
26
from bzrlib.osutils import format_date
27
try:
28
from bzrlib.bencode import bdecode
29
except ImportError:
30
from bzrlib.util.bencode import bdecode
31
from bzrlib.testament import Testament
32
25
33
from bzrlib.plugins.gtk import icon_path
26
from bzrlib.osutils import format_date
27
from bzrlib.util.bencode import bdecode
28
34
29
35
try:
30
36
from bzrlib.plugins.gtk import seahorse
220
226
"This revision has not been signed.")
221
227
222
228
def show_signature(self, crypttext):
223
key = seahorse.verify(crypttext)
229
(cleartext, key) = seahorse.verify(crypttext)
230
231
assert cleartext is not None
232
233
inv = self.repository.get_inventory(self.revision.revision_id)
234
expected_testament = Testament(self.revision, inv).as_short_text()
235
if expected_testament != cleartext:
236
self.signature_image.set_from_file(icon_path("sign-bad.png"))
237
self.signature_label.set_markup("<b>Signature does not match repository data</b>\n" +
238
"The signature plaintext is different from the expected testament plaintext.")
239
return
224
240
225
241
if key and key.is_available():
226
242
if key.is_trusted():
322
338
self._create_general()
323
339
self._create_relations()
324
340
# Disabled because testaments aren't verified yet:
325
# if has_seahorse:
326
# self._create_signature()
341
if has_seahorse:
342
self._create_signature()
327
343
self._create_file_info_view()
328
344
self._create_bugs()
329
345
403
419
self.timestamp.set_text(format_date(revision.timestamp,
404
420
revision.timezone))
405
421
try:
406
self.branchnick_label.set_text(revision.properties['branch-nick'])
422
self.branchnick.show()
423
self.branchnick_label.show()
424
self.branchnick.set_text(revision.properties['branch-nick'])
407
425
except KeyError:
408
self.branchnick_label.set_text("")
426
self.branchnick.hide()
427
self.branchnick_label.hide()
409
428
410
429
self._add_parents_or_children(revision.parent_ids,
411
430
self.parents_widgets,
412
431
self.parents_table)
413
432
414
433
file_info = revision.properties.get('file-info', None)
415
434
if file_info is not None:
416
file_info = bdecode(file_info.encode('UTF-8'))
435
try:
436
file_info = bdecode(file_info.encode('UTF-8'))
437
except ValueError:
438
trace.note('Invalid per-file info for revision:%s, value: %r',
439
revision.revision_id, file_info)
440
file_info = None
417
441
418
442
if file_info:
419
443
if self._file_id is None:
497
521
table.resize(max(len(revids), 1), 2)
498
522
499
523
for idx, revid in enumerate(revids):
500
align = gtk.Alignment(0.0, 0.0)
524
align = gtk.Alignment(0.0, 0.0, 1, 1)
501
525
widgets.append(align)
502
526
table.attach(align, 1, 2, idx, idx + 1,
503
527
gtk.EXPAND | gtk.FILL, gtk.FILL)
520
544
hbox.pack_start(button, expand=False, fill=True)
521
545
button.show()
522
546
523
button = gtk.Button(revid)
547
button = gtk.Button()
548
revid_label = gtk.Label(str(revid))
549
revid_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
550
revid_label.set_alignment(0.0, 0.5)
551
button.add(revid_label)
524
552
button.connect("clicked",
525
553
lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
526
554
button.set_use_underline(False)
527
hbox.pack_start(button, expand=False, fill=True)
528
button.show()
555
hbox.pack_start(button, expand=True, fill=True)
556
button.show_all()
529
557
530
558
def _create_general(self):
531
559
vbox = gtk.VBox(False, 6)
554
582
self.table.set_col_spacings(6)
555
583
self.table.show()
556
584
557
align = gtk.Alignment(1.0, 0.5)
585
row = 0
586
558
587
label = gtk.Label()
588
label.set_alignment(1.0, 0.5)
559
589
label.set_markup("<b>Revision Id:</b>")
560
align.add(label)
561
self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
562
align.show()
590
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
563
591
label.show()
564
592
565
align = gtk.Alignment(0.0, 0.5)
566
593
revision_id = gtk.Label()
594
revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
595
revision_id.set_alignment(0.0, 0.5)
567
596
revision_id.set_selectable(True)
568
597
self.connect('notify::revision',
569
598
lambda w, p: revision_id.set_text(self._revision.revision_id))
570
align.add(revision_id)
571
self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
572
align.show()
599
self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
573
600
revision_id.show()
574
601
575
align = gtk.Alignment(1.0, 0.5)
602
row += 1
576
603
self.author_label = gtk.Label()
604
self.author_label.set_alignment(1.0, 0.5)
577
605
self.author_label.set_markup("<b>Author:</b>")
578
align.add(self.author_label)
579
self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
580
align.show()
606
self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
581
607
self.author_label.show()
582
608
583
align = gtk.Alignment(0.0, 0.5)
584
609
self.author = gtk.Label()
610
self.author.set_ellipsize(pango.ELLIPSIZE_END)
611
self.author.set_alignment(0.0, 0.5)
585
612
self.author.set_selectable(True)
586
align.add(self.author)
587
self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
588
align.show()
613
self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
589
614
self.author.show()
590
615
self.author.hide()
591
616
592
align = gtk.Alignment(1.0, 0.5)
617
row += 1
593
618
label = gtk.Label()
619
label.set_alignment(1.0, 0.5)
594
620
label.set_markup("<b>Committer:</b>")
595
align.add(label)
596
self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
597
align.show()
621
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
598
622
label.show()
599
623
600
align = gtk.Alignment(0.0, 0.5)
601
624
self.committer = gtk.Label()
625
self.committer.set_ellipsize(pango.ELLIPSIZE_END)
626
self.committer.set_alignment(0.0, 0.5)
602
627
self.committer.set_selectable(True)
603
align.add(self.committer)
604
self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
605
align.show()
628
self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
606
629
self.committer.show()
607
630
608
align = gtk.Alignment(0.0, 0.5)
609
label = gtk.Label()
610
label.set_markup("<b>Branch nick:</b>")
611
align.add(label)
612
self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
613
label.show()
614
align.show()
615
616
align = gtk.Alignment(0.0, 0.5)
631
row += 1
617
632
self.branchnick_label = gtk.Label()
618
self.branchnick_label.set_selectable(True)
619
align.add(self.branchnick_label)
620
self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
633
self.branchnick_label.set_alignment(1.0, 0.5)
634
self.branchnick_label.set_markup("<b>Branch nick:</b>")
635
self.table.attach(self.branchnick_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
621
636
self.branchnick_label.show()
622
align.show()
623
624
align = gtk.Alignment(1.0, 0.5)
637
638
self.branchnick = gtk.Label()
639
self.branchnick.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
640
self.branchnick.set_alignment(0.0, 0.5)
641
self.branchnick.set_selectable(True)
642
self.table.attach(self.branchnick, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
643
self.branchnick.show()
644
645
row += 1
625
646
label = gtk.Label()
647
label.set_alignment(1.0, 0.5)
626
648
label.set_markup("<b>Timestamp:</b>")
627
align.add(label)
628
self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
629
align.show()
649
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
630
650
label.show()
631
651
632
align = gtk.Alignment(0.0, 0.5)
633
652
self.timestamp = gtk.Label()
653
self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
654
self.timestamp.set_alignment(0.0, 0.5)
634
655
self.timestamp.set_selectable(True)
635
align.add(self.timestamp)
636
self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
637
align.show()
656
self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
638
657
self.timestamp.show()
639
658
640
align = gtk.Alignment(1.0, 0.5)
659
row += 1
641
660
self.tags_label = gtk.Label()
661
self.tags_label.set_alignment(1.0, 0.5)
642
662
self.tags_label.set_markup("<b>Tags:</b>")
643
align.add(self.tags_label)
644
align.show()
645
self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
663
self.table.attach(self.tags_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
646
664
self.tags_label.show()
647
665
648
align = gtk.Alignment(0.0, 0.5)
649
666
self.tags_list = gtk.Label()
650
align.add(self.tags_list)
651
self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
652
align.show()
667
self.tags_list.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
668
self.tags_list.set_alignment(0.0, 0.5)
669
self.table.attach(self.tags_list, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
653
670
self.tags_list.show()
654
671
655
672
self.connect('notify::revision', self._add_tags)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0