← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Robert Collins
  • Date: 2005-09-07 17:38:00 UTC
  • mto: (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050907173800-5b948f3b9b941a19
bugfix _maybe_diff, the test was not catching the error

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
228
228
        print >>to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
229
229
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
230
230
                                    new_label, new_path, new_tree,
231
 
                                    text_modified, kind, to_file)
 
231
                                    text_modified, kind, to_file, diff_file)
232
232
 
233
233
    for path, file_id, kind in delta.modified:
234
234
        print >>to_file, '*** modified %s %r' % (kind, path)
235
235
        _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
236
236
                                    new_label, path, new_tree,
237
 
                                    True, kind, to_file)
 
237
                                    True, kind, to_file, diff_file)
238
238
 
239
239
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
240
240
                                new_label, new_path, new_tree, text_modified,
241
 
                                kind, to_file):
 
241
                                kind, to_file, diff_file):
242
242
    if text_modified:
243
243
        if kind == 'file':
244
244
            diff_file(old_label + old_path,