← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-16 01:25:46 UTC
  • mfrom: (2071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061016012546-d01a0740671b4d73
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
29
29
import time
30
30
 
31
31
from bzrlib.config import extract_email_address
32
 
from bzrlib.errors import BzrError
 
32
from bzrlib.errors import NoEmailInUsername
33
33
 
34
34
 
35
35
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
81
81
            author = rev.committer
82
82
            try:
83
83
                author = extract_email_address(author)
84
 
            except BzrError:
 
84
            except NoEmailInUsername:
85
85
                pass        # use the whole name
86
86
        yield (revno_str, author, date_str, origin, text)