This is an archive of the discontinued Mercurial Phabricator instance.

martinvonz retitled this revision from templatespec: use new factory functions from logcmdutil to templatespec: use new factory functions in logcmdutil.Jul 31 2020, 7:59 PM

martinvonz added a child revision: D8853: templatespec: use new factory functions in hooklib.

indygreg accepted this revision.Aug 2 2020, 12:17 PM

This revision is now accepted and ready to land.Aug 2 2020, 12:17 PM

martinvonz added a commit: rHGc1915cfa8080: templatespec: use new factory functions in logcmdutil.Aug 2 2020, 12:34 PM

Closed by commit rHGc1915cfa8080: templatespec: use new factory functions in logcmdutil (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/logcmdutil.py (6 lines)

Commit	Parents	Author	Summary	Date
9d530beaf49f	a28400ce8e9f	Martin von Zweigbergk		Jul 21 2020, 1:43 AM

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
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	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 22152

mercurial/logcmdutil.py


	See formatter.lookuptemplate() for details.			See formatter.lookuptemplate() for details.
	"""			"""

	# ui settings			# ui settings
	if not tmpl and not style: # template are stronger than style			if not tmpl and not style: # template are stronger than style
	tmpl = ui.config(b'ui', b'logtemplate')			tmpl = ui.config(b'ui', b'logtemplate')
	if tmpl:			if tmpl:
	return templatespec(templater.unquotestring(tmpl), None)			return formatter.literal_templatespec(templater.unquotestring(tmpl))
	else:			else:
	style = util.expandpath(ui.config(b'ui', b'style'))			style = util.expandpath(ui.config(b'ui', b'style'))

	if not tmpl and style:			if not tmpl and style:
	mapfile = style			mapfile = style
	if not os.path.split(mapfile)[0]:			if not os.path.split(mapfile)[0]:
	mapname = templater.templatepath(			mapname = templater.templatepath(
	b'map-cmdline.' + mapfile			b'map-cmdline.' + mapfile
	) or templater.templatepath(mapfile)			) or templater.templatepath(mapfile)
	if mapname:			if mapname:
	mapfile = mapname			mapfile = mapname
	return templatespec(None, mapfile)			return formatter.mapfile_templatespec(b'changeset', mapfile)

	return formatter.lookuptemplate(ui, b'changeset', tmpl)			return formatter.lookuptemplate(ui, b'changeset', tmpl)


	def maketemplater(ui, repo, tmpl, buffered=False):			def maketemplater(ui, repo, tmpl, buffered=False):
	"""Create a changesettemplater from a literal template 'tmpl'			"""Create a changesettemplater from a literal template 'tmpl'
	byte-string."""			byte-string."""
	spec = templatespec(tmpl, None)			spec = formatter.literal_templatespec(tmpl)
	return changesettemplater(ui, repo, spec, buffered=buffered)			return changesettemplater(ui, repo, spec, buffered=buffered)


	def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):			def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
	"""show one changeset using template or regular display.			"""show one changeset using template or regular display.

	Display format will be the first non-empty hit of:			Display format will be the first non-empty hit of:
	1. option 'template'			1. option 'template'

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22152		Jul 29 2020, 2:38 PM	★	★
Diff 2	22189	rHGc1915cfa808069c4a7c8204ead08dc764723e2bc	Jul 21 2020, 1:43 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

templatespec: use new factory functions in logcmdutilClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22152

mercurial/logcmdutil.py

templatespec: use new factory functions in logcmdutil
ClosedPublic

Revision Contents
Changeset List