← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-30 08:11:54 UTC
  • mfrom: (2766 +trunk)
  • mto: (2535.3.55 repo-refactor)
  • mto: This revision was merged to the branch mainline in revision 2772.
  • Revision ID: andrew.bennetts@canonical.com-20070830081154-16hebp2xwr15x2hc
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
99
99
def _annotate_file(branch, rev_id, file_id):
100
100
    """Yield the origins for each line of a file.
101
101
 
102
 
    This includes detailed information, such as the committer name, and
 
102
    This includes detailed information, such as the author name, and
103
103
    date string for the commit, rather than just the revision id.
104
104
    """
105
105
    revision_id_to_revno = branch.get_revision_id_to_revno_map()
129
129
                                     time.gmtime(rev.timestamp + tz))
130
130
            # a lazy way to get something like the email address
131
131
            # TODO: Get real email address
132
 
            author = rev.committer
 
132
            author = rev.get_apparent_author()
133
133
            try:
134
134
                author = extract_email_address(author)
135
135
            except errors.NoEmailInUsername: