← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: John Arbash Meinel
  • Date: 2007-05-08 20:10:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2503.
  • Revision ID: john@arbash-meinel.com-20070508201017-w968czcnrzvjttze
Add [merge] after the timestamp for revisions with merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
480
480
        to_file = self.to_file
481
481
        date_str = format_date(rev.timestamp, rev.timezone or 0,
482
482
                            self.show_timezone)
483
 
        print >>to_file, "%5s %s\t%s" % (revno, self.short_committer(rev),
 
483
        is_merge = ''
 
484
        if len(rev.parent_ids) > 1:
 
485
            is_merge = ' [merge]'
 
486
        print >>to_file, "%5s %s\t%s%s" % (revno, self.short_committer(rev),
484
487
                format_date(rev.timestamp, rev.timezone or 0,
485
488
                            self.show_timezone, date_fmt="%Y-%m-%d",
486
 
                           show_offset=False))
 
489
                           show_offset=False),
 
490
                           is_merge)
487
491
        if self.show_ids:
488
492
            print >>to_file,  '      revision-id:', rev.revision_id
489
493
        if not rev.message: