Merge lp:~jelmer/brz/non-utf8-locale into lp:brz

[Jelmer Vernooij]

Prevent UnicodeDecodeError on Python 2 with LANG=fr_FR.ISO-8859-1.

Prevent UnicodeDecodeError on Python 2 with LANG=fr_FR.ISO-8859-1.

Without this change the following tests break on Python 2:

breezy.tests.per_workingtree.test_readonly.TestReadonly.test_readonly_unclean(WorkingTreeFormat3)
breezy.tests.per_workingtree.test_readonly.TestReadonly.test_readonly_unclean(WorkingTreeFormat2)

[Martin Packman (gz)]

As per other uses of safe_unicode this is technically wrong but requires some smarts in trace that doesn't exist yet. So, is probably fine to land pending work to make it redundant.

review: Approve

=== modified file 'breezy/bzr/workingtree_3.py'
--- breezy/bzr/workingtree_3.py	2018-11-16 18:35:30 +0000
+++ breezy/bzr/workingtree_3.py	2018-12-04 19:58:21 +0000
@@ -30,6 +30,7 @@
 from .. import (
     errors,
     hashcache,
+    osutils,
     revision as _mod_revision,
     trace,
     transform,
@@ -80,7 +81,8 @@
                 #       warning might be sufficient to let the user know what
                 #       is going on.
                 trace.mutter('Could not write hashcache for %s\nError: %s',
-                             self._hashcache.cache_file_name(), e)
+                             self._hashcache.cache_file_name(),
+                             osutils.safe_unicode(e.args[1]))
 
     def get_file_sha1(self, path, stat_value=None):
         with self.lock_read():
 
=== modified file 'breezy/tests/per_workingtree/test_readonly.py'
--- breezy/tests/per_workingtree/test_readonly.py	2018-07-02 00:58:07 +0000
+++ breezy/tests/per_workingtree/test_readonly.py	2018-12-04 19:58:21 +0000
@@ -104,13 +104,10 @@
         # Make it readonly, and do some operations and then unlock
         self.set_dirs_readonly('tree')
 
-        tree.lock_read()
-        try:
+        with tree.lock_read():
             if hack_dirstate:
                 tree._dirstate._cutoff_time = self._custom_cutoff_time()
             # Make sure we check all the files
             for path in tree.all_versioned_paths():
                 size = tree.get_file_size(path)
                 sha1 = tree.get_file_sha1(path)
-        finally:
-            tree.unlock()