/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Martin Pool
  • Date: 2011-06-19 02:24:39 UTC
  • mfrom: (5985 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6001.
  • Revision ID: mbp@canonical.com-20110619022439-u68683yb2bw302x0
resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
38
38
from bzrlib import (
39
39
    errors,
40
40
    osutils,
 
41
    i18n,
41
42
    )
42
43
from bzrlib.config import extract_email_address
43
44
from bzrlib.repository import _strip_NULL_ghosts
104
105
        # bugfixes etc.
105
106
        current_rev = Revision(CURRENT_REVISION)
106
107
        current_rev.parent_ids = tree.get_parent_ids()
107
 
        current_rev.committer = branch.get_config().username()
 
108
        try:
 
109
            current_rev.committer = branch.get_config().username()
 
110
        except errors.NoWhoami:
 
111
            current_rev.committer = i18n.gettext("local user")
108
112
        current_rev.message = "?"
109
113
        current_rev.timestamp = round(time.time(), 3)
110
114
        current_rev.timezone = osutils.local_time_offset()