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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-12 08:47:57 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180712084757-ejkmd46me9u04ie1
Predictable tag order.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/log.py
306
306
            else:
307
307
                match['message'] = [message_search]
308
308
        else:
309
 
            match={ 'message': [message_search] }
 
309
            match= {'message': [message_search]}
310
310
    return {
311
311
        'direction': direction,
312
312
        'specific_fileids': specific_fileids,
1583
1583
            lines.append('revno: %s%s' % (revision.revno,
1584
1584
                self.merge_marker(revision)))
1585
1585
        if revision.tags:
1586
 
            lines.append('tags: %s' % (', '.join(revision.tags)))
 
1586
            lines.append('tags: %s' % (', '.join(sorted(revision.tags))))
1587
1587
        if self.show_ids or revision.revno is None:
1588
1588
            lines.append('revision-id: %s' % (revision.rev.revision_id,))
1589
1589
        if self.show_ids:
1670
1670
        to_file = self.to_file
1671
1671
        tags = ''
1672
1672
        if revision.tags:
1673
 
            tags = ' {%s}' % (', '.join(revision.tags))
 
1673
            tags = ' {%s}' % (', '.join(sorted(revision.tags)))
1674
1674
        to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1675
1675
                revision.revno or "", self.short_author(revision.rev),
1676
1676
                format_date(revision.rev.timestamp,
1759
1759
        if len(rev.parent_ids) > 1:
1760
1760
            out.append('[merge]')
1761
1761
        if tags:
1762
 
            tag_str = '{%s}' % (', '.join(tags))
 
1762
            tag_str = '{%s}' % (', '.join(sorted(tags)))
1763
1763
            out.append(tag_str)
1764
1764
        out.append(rev.get_summary())
1765
1765
        return self.truncate(prefix + " ".join(out).rstrip('\n'), max_chars)