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 492
- compare with another revision
- download diff
- download tarball
- view history from revision 492
- Committer: Aaron Bentley
- Date: 2008-05-22 02:33:40 UTC
- mfrom: (487.2.8 save-patch)
- Revision ID: aaron@aaronbentley.com-20080522023340-3x585s8593j6a409
Allow saving from patch window, refactoring, testing.
- files added:
- olive.glade
- files removed:
- bzr-notify
- files renamed:
- bzr-handle-patch => handle-patch
- files modified:
- .bzrignore
added
removed
revisionview.py
20
20
import gtk
21
21
import pango
22
22
import gobject
23
import webbrowser
23
import subprocess
24
24
25
from bzrlib import trace
25
from bzrlib.plugins.gtk import icon_path
26
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
33
from bzrlib.plugins.gtk import icon_path
27
from bzrlib.util.bencode import bdecode
34
28
35
29
try:
36
30
from bzrlib.plugins.gtk import seahorse
44
38
PAGE_SIGNATURE = 2
45
39
PAGE_BUGS = 3
46
40
47
48
41
def _open_link(widget, uri):
49
for cmd in ['sensible-browser', 'xdg-open']:
50
if webbrowser._iscommand(cmd):
51
webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
52
webbrowser.open(uri)
42
subprocess.Popen(['sensible-browser', uri], close_fds=True)
53
43
54
44
gtk.link_button_set_uri_hook(_open_link)
55
45
226
216
"This revision has not been signed.")
227
217
228
218
def show_signature(self, 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
219
key = seahorse.verify(crypttext)
240
220
241
221
if key and key.is_available():
242
222
if key.is_trusted():
338
318
self._create_general()
339
319
self._create_relations()
340
320
# Disabled because testaments aren't verified yet:
341
if has_seahorse:
342
self._create_signature()
321
# if has_seahorse:
322
# self._create_signature()
343
323
self._create_file_info_view()
344
324
self._create_bugs()
345
325
419
399
self.timestamp.set_text(format_date(revision.timestamp,
420
400
revision.timezone))
421
401
try:
422
self.branchnick.show()
423
self.branchnick_label.show()
424
self.branchnick.set_text(revision.properties['branch-nick'])
402
self.branchnick_label.set_text(revision.properties['branch-nick'])
425
403
except KeyError:
426
self.branchnick.hide()
427
self.branchnick_label.hide()
404
self.branchnick_label.set_text("")
428
405
429
406
self._add_parents_or_children(revision.parent_ids,
430
407
self.parents_widgets,
431
408
self.parents_table)
432
409
433
410
file_info = revision.properties.get('file-info', None)
434
411
if file_info is not None:
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
412
file_info = bdecode(file_info.encode('UTF-8'))
441
413
442
414
if file_info:
443
415
if self._file_id is None:
521
493
table.resize(max(len(revids), 1), 2)
522
494
523
495
for idx, revid in enumerate(revids):
524
align = gtk.Alignment(0.0, 0.0, 1, 1)
496
align = gtk.Alignment(0.0, 0.0)
525
497
widgets.append(align)
526
498
table.attach(align, 1, 2, idx, idx + 1,
527
499
gtk.EXPAND | gtk.FILL, gtk.FILL)
544
516
hbox.pack_start(button, expand=False, fill=True)
545
517
button.show()
546
518
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)
519
button = gtk.Button(revid)
552
520
button.connect("clicked",
553
521
lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
554
522
button.set_use_underline(False)
555
hbox.pack_start(button, expand=True, fill=True)
556
button.show_all()
523
hbox.pack_start(button, expand=False, fill=True)
524
button.show()
557
525
558
526
def _create_general(self):
559
527
vbox = gtk.VBox(False, 6)
582
550
self.table.set_col_spacings(6)
583
551
self.table.show()
584
552
585
row = 0
586
553
align = gtk.Alignment(1.0, 0.5)
587
554
label = gtk.Label()
588
label.set_alignment(1.0, 0.5)
589
555
label.set_markup("<b>Revision Id:</b>")
590
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
556
align.add(label)
557
self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
558
align.show()
591
559
label.show()
592
560
561
align = gtk.Alignment(0.0, 0.5)
593
562
revision_id = gtk.Label()
594
revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
595
revision_id.set_alignment(0.0, 0.5)
596
563
revision_id.set_selectable(True)
597
564
self.connect('notify::revision',
598
565
lambda w, p: revision_id.set_text(self._revision.revision_id))
599
self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
566
align.add(revision_id)
567
self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
568
align.show()
600
569
revision_id.show()
601
570
602
row += 1
571
align = gtk.Alignment(1.0, 0.5)
603
572
self.author_label = gtk.Label()
604
self.author_label.set_alignment(1.0, 0.5)
605
573
self.author_label.set_markup("<b>Author:</b>")
606
self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
574
align.add(self.author_label)
575
self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
576
align.show()
607
577
self.author_label.show()
608
578
579
align = gtk.Alignment(0.0, 0.5)
609
580
self.author = gtk.Label()
610
self.author.set_ellipsize(pango.ELLIPSIZE_END)
611
self.author.set_alignment(0.0, 0.5)
612
581
self.author.set_selectable(True)
613
self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
582
align.add(self.author)
583
self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
584
align.show()
614
585
self.author.show()
615
586
self.author.hide()
616
587
617
row += 1
588
align = gtk.Alignment(1.0, 0.5)
618
589
label = gtk.Label()
619
label.set_alignment(1.0, 0.5)
620
590
label.set_markup("<b>Committer:</b>")
621
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
591
align.add(label)
592
self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
593
align.show()
622
594
label.show()
623
595
596
align = gtk.Alignment(0.0, 0.5)
624
597
self.committer = gtk.Label()
625
self.committer.set_ellipsize(pango.ELLIPSIZE_END)
626
self.committer.set_alignment(0.0, 0.5)
627
598
self.committer.set_selectable(True)
628
self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
599
align.add(self.committer)
600
self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
601
align.show()
629
602
self.committer.show()
630
603
631
row += 1
604
align = gtk.Alignment(0.0, 0.5)
605
label = gtk.Label()
606
label.set_markup("<b>Branch nick:</b>")
607
align.add(label)
608
self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
609
label.show()
610
align.show()
611
612
align = gtk.Alignment(0.0, 0.5)
632
613
self.branchnick_label = gtk.Label()
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)
614
self.branchnick_label.set_selectable(True)
615
align.add(self.branchnick_label)
616
self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
636
617
self.branchnick_label.show()
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
618
align.show()
619
620
align = gtk.Alignment(1.0, 0.5)
646
621
label = gtk.Label()
647
label.set_alignment(1.0, 0.5)
648
622
label.set_markup("<b>Timestamp:</b>")
649
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
623
align.add(label)
624
self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
625
align.show()
650
626
label.show()
651
627
628
align = gtk.Alignment(0.0, 0.5)
652
629
self.timestamp = gtk.Label()
653
self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
654
self.timestamp.set_alignment(0.0, 0.5)
655
630
self.timestamp.set_selectable(True)
656
self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
631
align.add(self.timestamp)
632
self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
633
align.show()
657
634
self.timestamp.show()
658
635
659
row += 1
636
align = gtk.Alignment(1.0, 0.5)
660
637
self.tags_label = gtk.Label()
661
self.tags_label.set_alignment(1.0, 0.5)
662
638
self.tags_label.set_markup("<b>Tags:</b>")
663
self.table.attach(self.tags_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
639
align.add(self.tags_label)
640
align.show()
641
self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
664
642
self.tags_label.show()
665
643
644
align = gtk.Alignment(0.0, 0.5)
666
645
self.tags_list = gtk.Label()
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)
646
align.add(self.tags_list)
647
self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
648
align.show()
670
649
self.tags_list.show()
671
650
672
651
self.connect('notify::revision', self._add_tags)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0