/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: Canonical.com Patch Queue Manager
  • Date: 2006-05-05 08:19:49 UTC
  • mfrom: (1694.2.7 bzr.mbp.lockdir)
  • Revision ID: pqm@pqm.ubuntu.com-20060505081949-c953c4dd61f52b81
(mbp,olaf) lockdir and diff improvements

Show diffs side-by-side

added added

removed removed

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