~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/diff.py

(robertc) Improve the testing of InterTree.iter_changes and fix bugs
found as a result (Robert Collins, Aaron Bentley)

added added

removed removed

874

return path.encode(self.path_encoding, "replace")

875

for (file_id, paths, changed_content, versioned, parent, name, kind,

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])