/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

Merge with intertree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
682
682
                 path_encoding='utf-8'):
683
683
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
684
684
        self.command_template = command_template
685
 
        self._root = tempfile.mkdtemp(prefix='bzr-diff-')
 
685
        self._root = osutils.mkdtemp(prefix='bzr-diff-')
686
686
 
687
687
    @classmethod
688
688
    def from_string(klass, command_string, old_tree, new_tree, to_file,
874
874
                return path.encode(self.path_encoding, "replace")
875
875
        for (file_id, paths, changed_content, versioned, parent, name, kind,
876
876
             executable) in sorted(iterator, key=changes_key):
877
 
            if parent == (None, None):
 
877
            # The root does not get diffed, and items with no known kind (that
 
878
            # is, missing) in both trees are skipped as well.
 
879
            if parent == (None, None) or kind == (None, None):
878
880
                continue
879
881
            oldpath, newpath = paths
880
882
            oldpath_encoded = get_encoded_path(paths[0])