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 625.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 625.2.1
- Committer: Jelmer Vernooij
- Date: 2009-01-30 16:03:10 UTC
- mto: (625.1.2 version-check)
- mto: This revision was merged to the branch mainline in revision 628.
- Revision ID: jelmer@samba.org-20090130160310-n1umpj7l5owdd7vn
Move commands to a separate module and register them lazily.
- 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.plugins.gtk import icon_path
25
from bzrlib import trace
26
26
from bzrlib.osutils import format_date
27
27
from bzrlib.util.bencode import bdecode
28
from bzrlib.testament import Testament
29
30
from bzrlib.plugins.gtk import icon_path
28
31
29
32
try:
30
33
from bzrlib.plugins.gtk import seahorse
220
223
"This revision has not been signed.")
221
224
222
225
def show_signature(self, crypttext):
223
key = seahorse.verify(crypttext)
226
(cleartext, key) = seahorse.verify(crypttext)
227
228
assert cleartext is not None
229
230
inv = self.repository.get_inventory(self.revision.revision_id)
231
expected_testament = Testament(self.revision, inv).as_short_text()
232
if expected_testament != cleartext:
233
self.signature_image.set_from_file(icon_path("sign-bad.png"))
234
self.signature_label.set_markup("<b>Signature does not match repository data</b>\n" +
235
"The signature plaintext is different from the expected testament plaintext.")
236
return
224
237
225
238
if key and key.is_available():
226
239
if key.is_trusted():
322
335
self._create_general()
323
336
self._create_relations()
324
337
# Disabled because testaments aren't verified yet:
325
# if has_seahorse:
326
# self._create_signature()
338
if has_seahorse:
339
self._create_signature()
327
340
self._create_file_info_view()
328
341
self._create_bugs()
329
342
410
423
self._add_parents_or_children(revision.parent_ids,
411
424
self.parents_widgets,
412
425
self.parents_table)
413
426
414
427
file_info = revision.properties.get('file-info', None)
415
428
if file_info is not None:
416
file_info = bdecode(file_info.encode('UTF-8'))
429
try:
430
file_info = bdecode(file_info.encode('UTF-8'))
431
except ValueError:
432
trace.note('Invalid per-file info for revision:%s, value: %r',
433
revision.revision_id, file_info)
434
file_info = None
417
435
418
436
if file_info:
419
437
if self._file_id is None:
497
515
table.resize(max(len(revids), 1), 2)
498
516
499
517
for idx, revid in enumerate(revids):
500
align = gtk.Alignment(0.0, 0.0)
518
align = gtk.Alignment(0.0, 0.0, 1, 1)
501
519
widgets.append(align)
502
520
table.attach(align, 1, 2, idx, idx + 1,
503
521
gtk.EXPAND | gtk.FILL, gtk.FILL)
520
538
hbox.pack_start(button, expand=False, fill=True)
521
539
button.show()
522
540
523
button = gtk.Button(revid)
541
button = gtk.Button()
542
revid_label = gtk.Label(str(revid))
543
revid_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
544
revid_label.set_alignment(0.0, 0.5)
545
button.add(revid_label)
524
546
button.connect("clicked",
525
547
lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
526
548
button.set_use_underline(False)
527
hbox.pack_start(button, expand=False, fill=True)
528
button.show()
549
hbox.pack_start(button, expand=True, fill=True)
550
button.show_all()
529
551
530
552
def _create_general(self):
531
553
vbox = gtk.VBox(False, 6)
554
576
self.table.set_col_spacings(6)
555
577
self.table.show()
556
578
557
align = gtk.Alignment(1.0, 0.5)
579
row = 0
580
558
581
label = gtk.Label()
582
label.set_alignment(1.0, 0.5)
559
583
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()
584
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
563
585
label.show()
564
586
565
align = gtk.Alignment(0.0, 0.5)
566
587
revision_id = gtk.Label()
588
revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
589
revision_id.set_alignment(0.0, 0.5)
567
590
revision_id.set_selectable(True)
568
591
self.connect('notify::revision',
569
592
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()
593
self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
573
594
revision_id.show()
574
595
575
align = gtk.Alignment(1.0, 0.5)
596
row += 1
576
597
self.author_label = gtk.Label()
598
self.author_label.set_alignment(1.0, 0.5)
577
599
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()
600
self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
581
601
self.author_label.show()
582
602
583
align = gtk.Alignment(0.0, 0.5)
584
603
self.author = gtk.Label()
604
self.author.set_ellipsize(pango.ELLIPSIZE_END)
605
self.author.set_alignment(0.0, 0.5)
585
606
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()
607
self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
589
608
self.author.show()
590
609
self.author.hide()
591
610
592
align = gtk.Alignment(1.0, 0.5)
611
row += 1
593
612
label = gtk.Label()
613
label.set_alignment(1.0, 0.5)
594
614
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()
615
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
598
616
label.show()
599
617
600
align = gtk.Alignment(0.0, 0.5)
601
618
self.committer = gtk.Label()
619
self.committer.set_ellipsize(pango.ELLIPSIZE_END)
620
self.committer.set_alignment(0.0, 0.5)
602
621
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()
622
self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
606
623
self.committer.show()
607
624
608
align = gtk.Alignment(0.0, 0.5)
625
row += 1
609
626
label = gtk.Label()
627
label.set_alignment(1.0, 0.5)
610
628
label.set_markup("<b>Branch nick:</b>")
611
align.add(label)
612
self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
629
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
613
630
label.show()
614
align.show()
615
631
616
align = gtk.Alignment(0.0, 0.5)
617
632
self.branchnick_label = gtk.Label()
633
self.branchnick_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
634
self.branchnick_label.set_alignment(0.0, 0.5)
618
635
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)
636
self.table.attach(self.branchnick_label, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
621
637
self.branchnick_label.show()
622
align.show()
623
638
624
align = gtk.Alignment(1.0, 0.5)
639
row += 1
625
640
label = gtk.Label()
641
label.set_alignment(1.0, 0.5)
626
642
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()
643
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
630
644
label.show()
631
645
632
align = gtk.Alignment(0.0, 0.5)
633
646
self.timestamp = gtk.Label()
647
self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
648
self.timestamp.set_alignment(0.0, 0.5)
634
649
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()
650
self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
638
651
self.timestamp.show()
639
652
640
align = gtk.Alignment(1.0, 0.5)
653
row += 1
641
654
self.tags_label = gtk.Label()
655
self.tags_label.set_alignment(1.0, 0.5)
642
656
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)
657
self.table.attach(self.tags_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
646
658
self.tags_label.show()
647
659
648
align = gtk.Alignment(0.0, 0.5)
649
660
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()
661
self.tags_list.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
662
self.tags_list.set_alignment(0.0, 0.5)
663
self.table.attach(self.tags_list, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
653
664
self.tags_list.show()
654
665
655
666
self.connect('notify::revision', self._add_tags)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0