# HG changeset patch
# User domruf <dominikruf@gmail.com>
# Date 2016-06-15 18:33:27
# Node ID 58931c2b6b0cadf1cd76b2992ed7724d519be641
# Parent  29b69b044494ac16e9b42c7de20a6f9c6be66743

lock: fix encoding error when Mercurial emits a localized warning with the Kallithea "repository locked" message

Mercurial use (utf8) encoded localized messages. Things failed when it tried to
convert the encoded Mercurial format string to unicode so it could insert
Kallithea's unicode (but ascii compatible) "repository locked" exception
string.

That could for example be reproduced by running the (manual) vcs test
test_push_on_locked_repo_by_other_user_hg with environment LANG=de_DE for the
server side.

To fix this, make sure the "repository locked" message is encoded so Mercurial
handles it correctly.

diff --git a/kallithea/lib/exceptions.py b/kallithea/lib/exceptions.py
--- a/kallithea/lib/exceptions.py
+++ b/kallithea/lib/exceptions.py
@@ -27,6 +27,8 @@ Original author and date, and relevant c
 
 from webob.exc import HTTPClientError
 
+from kallithea.lib.utils2 import safe_str
+
 
 class LdapUsernameError(Exception):
     pass
@@ -86,8 +88,8 @@ class HTTPLockedRC(HTTPClientError):
         from kallithea.lib.utils2 import safe_int
         _code = CONFIG.get('lock_ret_code')
         self.code = safe_int(_code, self.code)
-        self.title = self.explanation = ('Repository `%s` locked by '
-                                         'user `%s`' % (reponame, username))
+        self.title = self.explanation = safe_str(
+            'Repository `%s` locked by user `%s`' % (reponame, username))
         super(HTTPLockedRC, self).__init__(*args, **kwargs)