← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Arnaud Jeansen
  • Date: 2010-03-19 23:30:42 UTC
  • mto: This revision was merged to the branch mainline in revision 5126.
  • Revision ID: arnaud.jeansen@gmail.com-20100319233042-o8sjknf212u8spyb
Add a unified report_delta method

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
1518
1518
        to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
1519
1519
        if revision.delta is not None:
1520
1520
            # Use the standard status output to display changes
1521
 
            from bzrlib.delta import report_long
1522
 
            report_long(to_file, revision.delta, show_ids=self.show_ids,
1523
 
                          indent=indent)
 
1521
            from bzrlib.delta import report_delta
 
1522
            report_delta(to_file, revision.delta, short_status=False, 
 
1523
                         show_ids=self.show_ids, indent=indent)
1524
1524
        if revision.diff is not None:
1525
1525
            to_file.write(indent + 'diff:\n')
1526
1526
            to_file.flush()
1590
1590
 
1591
1591
        if revision.delta is not None:
1592
1592
            # Use the standard status output to display changes
1593
 
            from bzrlib.delta import report_short
1594
 
            report_short(to_file, revision.delta, show_ids=self.show_ids,
1595
 
                          indent=indent + offset)
 
1593
            from bzrlib.delta import report_delta
 
1594
            report_delta(to_file, revision.delta, short_status=True, 
 
1595
                         show_ids=self.show_ids, indent=indent + offset)
1596
1596
        if revision.diff is not None:
1597
1597
            self.show_diff(self.to_exact_file, revision.diff, '      ')
1598
1598
        to_file.write('\n')