This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11942

rhg: Accept different "invalid ignore pattern" error message formatting
ClosedPublic

Authored by SimonSapin on Dec 17 2021, 11:57 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG262a38f10427: rhg: Accept different "invalid ignore pattern" error message formatting

Summary

At the moment rhg compiles all patterns into a single big regular expression,
so it’s not practical to find out which file the invalid bit of syntax
came from.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Dec 17 2021, 11:57 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 17 2021, 11:57 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

SimonSapin added a child revision: D11943: rhg: Fall back to Python if verbose status is requested by config.Dec 18 2021, 5:47 AM

This might become a nuisance with a really big regex as it will print it in its entirety... but I'm not sure I have a good solution that isn't over-engineered right now.

This revision is now accepted and ready to land.Dec 20 2021, 4:43 AM

Ideally we’d have a way to parse and validate separate regexps from individual patterns (reporting errors with only the relevant line), then combine them (like in https://twitter.com/thingskatedid/status/1472360823058157569 and the preceding thread). If it’s cheap to combine already-fully-compiled DFAs, maybe the regex crate could have an API that takes multiple Regex values? In the meantime if we accept some duplicated setup-time work we could validate each pattern with Regex::new, report errors individually, throw away successful results and then at the end build the mega-regex from concatenated strings like now.

The second option was my idea, I don't know how much churn that would imply, but I feel like it would make the debugging experience much better.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

SimonSapin added a commit: rHG262a38f10427: rhg: Accept different "invalid ignore pattern" error message formatting.Dec 20 2021, 8:34 AM

Closed by commit rHG262a38f10427: rhg: Accept different "invalid ignore pattern" error message formatting (authored by SimonSapin). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-hgignore.t (14 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31538		Dec 17 2021, 11:57 AM	★	★
Diff 2	31551		Dec 20 2021, 7:24 AM	★	★
Diff 3	31555	rHG262a38f1042768ab933c5522af59daad5fa65440	Dec 17 2021, 11:56 AM	★	★

Status	Author	Revision
Closed	SimonSapin	D11943 rhg: Fall back to Python if verbose status is requested by config
Closed	SimonSapin	D11942 rhg: Accept different "invalid ignore pattern" error message formatting
Closed	SimonSapin	D11941 rhg: Properly format warnings related to ignore patterns
Closed	SimonSapin	D11940 rhg: Sub-repositories are not supported

Diff 31555

tests/test-hgignore.t

	#testcases dirstate-v1 dirstate-v2			#testcases dirstate-v1 dirstate-v2

	#if dirstate-v2			#if dirstate-v2
	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [format]			> [format]
	> exp-rc-dirstate-v2=1			> exp-rc-dirstate-v2=1
	> [storage]			> [storage]
	> dirstate-v2.slow-path=allow			> dirstate-v2.slow-path=allow
	> EOF			> EOF
	#endif			#endif

	TODO: fix rhg bugs that make this test fail when status is enabled
	$ unset RHG_STATUS


	$ hg init ignorerepo			$ hg init ignorerepo
	$ cd ignorerepo			$ cd ignorerepo

	debugignore with no hgignore should be deterministic:			debugignore with no hgignore should be deterministic:
	$ hg debugignore			$ hg debugignore
	<nevermatcher>			<nevermatcher>

	Issue562: .hgignore requires newline at end:			Issue562: .hgignore requires newline at end:
	$ hg status			$ hg status
	A dir/b.o			A dir/b.o
	? a.c			? a.c
	? a.o			? a.o
	? dir/c.o			? dir/c.o
	? syntax			? syntax

	$ echo "*.o" > .hgignore			$ echo "*.o" > .hgignore
				#if no-rhg
	$ hg status			$ hg status
	abort: $TESTTMP/ignorerepo/.hgignore: invalid pattern (relre): *.o (glob)			abort: $TESTTMP/ignorerepo/.hgignore: invalid pattern (relre): *.o (glob)
	[255]			[255]
				#endif
				#if rhg
				$ hg status
				Unsupported syntax regex parse error:
				^(?:*.o)
				^
				error: repetition operator missing expression
				[255]
				#endif

	Ensure given files are relative to cwd			Ensure given files are relative to cwd

	$ echo "dir/.*\.o" > .hgignore			$ echo "dir/.*\.o" > .hgignore
	$ hg status -i			$ hg status -i
	I dir/c.o			I dir/c.o

	$ hg debugignore dir/c.o dir/missing.o			$ hg debugignore dir/c.o dir/missing.o