← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/history.py

  • Committer: John Arbash Meinel
  • Date: 2011-03-16 12:39:56 UTC
  • mfrom: (432.2.8 authors-733015)
  • Revision ID: john@arbash-meinel.com-20110316123956-6jherozycdjmt9px
Fix bug #733015. Have a separate Author(s) line from Committer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/history.py
35
35
import textwrap
36
36
import threading
37
37
 
 
38
from bzrlib import tag
38
39
import bzrlib.branch
39
40
import bzrlib.delta
40
41
import bzrlib.errors
679
680
 
680
681
        revtags = None
681
682
        if revision.revision_id in self._branch_tags:
682
 
          revtags = ', '.join(self._branch_tags[revision.revision_id])
 
683
          # tag.sort_* functions expect (tag, data) pairs, so we generate them,
 
684
          # and then strip them
 
685
          tags = [(t, None) for t in self._branch_tags[revision.revision_id]]
 
686
          tag.sort_natural(self._branch, tags)
 
687
          revtags = u', '.join([t[0] for t in tags])
683
688
 
684
689
        entry = {
685
690
            'revid': revision.revision_id,
686
691
            'date': datetime.datetime.fromtimestamp(revision.timestamp),
687
692
            'utc_date': datetime.datetime.utcfromtimestamp(revision.timestamp),
 
693
            'committer': revision.committer,
688
694
            'authors': revision.get_apparent_authors(),
689
695
            'branch_nick': revision.properties.get('branch-nick', None),
690
696
            'short_comment': short_message,