/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2006-05-27 04:48:39 UTC
  • mto: (1711.2.26 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1734.
  • Revision ID: john@arbash-meinel.com-20060527044839-83fdd64ce7d708bb
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.

Show diffs side-by-side

added added

removed removed

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