← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-10 11:07:10 UTC
  • mfrom: (2485.9.2 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070610110710-2xi9ditvln347qpj
merge after bzr bind (why did I have to do that ?)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
567
567
        from bzrlib.osutils import format_date
568
568
 
569
569
        to_file = self.to_file
570
 
        date_str = format_date(revision.rev.timestamp, 
 
570
        date_str = format_date(revision.rev.timestamp,
571
571
                               revision.rev.timezone or 0,
572
572
                               self.show_timezone)
573
 
        print >>to_file, "%5s %s\t%s" % (revision.revno, 
 
573
        is_merge = ''
 
574
        if len(revision.rev.parent_ids) > 1:
 
575
            is_merge = ' [merge]'
 
576
        print >>to_file, "%5s %s\t%s%s" % (revision.revno,
574
577
                self.short_committer(revision.rev),
575
 
                format_date(revision.rev.timestamp, 
 
578
                format_date(revision.rev.timestamp,
576
579
                            revision.rev.timezone or 0,
577
580
                            self.show_timezone, date_fmt="%Y-%m-%d",
578
 
                            show_offset=False))
 
581
                            show_offset=False),
 
582
                is_merge)
579
583
        if self.show_ids:
580
584
            print >>to_file,  '      revision-id:', revision.rev.revision_id
581
585
        if not revision.rev.message: