This is an archive of the discontinued Mercurial Phabricator instance.

tests/test-template-map.t
131	This is the line I commented on D8798 that I shouldn't have included there. As I said there, feel free to fix that in flight, or take this patch, or tell me to extract a separate patch.

martinvonz added a parent revision: D8802: tests: fix mistaken copy&paste from commit 4489e9a22763.Jul 24 2020, 1:07 AM

martinvonz updated this revision to Diff 22081.

martinvonz added inline comments.Jul 24 2020, 1:08 AM

tests/test-template-map.t
131	Since that review was closed, I've extracted this line into D8802.

martinvonz added a child revision: D8793: config: remove now-unused support for "includepaths".Jul 24 2020, 1:09 AM

martinvonz updated this revision to Diff 22082.Jul 24 2020, 1:39 AM

pulkit accepted this revision.Jul 24 2020, 4:31 AM

This revision is now accepted and ready to land.Jul 24 2020, 4:31 AM

martinvonz added a commit: rHGf512708a9ea8: tests: add tests trying to use dir as style, as %include, and as __base__.Jul 25 2020, 6:04 AM

Closed by commit rHGf512708a9ea8: tests: add tests trying to use dir as style, as %include, and as __base__ (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-template-map.t (24 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22078		Jul 23 2020, 1:27 PM	★	★
Diff 2	22081		Jul 24 2020, 1:07 AM	★	★
Diff 3	22082		Jul 24 2020, 1:39 AM	★	★
Diff 4	22130	rHGf512708a9ea8dd045cecbf508d4c12a5b95f064e	Jul 24 2020, 1:06 AM	★	★

Commit	Parents	Author	Summary	Date
299778d526c1	407312791959	Martin von Zweigbergk		Jul 23 2020, 12:43 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 22078

tests/test-template-map.t

	tag: tip			tag: tip
	user: test			user: test
	date: Wed Jan 01 10:01:00 2020 +0000			date: Wed Jan 01 10:01:00 2020 +0000
	summary: third			summary: third

	Test map inheritance with non-existent base			Test map inheritance with non-existent base

	$ echo "__base__ = non-existent" > map-base-nonexistent			$ echo "__base__ = non-existent" > map-base-nonexistent
	$ printf 'cset = "changeset: *{rev}*\\n"\n' >> map-simple
	martinvonzAuthorUnsubmitted Done This is the line I commented on D8798 that I shouldn't have included there. As I said there, feel free to fix that in flight, or take this patch, or tell me to extract a separate patch. martinvonz: This is the line I commented on D8798 that I shouldn't have included there. As I said there…
	martinvonzAuthorUnsubmitted Done Since that review was closed, I've extracted this line into D8802. martinvonz: Since that review was closed, I've extracted this line into D8802.
	$ hg log -l1 -T./map-base-nonexistent			$ hg log -l1 -T./map-base-nonexistent
	abort: style '$TESTTMP/a/non-existent' not found			abort: style '$TESTTMP/a/non-existent' not found
	(available styles: bisect, changelog, compact, default, phases, show, status, xml)			(available styles: bisect, changelog, compact, default, phases, show, status, xml)
	[255]			[255]

				Test map inheritance with directory as base

				$ mkdir somedir
				$ echo "__base__ = somedir" > map-base-dir
				$ hg log -l1 -T./map-base-dir
				abort: Is a directory: '$TESTTMP/a/somedir'
				[255]

	Test including a built-in template map			Test including a built-in template map

	$ cat <<'EOF' > map-include-builtin			$ cat <<'EOF' > map-include-builtin
	> %include map-cmdline.default			> %include map-cmdline.default
	> [templates]			> [templates]
	> changeset = "{changeset_quiet}\n"			> changeset = "{changeset_quiet}\n"
	> EOF			> EOF
	$ hg log -l1 -T./map-include-builtin			$ hg log -l1 -T./map-include-builtin
	8:95c24699272e			8:95c24699272e


	Test including a nonexistent template map			Test including a nonexistent template map
	BROKEN: This should probably be an error just like the bad __base__ above			BROKEN: This should probably be an error just like the bad __base__ above

	$ cat <<'EOF' > map-include-nonexistent			$ cat <<'EOF' > map-include-nonexistent
	> %include nonexistent			> %include nonexistent
	> [templates]			> [templates]
	> changeset = "test\n"			> changeset = "test\n"
	> EOF			> EOF
	$ hg log -l1 -T./map-include-nonexistent			$ hg log -l1 -T./map-include-nonexistent
	test			test

				Test including a directory as template map
				BROKEN: This should probably be an error just like the bad __base__ above

				$ cat <<'EOF' > map-include-dir
				> %include somedir
				> [templates]
				> changeset = "test\n"
				> EOF
				$ hg log -l1 -T./map-include-dir
				test

	Test docheader, docfooter and separator in template map			Test docheader, docfooter and separator in template map

	$ cat <<'EOF' > map-myjson			$ cat <<'EOF' > map-myjson
	> docheader = '\{\n'			> docheader = '\{\n'
	> docfooter = '\n}\n'			> docfooter = '\n}\n'
	> separator = ',\n'			> separator = ',\n'
	> changeset = ' {dict(rev, node\|short)\|json}'			> changeset = ' {dict(rev, node\|short)\|json}'
	> EOF			> EOF

	Error if no style:			Error if no style:

	$ hg log --style notexist			$ hg log --style notexist
	abort: style 'notexist' not found			abort: style 'notexist' not found
	(available styles: bisect, changelog, compact, default, phases, show, status, xml)			(available styles: bisect, changelog, compact, default, phases, show, status, xml)
	[255]			[255]

				$ hg log --style somedir
				abort: Is a directory: 'somedir'
				[255]

	$ hg log -T list			$ hg log -T list
	available styles: bisect, changelog, compact, default, phases, show, status, xml			available styles: bisect, changelog, compact, default, phases, show, status, xml
	abort: specify a template			abort: specify a template
	[255]			[255]

	Error if style missing key:			Error if style missing key:

	$ echo 'q = q' > t			$ echo 'q = q' > t

This is an archive of the discontinued Mercurial Phabricator instance.

tests: add tests trying to use dir as style, as %include, and as __base__ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22078

tests/test-template-map.t

tests: add tests trying to use dir as style, as %include, and as base
ClosedPublic

Revision Contents
Changeset List