← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Lukáš Lalinsky
  • Date: 2007-08-16 18:50:22 UTC
  • mto: (2755.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2757.
  • Revision ID: lalinsky@gmail.com-20070816185022-nra7t01mk81d47rm
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
593
593
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
594
594
 
595
595
    def short_author(self, rev):
596
 
        return re.sub('<.*@.*>', '', rev.get_author()).strip(' ')
 
596
        return re.sub('<.*@.*>', '', rev.get_apparent_author()).strip(' ')
597
597
 
598
598
 
599
599
class LongLogFormatter(LogFormatter):
628
628
            for parent_id in revision.rev.parent_ids:
629
629
                print >>to_file, indent + 'parent:', parent_id
630
630
 
631
 
        author = revision.rev.get_author()
632
 
        print >>to_file, indent + 'author:', author
633
 
        if revision.rev.committer != author:
634
 
            print >>to_file, indent + 'committer:', revision.rev.committer
 
631
        author = revision.rev.properties.get('author', None)
 
632
        if author is not None:
 
633
            print >>to_file, indent + 'author:', author
 
634
        print >>to_file, indent + 'committer:', revision.rev.committer
635
635
 
636
636
        branch_nick = revision.rev.properties.get('branch-nick', None)
637
637
        if branch_nick is not None: