← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Ian Clatworthy
  • Date: 2009-05-22 08:05:17 UTC
  • mto: (4385.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4390.
  • Revision ID: ian.clatworthy@canonical.com-20090522080517-862cs0on3nj49973
faster diff on large trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
882
882
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
883
883
                                   newpath_encoded, prop_str))
884
884
            if changed_content:
885
 
                self.diff(file_id, oldpath, newpath)
 
885
                self._diff(file_id, oldpath, newpath, kind[0], kind[1])
886
886
                has_changes = 1
887
887
            if renamed:
888
888
                has_changes = 1
903
903
            new_kind = self.new_tree.kind(file_id)
904
904
        except (errors.NoSuchId, errors.NoSuchFile):
905
905
            new_kind = None
906
 
 
 
906
        self._diff(file_id, old_path, new_path, old_kind, new_kind)
 
907
 
 
908
 
 
909
    def _diff(self, file_id, old_path, new_path, old_kind, new_kind):
907
910
        result = DiffPath._diff_many(self.differs, file_id, old_path,
908
911
                                       new_path, old_kind, new_kind)
909
912
        if result is DiffPath.CANNOT_DIFF: