Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/hgweb_mod.py @ 9842:d3dbdca92458

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: don't choke when an inexistent style is requested (issue1901)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 12 Nov 2009 16:39:11 +0100
parents 0e080d519d1b
children 38170eeed18c 25e572394f5c
comparison
equal deleted inserted replaced
9841:7cd6dee6fe37 9842:d3dbdca92458
235 yield self.config("web", "motd", "") 235 yield self.config("web", "motd", "")
236 236
237 # figure out which style to use 237 # figure out which style to use
238 238
239 vars = {} 239 vars = {}
240 style = self.config("web", "style", "paper") 240 styles = (
241 if 'style' in req.form: 241 req.form.get('style', [None])[0],
242 style = req.form['style'][0] 242 self.config('web', 'style'),
243 'paper',
244 )
245 style, mapfile = templater.stylemap(styles, self.templatepath)
246 if style == styles[0]:
243 vars['style'] = style 247 vars['style'] = style
244 248
245 start = req.url[-1] == '?' and '&' or '?' 249 start = req.url[-1] == '?' and '&' or '?'
246 sessionvars = webutil.sessionvars(vars, start) 250 sessionvars = webutil.sessionvars(vars, start)
247 mapfile = templater.stylemap(style, self.templatepath)
248 251
249 if not self.reponame: 252 if not self.reponame:
250 self.reponame = (self.config("web", "name") 253 self.reponame = (self.config("web", "name")
251 or req.env.get('REPO_NAME') 254 or req.env.get('REPO_NAME')
252 or req.url.strip('/') or self.repo.root) 255 or req.url.strip('/') or self.repo.root)