← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2005-10-04 02:54:54 UTC
  • mfrom: (1399.1.12)
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1400.
  • Revision ID: mbp@sourcefrog.net-20051004025454-a8da093aebf1fb24
[merge] refactoring from robert to use different Entry classes
for files, directories, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
209
209
 
210
210
    for path, file_id, kind in delta.removed:
211
211
        print >>to_file, '=== removed %s %r' % (kind, path)
212
 
        if kind == 'file':
213
 
            diff_file(old_label + path,
214
 
                      old_tree.get_file(file_id).readlines(),
215
 
                      DEVNULL, 
216
 
                      [],
217
 
                      to_file)
 
212
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
 
213
                                         DEVNULL, None, None, to_file)
218
214
    for path, file_id, kind in delta.added:
219
215
        print >>to_file, '=== added %s %r' % (kind, path)
220
 
        if kind == 'file':
221
 
            diff_file(DEVNULL,
222
 
                      [],
223
 
                      new_label + path,
224
 
                      new_tree.get_file(file_id).readlines(),
225
 
                      to_file)
 
216
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
 
217
                                         DEVNULL, None, None, to_file, 
 
218
                                         reverse=True)
226
219
    for (old_path, new_path, file_id, kind,
227
220
         text_modified, meta_modified) in delta.renamed:
228
221
        prop_str = get_prop_change(meta_modified)
251
244
                                new_label, new_path, new_tree, text_modified,
252
245
                                kind, to_file, diff_file):
253
246
    if text_modified:
254
 
        if kind == 'file':
255
 
            diff_file(old_label + old_path,
256
 
                      old_tree.get_file(file_id).readlines(),
257
 
                      new_label + new_path,
258
 
                      new_tree.get_file(file_id).readlines(),
259
 
                      to_file)
260
 
        elif kind == 'symlink':
261
 
            _diff_symlink(old_tree, new_tree, file_id, to_file)
262
 
            
263
 
def _diff_symlink(old_tree, new_tree, file_id, to_file):
264
 
    t1 = old_tree.get_symlink_target(file_id)
265
 
    t2 = new_tree.get_symlink_target(file_id)
266
 
    print >>to_file, '=== target changed %r => %r' % (t1, t2)
 
247
        new_entry = new_tree.inventory[file_id]
 
248
        old_tree.inventory[file_id].diff(diff_file,
 
249
                                         old_label + old_path, old_tree,
 
250
                                         new_label + new_path, new_entry, 
 
251
                                         new_tree, to_file)