← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
16
16
 
17
17
"""File annotate based on weave storage"""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
# TODO: Choice of more or less verbose formats:
20
22
#
21
23
# interposed: show more details between blocks of modified lines
105
107
        current_rev = Revision(CURRENT_REVISION)
106
108
        current_rev.parent_ids = tree.get_parent_ids()
107
109
        try:
108
 
            current_rev.committer = branch.get_config().username()
 
110
            current_rev.committer = branch.get_config_stack().get('email')
109
111
        except errors.NoWhoami:
110
112
            current_rev.committer = 'local user'
111
113
        current_rev.message = "?"