kallithea Changeset - 9937ae52f167

Changeset - 9937ae52f167

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 7 years ago 2018-06-09 16:28:33
mads@kiilerich.com

hg: set encoding to utf-8 by default to always show unicode characters correctly

Unicode characters would be shown as '?' if Kallithea was launched in a LANG=C
environment (or similar).

The problem could be solved by setting HGENCODING before launching Kallithea or
before importing Mercurial. These are often not good solutions.

Instead, introduce a hgencoding config setting that triggers monkey patching of
Mercurial.

4 files changed with 15 insertions and 1 deletions:

development.ini

docs/setup.rst

kallithea/config/app_cfg.py

kallithea/lib/paster_commands/template.ini.mako

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -160,6 +160,9 @@ api_access_controllers_whitelist = @@
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = utf8
 ## Set Mercurial encoding, similar to setting HGENCODING before launching Kallithea
 hgencoding = utf-8
 ## issue tracker for Kallithea (leave blank to disable, absent for default)
 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues

docs/setup.rst

➞

Show inline comments

@@ @@ -633,6 +633,9 @@ encoding of commit messages. In addition @@
 library is installed. If ``chardet`` is detected Kallithea will fallback to it
 when there are encode/decode errors.
 The Mercurial encoding is configurable as ``hgencoding``. It is similar to
 setting the ``HGENCODING`` environment variable, but will override it.
 Celery configuration
 --------------------
@@ @@ -894,7 +897,6 @@ Example WSGI dispatch script: @@
 .. code-block:: python
     import os
     os.environ["HGENCODING"] = "UTF-8"
     os.environ['PYTHON_EGG_CACHE'] = '/srv/kallithea/.egg-cache'
     # sometimes it's needed to set the current dir

kallithea/config/app_cfg.py

➞

Show inline comments

@@ @@ -28,6 +28,7 @@ import alembic.config @@
 from alembic.script.base import ScriptDirectory
 from alembic.migration import MigrationContext
 from sqlalchemy import create_engine
 import mercurial
 from kallithea.lib.middleware.https_fixup import HttpsFixup
 from kallithea.lib.middleware.simplegit import SimpleGit
@@ @@ -119,6 +120,11 @@ else: @@
 def setup_configuration(app):
     config = app.config
     # Mercurial sets encoding at module import time, so we have to monkey patch it
     hgencoding = config.get('hgencoding')
     if hgencoding:
         mercurial.encoding.encoding = hgencoding
     if config.get('ignore_alembic_revision', False):
         log.warn('database alembic revision checking is disabled')
     else:

kallithea/lib/paster_commands/template.ini.mako

➞

Show inline comments

@@ @@ -254,6 +254,9 @@ api_access_controllers_whitelist = @@
 <%text>## can be also a comma separated list of encoding in case of mixed encodings</%text>
 default_encoding = utf8
 <%text>## Set Mercurial encoding, similar to setting HGENCODING before launching Kallithea</%text>
 hgencoding = utf-8
 <%text>## issue tracker for Kallithea (leave blank to disable, absent for default)</%text>
 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues

0 comments (0 inline, 0 general)