kallithea Changeset - 58931c2b6b0c

Changeset - 58931c2b6b0c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

domruf - 9 years ago 2016-06-15 18:33:27
dominikruf@gmail.com

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.

1 file changed with 4 insertions and 2 deletions:

kallithea/lib/exceptions.py

0 comments (0 inline, 0 general)

kallithea/lib/exceptions.py

➞

Show inline comments

@@ @@ -24,12 +24,14 @@ Original author and date, and relevant c @@
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 from webob.exc import HTTPClientError
 from kallithea.lib.utils2 import safe_str
 class LdapUsernameError(Exception):
     pass
 class LdapPasswordError(Exception):
@@ @@ -83,14 +85,14 @@ class HTTPLockedRC(HTTPClientError): @@
     def __init__(self, reponame, username, *args, **kwargs):
         from kallithea import CONFIG
         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)
 class IMCCommitError(Exception):
     pass

0 comments (0 inline, 0 general)