← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-10-05 00:14:36 UTC
  • mfrom: (2055.2.2 lockdir-no-email)
  • Revision ID: pqm@pqm.ubuntu.com-20061005001436-917ac78b08565d62
(John Meinel) don't require a valid email for LockDir

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)