ttygroup/boartty
Code Issues Proposed changes

Merge "Only decode email if already encoded"

Browse Source
This commit is contained in:
Jenkins 2015-01-23 01:33:26 +00:00 committed by Gerrit Code Review
commit 5ee441fe8e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gertty/gitrepo.py
View File

@ -83,12 +83,18 @@ class CommitContext(object):
commit.authored_date, commit.author_tz_offset)
commit_date = self.decorateGitTime(
commit.committed_date, commit.committer_tz_offset)
if type(author.email) is unicode:
author_email = author.email
else:
author_email = unicode(author.email, 'utf8')
if type(committer.email) is unicode:
committer_email = committer.email
else:
committer_email = unicode(committer.email, 'utf8')
return [u"Parent: %s\n" % parentsha,
u"Author: %s <%s>\n" % (author.name,
unicode(author.email, 'utf8')),
u"Author: %s <%s>\n" % (author.name, author_email),
u"AuthorDate: %s\n" % author_date,
u"Commit: %s <%s>\n" % (committer.name,
unicode(committer.email, 'utf')),
u"Commit: %s <%s>\n" % (committer.name, committer_email),
u"CommitDate: %s\n" % commit_date,
u"\n"] + commit.message.splitlines(True)