← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: ghigo
  • Date: 2007-08-17 18:00:34 UTC
  • mto: (2772.1.1 show-diff)
  • mto: This revision was merged to the branch mainline in revision 2773.
  • Revision ID: ghigo@venice-20070817180034-v2ypd6dz2nbh515i
small cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
411
411
    has_changes = 0
412
412
    for path, file_id, kind in delta.removed:
413
413
        has_changes = 1
414
 
        print >>to_file, "=== removed %s '%s'" % (kind,
415
 
                                                  path.encode(path_encoding,
416
 
                                                              "replace"))
 
414
        path_ = path.encode(path_encoding, "replace")
 
415
        print >>to_file, "=== removed %s '%s'" % (kind, path_)
417
416
        old_name = '%s%s\t%s' % (old_label, path,
418
417
                                 _patch_header_date(old_tree, file_id, path))
419
418
        new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
450
449
        has_changes = 1
451
450
        prop_str = get_prop_change(meta_modified)
452
451
        path_ = path.encode(path_encoding, "replace"),
453
 
        print >>to_file, "=== modified %s '%s'%s" % (kind, path_,
454
 
                                                     prop_str)
 
452
        print >>to_file, "=== modified %s '%s'%s" % (kind, path_, prop_str)
455
453
        # The file may be in a different location in the old tree (because
456
454
        # the containing dir was renamed, but the file itself was not)
457
455
        old_path = old_tree.id2path(file_id)