Merge lp:~parthm/bzr/518609-version-info-unicodedecodeerror into lp:bzr

[Parth Malwankar]

=== Fixes Bug #518609 ===
This fixes unicode handling of 'version-info --include-history'. UnicodeDecodeError exception is not thrown. This was discussed on the mailing list[1].

Stanza.write now uses to_file.write(self.to_unicode()) rather than to_file.writelines(self.to_lines()).

The tests are updated for this. As cStringIO object cannot handle unicode, the impacted tests use StringIO (imported as UnicodeStringIO) to allow writing of unicode. To allow UnicodeStringIO to behave like a file (write unicode, read str), the buffer is encoded as utf-8 on read before being passed to the caller.

Manual testing was done to ensure that unicode messages are shown correctly. E.g.:
< message: (Luk?? Lalinsk?) Add a global write lock for cmd_uncommit (related to #172649)
---
> message: (Lukáš Lalinský) Add a global write lock for cmd_uncommit (related to #172649)

[1] http://article.gmane.org/gmane.comp.version-control.bazaar-ng.general/67403

[Robert Collins (lifeless)]

This really is the wrong approach I think. See the list discussion.

review: Needs Fixing

Unmerged revisions

5131. By Parth Malwankar on 2010-04-05

updated NEWS

5130. By Parth Malwankar on 2010-04-05

merged in trunk

5129. By Parth Malwankar on 2010-04-05

#518609. version-info --include histroy handes unicode.

=== modified file 'NEWS'
--- NEWS	2010-04-02 15:10:54 +0000
+++ NEWS	2010-04-05 13:15:31 +0000
@@ -23,6 +23,10 @@
   that are not part of the ancestry anymore.
   (Vincent Ladeuil, #474807)
 
+* ``version-info --include-history`` handles unicode better and does not
+  throw UnicodeDecodeError exception.
+  (Parth Malwankar, #518609)
+
 Improvements
 ************
 

=== modified file 'bzrlib/rio.py'
--- bzrlib/rio.py	2009-09-11 06:36:50 +0000
+++ bzrlib/rio.py	2010-04-05 13:15:31 +0000
@@ -212,7 +212,7 @@
 
     def write(self, to_file):
         """Write stanza to a file"""
-        to_file.writelines(self.to_lines())
+        to_file.write(self.to_unicode())
 
     def get(self, tag):
         """Return the value for a field wih given tag.

=== modified file 'bzrlib/tests/test_version_info.py'
--- bzrlib/tests/test_version_info.py	2010-01-25 17:48:22 +0000
+++ bzrlib/tests/test_version_info.py	2010-04-05 13:15:31 +0000
@@ -17,6 +17,7 @@
 """Tests for version_info"""
 
 from cStringIO import StringIO
+from StringIO import StringIO as UnicodeStringIO
 import imp
 import os
 import sys
@@ -68,11 +69,11 @@
         wt = self.create_branch()
 
         def regen(**kwargs):
-            sio = StringIO()
+            sio = UnicodeStringIO()
             builder = RioVersionInfoBuilder(wt.branch, working_tree=wt,
                                             **kwargs)
             builder.generate(sio)
-            val = sio.getvalue()
+            val = sio.getvalue().encode('utf-8')
             return val
 
         val = regen()
@@ -121,11 +122,13 @@
         wt = self.create_branch()
 
         def regen(**kwargs):
-            sio = StringIO()
+            sio = UnicodeStringIO()
+
             builder = RioVersionInfoBuilder(wt.branch, working_tree=wt,
                                             **kwargs)
             builder.generate(sio)
             sio.seek(0)
+            sio.buf = sio.buf.encode('utf-8')
             stanzas = list(read_stanzas(sio))
             self.assertEqual(1, len(stanzas))
             return stanzas[0]