/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: Jelmer Vernooij
  • Date: 2008-07-31 01:55:07 UTC
  • mto: (580.2.1 gtk.gloom)
  • mto: This revision was merged to the branch mainline in revision 581.
  • Revision ID: jelmer@samba.org-20080731015507-tarukc7r26ud7twu
Avoid making assumptions about a branch being a loom until we've checked.

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
26
25
from bzrlib.osutils import format_date
27
 
try:
28
 
    from bzrlib.bencode import bdecode
29
 
except ImportError:
30
 
    from bzrlib.util.bencode import bdecode
 
26
from bzrlib.util.bencode import bdecode
31
27
from bzrlib.testament import Testament
32
28
 
33
29
from bzrlib.plugins.gtk import icon_path
419
415
            self.timestamp.set_text(format_date(revision.timestamp,
420
416
                                                revision.timezone))
421
417
        try:
422
 
            self.branchnick.show()
423
 
            self.branchnick_label.show()
424
 
            self.branchnick.set_text(revision.properties['branch-nick'])
 
418
            self.branchnick_label.set_text(revision.properties['branch-nick'])
425
419
        except KeyError:
426
 
            self.branchnick.hide()
427
 
            self.branchnick_label.hide()
 
420
            self.branchnick_label.set_text("")
428
421
 
429
422
        self._add_parents_or_children(revision.parent_ids,
430
423
                                      self.parents_widgets,
431
424
                                      self.parents_table)
432
 
 
 
425
        
433
426
        file_info = revision.properties.get('file-info', None)
434
427
        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
 
428
            file_info = bdecode(file_info.encode('UTF-8'))
441
429
 
442
430
        if file_info:
443
431
            if self._file_id is None:
629
617
        self.committer.show()
630
618
 
631
619
        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
 
632
626
        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)
 
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)
636
631
        self.branchnick_label.show()
637
632
 
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
633
        row += 1
646
634
        label = gtk.Label()
647
635
        label.set_alignment(1.0, 0.5)