This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Abandoned	martinvonz	D8809 templater: reuse check for both "map-cmdline.<name>" and "<name>"
Closed	martinvonz	D8857 packaging: delete unnecessary updating of `dirs` list
Closed	martinvonz	D8856 packaging: make "mercurial.defaultrc" a key in package_data
Closed	martinvonz	D8901 hgweb: enable reading styles from resources in frozen binaries
Closed	martinvonz	D8900 hgweb: rely on open_template()'s fallback to using templatedir()
Closed	martinvonz	D8899 hgweb: open mapfile using templater.open_template()
Closed	martinvonz	D8898 hgweb: simplify a constant-length list by converting to literal tuple
Closed	martinvonz	D8897 hgweb: remove some accesses to private member uimod._unset
Closed	martinvonz	D8896 templater: try to read %include in mapfiles from resources
Closed	martinvonz	D8895 templater: unroll loop over mapfile directories
Closed	martinvonz	D8894 templater: make open_template() read from resources if in frozen binary
Closed	martinvonz	D8893 templater: pass opened file-like object to templatespec
Closed	martinvonz	D8892 templater: replace templatepath() with function that also opens the file
Closed	martinvonz	D8891 templater: start passing resource to read from into _readmapfile()
Closed	martinvonz	D8890 templater: move stylemap() to hgweb_mod, since that's its only user
Closed	martinvonz	D8874 hgweb: simplify staticfile() now that we always pass it a single directory
Closed	martinvonz	D8858 packaging: include templates with their package as key in package_data
Closed	martinvonz	D8855 packaging: mark mercurial.templates and subdirs as packages
Closed	martinvonz	D8854 templates: add __init__.py files to templates/ dirs
Closed	martinvonz	D8853 templatespec: use new factory functions in hooklib
Closed	martinvonz	D8848 templatespec: use new factory functions in logcmdutil
Closed	martinvonz	D8847 templatespec: move check for non-unicode to lower-level function
Closed	martinvonz	D8846 templatespec: logcmdutil.templatespec() gets either template or mapfile
Closed	martinvonz	D8845 templatespec: create a factory function for each type there is
Closed	martinvonz	D8844 templater: stop accepting a single style to stylemap()
Closed	martinvonz	D8807 formatter: inline a variable assigned from `templater.templater.frommapfile`
Closed	martinvonz	D8806 templater: don't normalize path separators to '/' when interacting with OS
Closed	martinvonz	D8805 formatter: remove now-unnecessary check for file-ness
Closed	martinvonz	D8804 templater: make templatepath() not return directory paths
Closed	martinvonz	D8803 tests: show unusual error message for `hg log --style coal`
Closed	martinvonz	D8796 config: remove now-unused `abs` argument from `include` callback
Closed	martinvonz	D8795 config: re-calculate absolute %include path in `include` callback
Closed	martinvonz	D8794 subrepoutil: use relative path for looking up config `%include`s
Closed	martinvonz	D8793 config: remove now-unused support for "includepaths"
Closed	martinvonz	D8800 tests: add tests trying to use dir as style, as %include, and as __base__
Closed	martinvonz	D8802 tests: fix mistaken copy&paste from commit 4489e9a22763

Diff 22283

mercurial/hgweb/hgweb_mod.py

	and pycompat.osaltsep in style			and pycompat.osaltsep in style
	):			):
	continue			continue
	locations = (os.path.join(style, b'map'), b'map-' + style, b'map')			locations = (os.path.join(style, b'map'), b'map-' + style, b'map')

	for location in locations:			for location in locations:
	mapfile, fp = templater.open_template(location, path)			mapfile, fp = templater.open_template(location, path)
	if mapfile:			if mapfile:
	return style, mapfile			return style, mapfile, fp

	raise RuntimeError(b"No hgweb templates found in %r" % path)			raise RuntimeError(b"No hgweb templates found in %r" % path)


	def makebreadcrumb(url, prefix=b''):			def makebreadcrumb(url, prefix=b''):
	'''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,
	or req.apppath.rstrip(b'/') + b'/static/'			or req.apppath.rstrip(b'/') + b'/static/'
	)			)
	if not staticurl.endswith(b'/'):			if not staticurl.endswith(b'/'):
	staticurl += b'/'			staticurl += b'/'

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

	vars = {}			vars = {}
	styles, (style, mapfile) = getstyle(req, self.config, self.templatepath)			styles, (style, mapfile, fp) = getstyle(
				req, self.config, self.templatepath
				)
	if style == styles[0]:			if style == styles[0]:
	vars[b'style'] = style			vars[b'style'] = style

	sessionvars = webutil.sessionvars(vars, b'?')			sessionvars = webutil.sessionvars(vars, b'?')

	if not self.reponame:			if not self.reponame:
	self.reponame = (			self.reponame = (
	self.config(b'web', b'name', b'')			self.config(b'web', b'name', b'')
	}			}
	templatekeyword = registrar.templatekeyword(defaults)			templatekeyword = registrar.templatekeyword(defaults)

	@templatekeyword(b'motd', requires=())			@templatekeyword(b'motd', requires=())
	def motd(context, mapping):			def motd(context, mapping):
	yield self.config(b'web', b'motd')			yield self.config(b'web', b'motd')

	tres = formatter.templateresources(self.repo.ui, self.repo)			tres = formatter.templateresources(self.repo.ui, self.repo)
	tmpl = templater.templater.frommapfile(			return templater.templater.frommapfile(
	mapfile, filters=filters, defaults=defaults, resources=tres			mapfile, fp=fp, filters=filters, defaults=defaults, resources=tres
	)			)
	return tmpl

	def sendtemplate(self, name, **kwargs):			def sendtemplate(self, name, **kwargs):
	"""Helper function to send a response generated from a template."""			"""Helper function to send a response generated from a template."""
	kwargs = pycompat.byteskwargs(kwargs)			kwargs = pycompat.byteskwargs(kwargs)
	self.res.setbodygen(self.tmpl.generate(name, kwargs))			self.res.setbodygen(self.tmpl.generate(name, kwargs))
	return self.res.sendresponse()			return self.res.sendresponse()

mercurial/hgweb/hgwebdir_mod.py

	return res.sendresponse()			return res.sendresponse()

	def templater(self, req, nonce):			def templater(self, req, nonce):
	def config(args, *kwargs):			def config(args, *kwargs):
	kwargs.setdefault('untrusted', True)			kwargs.setdefault('untrusted', True)
	return self.ui.config(args, *kwargs)			return self.ui.config(args, *kwargs)

	vars = {}			vars = {}
	styles, (style, mapfile) = hgweb_mod.getstyle(			styles, (style, mapfile, fp) = hgweb_mod.getstyle(
	req, config, self.templatepath			req, config, self.templatepath
	)			)
	if style == styles[0]:			if style == styles[0]:
	vars[b'style'] = style			vars[b'style'] = style

	sessionvars = webutil.sessionvars(vars, b'?')			sessionvars = webutil.sessionvars(vars, b'?')
	logourl = config(b'web', b'logourl')			logourl = config(b'web', b'logourl')
	logoimg = config(b'web', b'logoimg')			logoimg = config(b'web', b'logoimg')

	@templatekeyword(b'motd', requires=())			@templatekeyword(b'motd', requires=())
	def motd(context, mapping):			def motd(context, mapping):
	if self.motd is not None:			if self.motd is not None:
	yield self.motd			yield self.motd
	else:			else:
	yield config(b'web', b'motd')			yield config(b'web', b'motd')

	tmpl = templater.templater.frommapfile(mapfile, defaults=defaults)			return templater.templater.frommapfile(
	return tmpl			mapfile, fp=fp, defaults=defaults
				)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22283		Aug 5 2020, 6:05 PM	★	★
Diff 2	22299	rHG1a4f925f72c3786ab1e659400ae4351a74d20f00	Aug 5 2020, 5:19 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

hgweb: enable reading styles from resources in frozen binariesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22283

mercurial/hgweb/hgweb_mod.py

mercurial/hgweb/hgwebdir_mod.py

hgweb: enable reading styles from resources in frozen binaries
ClosedPublic

Revision Contents
Changeset List