/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: 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionview.py
22
22
import gobject
23
23
import webbrowser
24
24
 
 
25
from bzrlib import trace
25
26
from bzrlib.osutils import format_date
26
 
from bzrlib.util.bencode import bdecode
 
27
try:
 
28
    from bzrlib.bencode import bdecode
 
29
except ImportError:
 
30
    from bzrlib.util.bencode import bdecode
27
31
from bzrlib.testament import Testament
28
32
 
29
33
from bzrlib.plugins.gtk import icon_path
415
419
            self.timestamp.set_text(format_date(revision.timestamp,
416
420
                                                revision.timezone))
417
421
        try:
418
 
            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'])
419
425
        except KeyError:
420
 
            self.branchnick_label.set_text("")
 
426
            self.branchnick.hide()
 
427
            self.branchnick_label.hide()
421
428
 
422
429
        self._add_parents_or_children(revision.parent_ids,
423
430
                                      self.parents_widgets,
424
431
                                      self.parents_table)
425
 
        
 
432
 
426
433
        file_info = revision.properties.get('file-info', None)
427
434
        if file_info is not None:
428
 
            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
429
441
 
430
442
        if file_info:
431
443
            if self._file_id is None:
617
629
        self.committer.show()
618
630
 
619
631
        row += 1
620
 
        label = gtk.Label()
621
 
        label.set_alignment(1.0, 0.5)
622
 
        label.set_markup("<b>Branch nick:</b>")
623
 
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
624
 
        label.show()
625
 
 
626
632
        self.branchnick_label = gtk.Label()
627
 
        self.branchnick_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
628
 
        self.branchnick_label.set_alignment(0.0, 0.5)
629
 
        self.branchnick_label.set_selectable(True)
630
 
        self.table.attach(self.branchnick_label, 1, 2, row, row+1, 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)
631
636
        self.branchnick_label.show()
632
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
 
633
645
        row += 1
634
646
        label = gtk.Label()
635
647
        label.set_alignment(1.0, 0.5)