This is an archive of the discontinued Mercurial Phabricator instance.

errors: raise InputError on early parse error in dispatch
ClosedPublic

Authored by martinvonz on Nov 24 2020, 1:05 PM.

Download Raw Diff

Details

Reviewers

pulkit
mharbison72

Group Reviewers

hg-reviewers

Commits

rHGdb5dddb38f5b: errors: raise InputError on early parse error in dispatch

Summary

I didn't think this would have any effect on the tests, but it does
because the catching in scmutil.callcatch() still happens. That's
because dispatch passes in the function that includes the parsing as
an argument to that function.

I initially used ConfigError here but Matt Harbison convinced me to
use InputError. I think that makes sense since error is not in a
config file.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 24 2020, 1:05 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 24 2020, 1:05 PM

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

martinvonz added a child revision: D9388: errors: raise InputError on bad top-level flags.Nov 24 2020, 1:05 PM

If this is purely from --config instead of a file and you're collecting metrics, would you want this to be an InputError? (I'm happy to queue this as-is, I just wanted to double check)

In D9387#141293, @mharbison72 wrote:

If this is purely from --config instead of a file and you're collecting metrics, would you want this to be an InputError? (I'm happy to queue this as-is, I just wanted to double check)

I intentionally used ConfigError here, but it's a question and you may be right that InputError is more correct. The user should not try to fix it by modifying config files, so you're probably right. I'll change it.

Seems like there are already changes planned on this one.

This revision now requires changes to proceed.Dec 4 2020, 1:50 PM

martinvonz retitled this revision from errors: raise ConfigError on early parse error in dispatch to errors: raise InputError on early parse error in dispatch.Dec 14 2020, 4:31 PM

martinvonz edited the summary of this revision. (Show Details)

martinvonz added a child revision: D9391: errors: raise StateError when push fails because it creates new heads.

martinvonz updated this revision to Diff 24269.

In D9387#143126, @pulkit wrote:

Seems like there are already changes planned on this one.

Yes. I think that should now be done.

mharbison72 accepted this revision.Dec 15 2020, 10:59 PM

martinvonz added a commit: rHGdb5dddb38f5b: errors: raise InputError on early parse error in dispatch.Dec 15 2020, 11:32 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGdb5dddb38f5b: errors: raise InputError on early parse error in dispatch (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/dispatch.py (2 lines)
M			tests/test-globalopts.t (20 lines)
M			tests/test-legacy-exit-code.t (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23645		Nov 24 2020, 1:05 PM	★	★
Diff 2	24269		Dec 14 2020, 4:31 PM	★	★
Diff 3	24294	rHGdb5dddb38f5b95e626d6659f3e4be7e0c7403693	Nov 23 2020, 1:38 PM	★	★

Commit	Parents	Author	Summary	Date
968285e3754a	becb2d7f2bea	Martin von Zweigbergk		Nov 23 2020, 1:38 PM

Status	Author	Revision
Closed	martinvonz	D9390 errors: introduce SecurityError and use it in a few places
Closed	martinvonz	D9389 errors: raise InputError when too few arguments given to alias
Closed	martinvonz	D9388 errors: raise InputError on bad top-level flags
Closed	martinvonz	D9393 errors: raise StateError on uncommitted changes when merge starts
Closed	martinvonz	D9392 errors: raise StateError when there are unresolves merge conflicts
Closed	martinvonz	D9602 errors: raise InputError on recursive template definition
Closed	martinvonz	D9391 errors: raise StateError when push fails because it creates new heads
Closed	martinvonz	D9387 errors: raise InputError on early parse error in dispatch
Closed	martinvonz	D9386 errors: raise more specifc errors from narrowcommands
Closed	martinvonz	D9601 errors: use detailed exit code 50 for StorageError
Closed	martinvonz	D9600 errors: raise InputError if an ambiguous revision id prefix is used
Closed	martinvonz	D9599 localrepo: delete obsolete comment about `prefix in repo` raising exception

Diff 23645

mercurial/dispatch.py

	try:			try:
	name, value = [cfgelem.strip() for cfgelem in cfg.split(b'=', 1)]			name, value = [cfgelem.strip() for cfgelem in cfg.split(b'=', 1)]
	section, name = name.split(b'.', 1)			section, name = name.split(b'.', 1)
	if not section or not name:			if not section or not name:
	raise IndexError			raise IndexError
	ui.setconfig(section, name, value, b'--config')			ui.setconfig(section, name, value, b'--config')
	configs.append((section, name, value))			configs.append((section, name, value))
	except (IndexError, ValueError):			except (IndexError, ValueError):
	raise error.Abort(			raise error.ConfigError(
	_(			_(
	b'malformed --config option: %r '			b'malformed --config option: %r '
	b'(use --config section.name=value)'			b'(use --config section.name=value)'
	)			)
	% pycompat.bytestr(cfg)			% pycompat.bytestr(cfg)
	)			)

	return configs			return configs

tests/test-globalopts.t




	Testing --config:			Testing --config:

	$ hg --cwd c --config paths.quuxfoo=bar paths \| grep quuxfoo > /dev/null && echo quuxfoo			$ hg --cwd c --config paths.quuxfoo=bar paths \| grep quuxfoo > /dev/null && echo quuxfoo
	quuxfoo			quuxfoo
	$ hg --cwd c --config '' tip -q			$ hg --cwd c --config '' tip -q
	abort: malformed --config option: '' (use --config section.name=value)			config error: malformed --config option: '' (use --config section.name=value)
	[255]			[30]
	$ hg --cwd c --config a.b tip -q			$ hg --cwd c --config a.b tip -q
	abort: malformed --config option: 'a.b' (use --config section.name=value)			config error: malformed --config option: 'a.b' (use --config section.name=value)
	[255]			[30]
	$ hg --cwd c --config a tip -q			$ hg --cwd c --config a tip -q
	abort: malformed --config option: 'a' (use --config section.name=value)			config error: malformed --config option: 'a' (use --config section.name=value)
	[255]			[30]
	$ hg --cwd c --config a.= tip -q			$ hg --cwd c --config a.= tip -q
	abort: malformed --config option: 'a.=' (use --config section.name=value)			config error: malformed --config option: 'a.=' (use --config section.name=value)
	[255]			[30]
	$ hg --cwd c --config .b= tip -q			$ hg --cwd c --config .b= tip -q
	abort: malformed --config option: '.b=' (use --config section.name=value)			config error: malformed --config option: '.b=' (use --config section.name=value)
	[255]			[30]

	Testing --debug:			Testing --debug:

	$ hg --cwd c log --debug			$ hg --cwd c log --debug
	changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a			changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
	tag: tip			tag: tip
	phase: public			phase: public
	parent: -1:0000000000000000000000000000000000000000			parent: -1:0000000000000000000000000000000000000000

tests/test-legacy-exit-code.t

	^ here)			^ here)
	[255]			[255]

	$ hg continue			$ hg continue
	abort: no operation in progress			abort: no operation in progress
	[255]			[255]

	$ hg st --config a=b			$ hg st --config a=b
	abort: malformed --config option: 'a=b' (use --config section.name=value)			config error: malformed --config option: 'a=b' (use --config section.name=value)
	[255]			[255]

	$ echo b > a			$ echo b > a
	$ hg ci -m second			$ hg ci -m second
	$ echo c > a			$ echo c > a
	$ hg ci -m third			$ hg ci -m third
	$ hg --config extensions.rebase= rebase -r . -d 0 -q			$ hg --config extensions.rebase= rebase -r . -d 0 -q
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]