This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D970 hgweb: extract function for loading style from request context
Closed	durin42	D969 request: coerce content-type to native str
Closed	durin42	D968 request: use trivial iterator over dictionary keys
Closed	durin42	D967 hgweb: when constructing or adding to a wsgi environ dict, use native strs
Closed	durin42	D966 hgweb: produce native string for etag value
Closed	durin42	D965 templatefilters: be sure we always feed cgi.escape a str
Closed	durin42	D964 python3: move from using func_name to __name__
Closed	durin42	D963 hgweb: in protocol adapter, look for bytes instances, not str
Closed	durin42	D962 hgweb: in protocol adapter, avoid control reaching end of non-void function

Diff 2531

mercurial/hgweb/hgweb_mod.py

	from .request import wsgirequest			from .request import wsgirequest

	from .. import (			from .. import (
	encoding,			encoding,
	error,			error,
	hg,			hg,
	hook,			hook,
	profiling,			profiling,
				pycompat,
	repoview,			repoview,
	templatefilters,			templatefilters,
	templater,			templater,
	ui as uimod,			ui as uimod,
	util,			util,
	)			)

	from . import (			from . import (
	}			}

	archivespecs = util.sortdict((			archivespecs = util.sortdict((
	('zip', ('application/zip', 'zip', '.zip', None)),			('zip', ('application/zip', 'zip', '.zip', None)),
	('gz', ('application/x-gzip', 'tgz', '.tar.gz', None)),			('gz', ('application/x-gzip', 'tgz', '.tar.gz', None)),
	('bz2', ('application/x-bzip2', 'tbz2', '.tar.bz2', None)),			('bz2', ('application/x-bzip2', 'tbz2', '.tar.bz2', None)),
	))			))

				def getstyle(req, configfn, templatepath):
				fromreq = req.form.get('style', [None])[0]
				if fromreq is not None:
				fromreq = pycompat.sysbytes(fromreq)
				styles = (
				fromreq,
				configfn('web', 'style'),
				'paper',
				)
				return styles, templater.stylemap(styles, templatepath)

	def makebreadcrumb(url, prefix=''):			def makebreadcrumb(url, prefix=''):
	'''Return a 'URL breadcrumb' list			'''Return a 'URL breadcrumb' list

	A 'URL breadcrumb' is a list of URL-name pairs,			A 'URL breadcrumb' is a list of URL-name pairs,
	corresponding to each of the path items on a URL.			corresponding to each of the path items on a URL.
	This can be used to create path navigation entries.			This can be used to create path navigation entries.
	'''			'''
	if url.endswith('/'):			if url.endswith('/'):
	# some functions for the templater			# some functions for the templater

	def motd(**map):			def motd(**map):
	yield self.config('web', 'motd', '')			yield self.config('web', 'motd', '')

	# figure out which style to use			# figure out which style to use

	vars = {}			vars = {}
	styles = (			styles, (style, mapfile) = getstyle(req, self.config,
	req.form.get('style', [None])[0],			self.templatepath)
	self.config('web', 'style'),
	'paper',
	)
	style, mapfile = templater.stylemap(styles, self.templatepath)
	if style == styles[0]:			if style == styles[0]:
	vars['style'] = style			vars['style'] = style

	start = req.url[-1] == '?' and '&' or '?'			start = req.url[-1] == '?' and '&' or '?'
	sessionvars = webutil.sessionvars(vars, start)			sessionvars = webutil.sessionvars(vars, start)

	if not self.reponame:			if not self.reponame:
	self.reponame = (self.config('web', 'name')			self.reponame = (self.config('web', 'name')

mercurial/hgweb/hgwebdir_mod.py


	self.updatereqenv(req.env)			self.updatereqenv(req.env)

	url = req.env.get('SCRIPT_NAME', '')			url = req.env.get('SCRIPT_NAME', '')
	if not url.endswith('/'):			if not url.endswith('/'):
	url += '/'			url += '/'

	vars = {}			vars = {}
	styles = (			styles, (style, mapfile) = hgweb_mod.getstyle(req, config,
	req.form.get('style', [None])[0],			self.templatepath)
	config('web', 'style'),
	'paper'
	)
	style, mapfile = templater.stylemap(styles, self.templatepath)
	if style == styles[0]:			if style == styles[0]:
	vars['style'] = style			vars['style'] = style

	start = url[-1] == '?' and '&' or '?'			start = url[-1] == '?' and '&' or '?'
	sessionvars = webutil.sessionvars(vars, start)			sessionvars = webutil.sessionvars(vars, start)
	logourl = config('web', 'logourl', 'https://mercurial-scm.org/')			logourl = config('web', 'logourl', 'https://mercurial-scm.org/')
	logoimg = config('web', 'logoimg', 'hglogo.png')			logoimg = config('web', 'logoimg', 'hglogo.png')
	staticurl = config('web', 'staticurl') or url + 'static/'			staticurl = config('web', 'staticurl') or url + 'static/'

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2486		Oct 5 2017, 5:32 PM	★	★
Diff 2	2531	rHGcb52aefbd6522535b3cd609378d01dd828096a68	Oct 5 2017, 2:29 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

hgweb: extract function for loading style from request contextClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2531

mercurial/hgweb/hgweb_mod.py

mercurial/hgweb/hgwebdir_mod.py

hgweb: extract function for loading style from request context
ClosedPublic

Revision Contents
Changeset List