[MERGE] Readable and properly encoded diff headers

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Adeodato Simó wrote:
> The attached patch changes %r to '%s' in the headers, and also encodes
> the filenames in the proper encoding, not hardcoded 'utf8'.

I don't think we should assume that the destination is a terminal.  For
example, I believe this functionality is invoked by bzr-gtk's gdiff, and
so changing it to something other than utf-8 might be a regression.

So I think the default should remain utf-8, but cmd_diff should override
it to cmd_diff.outf.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFE4drM0F+nu1YWqI0RAhHxAJ99+1WzMHNQxQoT88Q4nVVhkRtKlACfdgPc
U2FqJE0kXtMYFVt4HcovRH4=
=/JmK
-----END PGP SIGNATURE-----