facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

configitems: register the 'web.encoding' config

Browse Source
This commit is contained in:
Boris Feld 2017-06-30 03:45:44 +02:00
parent 01eaec495b
commit ac4da5873b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/configitems.py
View File

@ -10,6 +10,7 @@ from __future__ import absolute_import
import functools
from . import (
encoding,
error,
)
@ -618,6 +619,9 @@ coreconfigitem('web', 'descend',
coreconfigitem('web', 'description',
default="",
)
coreconfigitem('web', 'encoding',
default=lambda: encoding.encoding,
)
coreconfigitem('worker', 'backgroundclose',
default=dynamicdefault,
)

2
mercurial/hgweb/hgweb_mod.py
View File

@ -320,7 +320,7 @@ class hgweb(object):
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:

3
mercurial/hgweb/hgwebdir_mod.py
View File

@ -170,8 +170,7 @@ class hgwebdir(object):
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)