This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22087		Jul 24 2020, 2:03 AM	★	★
Diff 2	22139		Jul 28 2020, 2:13 PM	★	★
Diff 3	22146		Jul 29 2020, 2:23 PM	★	★
Diff 4	22184	rHG22eafb16f1c5af87ecd8077014cd971d6c7c78ce	Jul 23 2020, 1:20 PM	★	★

Commit	Parents	Author	Summary	Date
efb124d5489c	d0496a6df1f0	Martin von Zweigbergk		Jul 23 2020, 1:20 PM

Status	Author	Revision
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	D8857 packaging: delete unnecessary updating of `dirs` list
Closed	martinvonz	D8856 packaging: make "mercurial.defaultrc" a 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
Abandoned	martinvonz	D8809 templater: reuse check for both "map-cmdline.<name>" and "<name>"
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 22087

mercurial/formatter.py

	return partsmap			return partsmap


	def loadtemplater(ui, spec, defaults=None, resources=None, cache=None):			def loadtemplater(ui, spec, defaults=None, resources=None, cache=None):
	"""Create a templater from either a literal template or loading from			"""Create a templater from either a literal template or loading from
	a map file"""			a map file"""
	assert not (spec.tmpl and spec.mapfile)			assert not (spec.tmpl and spec.mapfile)
	if spec.mapfile:			if spec.mapfile:
	frommapfile = templater.templater.frommapfile			return templater.templater.frommapfile(
	return frommapfile(
	spec.mapfile, defaults=defaults, resources=resources, cache=cache			spec.mapfile, defaults=defaults, resources=resources, cache=cache
	)			)
	return maketemplater(			return maketemplater(
	ui, spec.tmpl, defaults=defaults, resources=resources, cache=cache			ui, spec.tmpl, defaults=defaults, resources=resources, cache=cache
	)			)


	def maketemplater(ui, tmpl, defaults=None, resources=None, cache=None):			def maketemplater(ui, tmpl, defaults=None, resources=None, cache=None):

This is an archive of the discontinued Mercurial Phabricator instance.

formatter: inline a variable assigned from `templater.templater.frommapfile`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22087

mercurial/formatter.py

formatter: inline a variable assigned from `templater.templater.frommapfile`
ClosedPublic

Revision Contents
Changeset List