← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Aaron Bentley
  • Date: 2006-06-03 16:23:09 UTC
  • mfrom: (1736 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060603162309-c975ca9ea9fea344
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
290
290
    has_changes = 0
291
291
    for path, file_id, kind in delta.removed:
292
292
        has_changes = 1
293
 
        print >>to_file, '=== removed %s %r' % (kind, path)
 
293
        print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
294
294
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
295
295
                                         DEVNULL, None, None, to_file)
296
296
    for path, file_id, kind in delta.added:
297
297
        has_changes = 1
298
 
        print >>to_file, '=== added %s %r' % (kind, path)
 
298
        print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
299
299
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
300
300
                                         DEVNULL, None, None, to_file, 
301
301
                                         reverse=True)
304
304
        has_changes = 1
305
305
        prop_str = get_prop_change(meta_modified)
306
306
        print >>to_file, '=== renamed %s %r => %r%s' % (
307
 
                    kind, old_path, new_path, prop_str)
 
307
                    kind, old_path.encode('utf8'),
 
308
                    new_path.encode('utf8'), prop_str)
308
309
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
309
310
                                    new_label, new_path, new_tree,
310
311
                                    text_modified, kind, to_file, diff_file)
311
312
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
312
313
        has_changes = 1
313
314
        prop_str = get_prop_change(meta_modified)
314
 
        print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
 
315
        print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
315
316
        if text_modified:
316
317
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
317
318
                                        new_label, path, new_tree,