/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

  • Committer: Robert Collins
  • Date: 2008-08-14 05:29:02 UTC
  • mto: This revision was merged to the branch mainline in revision 3629.
  • Revision ID: robertc@robertcollins.net-20080814052902-1e5a6qm37sqhs2ji
Change bzrlib.diff.DiffTree.show_diff to skip entries missing in both trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
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])