~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Martin Pool
  • Date: 2011-06-28 17:25:26 UTC
  • mfrom: (5999 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6001.
  • Revision ID: mbp@canonical.com-20110628172526-10cok2s17dvw7x62
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
from bzrlib import (
39
39
    errors,
40
40
    osutils,
41
 
    i18n,
42
41
    )
43
42
from bzrlib.config import extract_email_address
44
43
from bzrlib.repository import _strip_NULL_ghosts
108
107
        try:
109
108
            current_rev.committer = branch.get_config().username()
110
109
        except errors.NoWhoami:
111
 
            current_rev.committer = i18n.gettext("local user")
 
110
            current_rev.committer = 'local user'
112
111
        current_rev.message = "?"
113
112
        current_rev.timestamp = round(time.time(), 3)
114
113
        current_rev.timezone = osutils.local_time_offset()