/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 annotate/gannotate.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-08-25 12:52:25 UTC
  • mfrom: (267 trunk)
  • mto: This revision was merged to the branch mainline in revision 268.
  • Revision ID: szilveszter.farkas@gmail.com-20070825125225-qa6281uurldft7iw
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
66
66
        self.revision_id = getattr(tree, 'get_revision_id', 
67
67
                                   lambda: CURRENT_REVISION)()
68
68
        
69
 
        # [revision id, line number, committer, revno, highlight color, line]
 
69
        # [revision id, line number, author, revno, highlight color, line]
70
70
        self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
71
71
                                       gobject.TYPE_STRING,
72
72
                                       gobject.TYPE_STRING,
84
84
                    revno = committer = ""
85
85
                else:
86
86
                    last_seen = revision.revision_id
87
 
                    committer = revision.committer
 
87
                    committer = revision.properties.get('author',
 
88
                        revision.committer)
88
89
 
89
90
                if revision.revision_id not in self.revisions:
90
91
                    self.revisions[revision.revision_id] = revision