Mercurial > hg
changeset 34239:344fd1fe237b
configitems: register the 'web.encoding' config
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 30 Jun 2017 03:45:44 +0200 |
| parents | a6c18628dff1 |
| children | c97a750c28a5 |
| files | mercurial/configitems.py mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/configitems.py Fri Jun 30 03:45:43 2017 +0200 +++ b/mercurial/configitems.py Fri Jun 30 03:45:44 2017 +0200 @@ -10,6 +10,7 @@ import functools from . import ( + encoding, error, ) @@ -618,6 +619,9 @@ coreconfigitem('web', 'description', default="", ) +coreconfigitem('web', 'encoding', + default=lambda: encoding.encoding, +) coreconfigitem('worker', 'backgroundclose', default=dynamicdefault, )
--- a/mercurial/hgweb/hgweb_mod.py Fri Jun 30 03:45:43 2017 +0200 +++ b/mercurial/hgweb/hgweb_mod.py Fri Jun 30 03:45:44 2017 +0200 @@ -320,7 +320,7 @@ rctx = requestcontext(self, repo) # This state is global across all threads. - encoding.encoding = rctx.config('web', 'encoding', encoding.encoding) + encoding.encoding = rctx.config('web', 'encoding') rctx.repo.ui.environ = req.env if rctx.csp:
--- a/mercurial/hgweb/hgwebdir_mod.py Fri Jun 30 03:45:43 2017 +0200 +++ b/mercurial/hgweb/hgwebdir_mod.py Fri Jun 30 03:45:44 2017 +0200 @@ -170,8 +170,7 @@ self.repos = repos self.ui = u - encoding.encoding = self.ui.config('web', 'encoding', - encoding.encoding) + encoding.encoding = self.ui.config('web', 'encoding') self.style = self.ui.config('web', 'style', 'paper') self.templatepath = self.ui.config('web', 'templates', None) self.stripecount = self.ui.config('web', 'stripes', 1)