show_diff_trees writes Unicode if there are Binary files

[John A Meinel]

Currently 'show_diff_trees' is supposed to be defined as writing 8-bit strings to the output file.
For filenames, it always writes utf-8 strings. And for file contents it writes the raw 8-bit content.

However the code path for handling Binary files, just writes the unicode filenames directly to the file.

It should instead encode to utf8 first.

[John A Meinel (jameinel)]

The fix may be as simple as:
=== modified file 'bzrlib/inventory.py'
--- bzrlib/inventory.py 2007-04-04 02:31:25 +0000
+++ bzrlib/inventory.py 2007-04-25 21:15:37 +0000
@@ -665,7 +665,7 @@
                 label_pair = (to_label, from_label)
             else:
                 label_pair = (from_label, to_label)
- print >> output_to, "Binary files %s and %s differ" % label_pair
+ print >> output_to, ("Binary files %s and %s differ" % label_pair).encode('utf8')

     def has_text(self):
         """See InventoryEntry.has_text."""

[Jonathan Lange (jml)]

I'm working on this.

[Jonathan Lange (jml)]

No I'm not.