[QBzr:MERGE] bugfix #148159: custom encoding for files content in qdiff and qannotate

[Alexander Belchenko]

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

Lukáš Lalinský пишет:
> On So, 2007-10-13 at 15:01 +0300, Alexander Belchenko wrote:
>> +        config = get_branch_config(branch)
>> +        if encoding is None:
>> +            encoding = config.get_user_option("encoding") or 'utf-8'
>> +        else:
>> +            config.set_user_option("encoding", encoding)
> 
> It would be nice to validate the encoding if Python can use it.

Agreed. Will do.
We have similar check for encoding in bzrlib.osutis
get_[terminal|user]_encoding().

- --
[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHENuFzYr338mxwCURAnvJAJwOTKcwSaCgE/hH/Pk/Zqdd8HFdrwCghaAG
TwWS/S2ytdTOPTbM2+EVOas=
=9gta
-----END PGP SIGNATURE-----