Mercurial > hg-stable
changeset 34253:db63872e10cc
configitems: register the 'web.style' config
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 30 Jun 2017 03:45:52 +0200 |
| parents | 945c9816ec1d |
| children | 95f80c095804 |
| files | mercurial/configitems.py mercurial/hgweb/hgwebdir_mod.py mercurial/hgweb/webcommands.py mercurial/hgweb/webutil.py |
| diffstat | 4 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/configitems.py Fri Jun 30 03:45:51 2017 +0200 +++ b/mercurial/configitems.py Fri Jun 30 03:45:52 2017 +0200 @@ -640,6 +640,9 @@ coreconfigitem('web', 'stripes', default=1, ) +coreconfigitem('web', 'style', + default='paper', +) coreconfigitem('worker', 'backgroundclose', default=dynamicdefault, )
--- a/mercurial/hgweb/hgwebdir_mod.py Fri Jun 30 03:45:51 2017 +0200 +++ b/mercurial/hgweb/hgwebdir_mod.py Fri Jun 30 03:45:52 2017 +0200 @@ -173,7 +173,7 @@ self.repos = repos self.ui = u encoding.encoding = self.ui.config('web', 'encoding') - self.style = self.ui.config('web', 'style', 'paper') + self.style = self.ui.config('web', 'style') self.templatepath = self.ui.config('web', 'templates', None) self.stripecount = self.ui.config('web', 'stripes') if self.stripecount:
--- a/mercurial/hgweb/webcommands.py Fri Jun 30 03:45:51 2017 +0200 +++ b/mercurial/hgweb/webcommands.py Fri Jun 30 03:45:52 2017 +0200 @@ -762,7 +762,7 @@ ctx = fctx.changectx() basectx = ctx.p1() - style = web.config('web', 'style', 'paper') + style = web.config('web', 'style') if 'style' in req.form: style = req.form['style'][0] @@ -999,7 +999,7 @@ revs = fctx.filelog().revs(start, end - 1) entries = [] - diffstyle = web.config('web', 'style', 'paper') + diffstyle = web.config('web', 'style') if 'style' in req.form: diffstyle = req.form['style'][0]
--- a/mercurial/hgweb/webutil.py Fri Jun 30 03:45:51 2017 +0200 +++ b/mercurial/hgweb/webutil.py Fri Jun 30 03:45:52 2017 +0200 @@ -406,7 +406,7 @@ if basectx is None: basectx = ctx.p1() - style = web.config('web', 'style', 'paper') + style = web.config('web', 'style') if 'style' in req.form: style = req.form['style'][0]