/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/log.py

  • Committer: Martin Pool
  • Date: 2007-09-03 04:35:49 UTC
  • mfrom: (2778 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2779.
  • Revision ID: mbp@sourcefrog.net-20070903043549-0cfyrgx7z2h8ppks
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
592
592
    def short_committer(self, rev):
593
593
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
594
594
 
 
595
    def short_author(self, rev):
 
596
        return re.sub('<.*@.*>', '', rev.get_apparent_author()).strip(' ')
 
597
 
595
598
 
596
599
class LongLogFormatter(LogFormatter):
597
600
 
624
627
            print >>to_file, indent + 'revision-id:', revision.rev.revision_id
625
628
            for parent_id in revision.rev.parent_ids:
626
629
                print >>to_file, indent + 'parent:', parent_id
627
 
        print >>to_file, indent + 'committer:', revision.rev.committer
628
630
 
629
631
        author = revision.rev.properties.get('author', None)
630
632
        if author is not None:
631
633
            print >>to_file, indent + 'author:', author
 
634
        print >>to_file, indent + 'committer:', revision.rev.committer
632
635
 
633
636
        branch_nick = revision.rev.properties.get('branch-nick', None)
634
637
        if branch_nick is not None:
670
673
        if len(revision.rev.parent_ids) > 1:
671
674
            is_merge = ' [merge]'
672
675
        print >>to_file, "%5s %s\t%s%s" % (revision.revno,
673
 
                self.short_committer(revision.rev),
 
676
                self.short_author(revision.rev),
674
677
                format_date(revision.rev.timestamp,
675
678
                            revision.rev.timezone or 0,
676
679
                            self.show_timezone, date_fmt="%Y-%m-%d",
737
740
        if revno:
738
741
            # show revno only when is not None
739
742
            out.append("%s:" % revno)
740
 
        out.append(self.truncate(self.short_committer(rev), 20))
 
743
        out.append(self.truncate(self.short_author(rev), 20))
741
744
        out.append(self.date_string(rev))
742
745
        out.append(rev.get_summary())
743
746
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)