hg-stable: tests/test-check-format.t@b9d6ab6cdeb4 (annotated)

configitems: add a new config option to control new filenode functionality This series is adding functionality where we can force create a new filenode for some files on a merge-commit. This is meant to represent an explicit choice made by user and hence distingusing the file in the merged commit with the file in parent by creating a new filenode instead of using the parent one. This introduces a experimental config option under which this functionality will be hidden. A new testcase is added in tests/test-merge-criss-cross.t to test the new functionality while making the option does not break other scenarios. Differential Revision: https://phab.mercurial-scm.org/D9026

45208 f62bb5d07848 test: add `test-repo` requirement to `test-check-format` (issue6395) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44232 diff changeset	1	#require black test-repo
43095 fb41ea2ea076 formatting: introduce a `test-check-format-black.t` that enforce formatting Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	2
fb41ea2ea076 formatting: introduce a `test-check-format-black.t` that enforce formatting Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	3	$ cd $RUNTESTDIR/..
44232 5e84a96d865b python-zstandard: blacken at 80 characters Gregory Szorc <gregory.szorc@gmail.com> parents: 43732 diff changeset	4	$ black --config=black.toml --check --diff `hg files 'set:(*.py + grep("^#!.python")) - mercurial/thirdparty/**'`
43095 fb41ea2ea076 formatting: introduce a `test-check-format-black.t` that enforce formatting Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	5

author	Pulkit Goyal <7895pulkit@gmail.com>
	Mon, 14 Sep 2020 14:31:23 +0530
changeset 45582	b9d6ab6cdeb4
parent 45208	f62bb5d07848
child 46454	d4c8b4b90ecb
permissions	-rw-r--r--