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 22297

mercurial/hgweb/hgweb_mod.py

	"""Return path to mapfile for a given style.			"""Return path to mapfile for a given style.

	Searches mapfile in the following locations:			Searches mapfile in the following locations:
	1. templatepath/style/map			1. templatepath/style/map
	2. templatepath/map-style			2. templatepath/map-style
	3. templatepath/map			3. templatepath/map
	"""			"""

	if path is None:
	path = templater.templatedir()

	if path is not None:
	for style in styles:			for style in styles:
	# only plain name is allowed to honor template paths			# only plain name is allowed to honor template paths
	if (			if (
	not style			not style
	or style in (pycompat.oscurdir, pycompat.ospardir)			or style in (pycompat.oscurdir, pycompat.ospardir)
	or pycompat.ossep in style			or pycompat.ossep in style
	or pycompat.osaltsep			or pycompat.osaltsep
	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

	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,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22282		Aug 5 2020, 6:05 PM	★	★
Diff 2	22297	rHGc37ab438ff314d6f240c2a4d72a872a004517e21	Aug 5 2020, 5:03 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

hgweb: rely on open_template()'s fallback to using templatedir()ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22297

mercurial/hgweb/hgweb_mod.py

hgweb: rely on open_template()'s fallback to using templatedir()
ClosedPublic

Revision Contents
Changeset List