← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
930
930
    def _show_diff(self, specific_files, extra_trees):
931
931
        # TODO: Generation of pseudo-diffs for added/deleted files could
932
932
        # be usefully made into a much faster special case.
933
 
        iterator = self.new_tree._iter_changes(self.old_tree,
 
933
        iterator = self.new_tree.iter_changes(self.old_tree,
934
934
                                               specific_files=specific_files,
935
935
                                               extra_trees=extra_trees,
936
936
                                               require_versioned=True)
967
967
                self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
968
968
                    (kind[0], oldpath_encoded, newpath_encoded, prop_str))
969
969
            else:
970
 
                # if it was produced by _iter_changes, it must be
 
970
                # if it was produced by iter_changes, it must be
971
971
                # modified *somehow*, either content or execute bit.
972
972
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
973
973
                                   newpath_encoded, prop_str))