[With patch] Commit and log commands: encodings problems

I find the following patch to be a simpler solution to the *second* problem. Maybe ``edit_commit_message()`` (and not ``cmd_commit.run()``) is the right place to do the conversion to Unicode, since the editor may leave additional tips on the encoding of the file (like Emacs' ``-*- coding: xxx -*-``). Maybe ``edit_commit_message()`` should also get the ``input_encoding`` option, I don't know.

----

--- msgeditor.py.orig 2005-12-06 13:49:06.645099016 +0100
+++ msgeditor.py 2005-12-06 13:57:15.331807344 +0100
@@ -20,8 +20,10 @@
 """Commit message editor support."""

 import os
+import codecs
 from subprocess import call

+import bzrlib
 import bzrlib.config as config
 from bzrlib.errors import BzrError

@@ -95,7 +97,7 @@
         started = False
         msg = []
         lastline, nlines = 0, 0
- for line in file(msgfilename, "r"):
+ for line in codecs.open(msgfilename, 'rt', bzrlib.user_encoding):
             stripped_line = line.strip()
             # strip empty line before the log message starts
             if not started:

I found that merging in a patch with non-ASCII characters in its commit message causes a ``UnicodeDecodeError`` to be raised. The linked patch solves this by encoding ``infotext``, in addition to the previous changes.

http://www.selidor.net/data/bzr_msgeditor_encoding.diff

Your patch seems correct. I rework my previous one and send new patch to bazaar-ng mail list.

I was trying to write a pair of test cases for this in ``test_msgeditor.py``, but I definitely know too little of bzrlib. :(

* First case: create working dir, modify a file, commit with a UTF-8 (or something else) message, then get the log message and compare.

* Second case: create two divergent branches, create a commit in the first one with UTF-8 message, merge into the second one and see if ``UnicodeDecodeError`` is not raised when commiting.

I hope these will help to check that. Thanks!

This seems to be the relevant thread with the patch:
http://thread.gmane.org/gmane.comp.version-control.bazaar-ng.general/6425

My encoding branch has been committed which contains the test cases, and thus should have fixed this bug