/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-28 13:55:39 UTC
  • mfrom: (5995 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5996.
  • Revision ID: mbp@canonical.com-20110628135539-6541falwx39fl46i
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
104
104
        # bugfixes etc.
105
105
        current_rev = Revision(CURRENT_REVISION)
106
106
        current_rev.parent_ids = tree.get_parent_ids()
107
 
        current_rev.committer = branch.get_config().username()
 
107
        try:
 
108
            current_rev.committer = branch.get_config().username()
 
109
        except errors.NoWhoami:
 
110
            current_rev.committer = 'local user'
108
111
        current_rev.message = "?"
109
112
        current_rev.timestamp = round(time.time(), 3)
110
113
        current_rev.timezone = osutils.local_time_offset()