~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Martin Pool
  • Date: 2009-03-05 02:15:46 UTC
  • mfrom: (4078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4081.
  • Revision ID: mbp@sourcefrog.net-20090305021546-catovbht4xnwypto
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
1174
1174
        return address
1175
1175
 
1176
1176
    def short_author(self, rev):
1177
 
        name, address = config.parse_username(rev.get_apparent_author())
 
1177
        name, address = config.parse_username(rev.get_apparent_authors()[0])
1178
1178
        if name:
1179
1179
            return name
1180
1180
        return address
1216
1216
                to_file.write(indent + 'parent: %s\n' % (parent_id,))
1217
1217
        self.show_properties(revision.rev, indent)
1218
1218
 
1219
 
        author = revision.rev.properties.get('author', None)
1220
 
        if author is not None:
1221
 
            to_file.write(indent + 'author: %s\n' % (author,))
1222
 
        to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
 
1219
        committer = revision.rev.committer
 
1220
        authors = revision.rev.get_apparent_authors()
 
1221
        if authors != [committer]:
 
1222
            to_file.write(indent + 'author: %s\n' % (", ".join(authors),))
 
1223
        to_file.write(indent + 'committer: %s\n' % (committer,))
1223
1224
 
1224
1225
        branch_nick = revision.rev.properties.get('branch-nick', None)
1225
1226
        if branch_nick is not None: