This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D9385 errors: raise InputError on bad bookmark argument
Closed	martinvonz	D9384 errors: raise ConfigError on bad alias definition
Closed	martinvonz	D9383 errors: raise InputError on bad repo arguments
Closed	martinvonz	D9382 errors: drop trailing "!" for some errors about bookmarks
Closed	martinvonz	D9381 errors: remove trailing "!" in messages about bad top-level args
Closed	martinvonz	D9380 errors: remove trailing "!" in messages about creating new heads on push
Closed	martinvonz	D9379 errors: consistently don't use trailing "!" in "not found in manifest" message
Closed	martinvonz	D9378 errors: remove trailing "!" from some error messages for consistency

Diff 23663

mercurial/dispatch.py


	fullargs = args			fullargs = args
	cmd, func, args, options, cmdoptions = _parse(lui, args)			cmd, func, args, options, cmdoptions = _parse(lui, args)

	# store the canonical command name in request object for later access			# store the canonical command name in request object for later access
	req.canonical_command = cmd			req.canonical_command = cmd

	if options[b"config"] != req.earlyoptions[b"config"]:			if options[b"config"] != req.earlyoptions[b"config"]:
	raise error.Abort(_(b"option --config may not be abbreviated!"))			raise error.Abort(_(b"option --config may not be abbreviated"))
	if options[b"cwd"] != req.earlyoptions[b"cwd"]:			if options[b"cwd"] != req.earlyoptions[b"cwd"]:
	raise error.Abort(_(b"option --cwd may not be abbreviated!"))			raise error.Abort(_(b"option --cwd may not be abbreviated"))
	if options[b"repository"] != req.earlyoptions[b"repository"]:			if options[b"repository"] != req.earlyoptions[b"repository"]:
	raise error.Abort(			raise error.Abort(
	_(			_(
	b"option -R has to be separated from other options (e.g. not "			b"option -R has to be separated from other options (e.g. not "
	b"-qR) and --repository may only be abbreviated as --repo!"			b"-qR) and --repository may only be abbreviated as --repo"
	)			)
	)			)
	if options[b"debugger"] != req.earlyoptions[b"debugger"]:			if options[b"debugger"] != req.earlyoptions[b"debugger"]:
	raise error.Abort(_(b"option --debugger may not be abbreviated!"))			raise error.Abort(_(b"option --debugger may not be abbreviated"))
	# don't validate --profile/--traceback, which can be enabled from now			# don't validate --profile/--traceback, which can be enabled from now

	if options[b"encoding"]:			if options[b"encoding"]:
	encoding.encoding = options[b"encoding"]			encoding.encoding = options[b"encoding"]
	if options[b"encodingmode"]:			if options[b"encodingmode"]:
	encoding.encodingmode = options[b"encodingmode"]			encoding.encodingmode = options[b"encodingmode"]
	if options[b"time"]:			if options[b"time"]:

tests/test-dispatch.t

	[1]			[1]
	$ hg cat -- --debugger			$ hg cat -- --debugger
	--debugger: no such file in rev cb9a9f314b8b			--debugger: no such file in rev cb9a9f314b8b
	[1]			[1]

	Unparsable form of early options:			Unparsable form of early options:

	$ hg cat --debugg			$ hg cat --debugg
	abort: option --debugger may not be abbreviated!			abort: option --debugger may not be abbreviated
	[255]			[255]

	Parsing failure of early options should be detected before executing the			Parsing failure of early options should be detected before executing the
	command:			command:

	$ hg log -b '--config=hooks.pre-log=false' default			$ hg log -b '--config=hooks.pre-log=false' default
	abort: option --config may not be abbreviated!			abort: option --config may not be abbreviated
	[255]			[255]
	$ hg log -b -R. default			$ hg log -b -R. default
	abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!			abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
	[255]			[255]
	$ hg log --cwd .. -b --cwd=. default			$ hg log --cwd .. -b --cwd=. default
	abort: option --cwd may not be abbreviated!			abort: option --cwd may not be abbreviated
	[255]			[255]

	However, we can't prevent it from loading extensions and configs:			However, we can't prevent it from loading extensions and configs:

	$ cat <<EOF > bad.py			$ cat <<EOF > bad.py
	> raise Exception('bad')			> raise Exception('bad')
	> EOF			> EOF
	$ hg log -b '--config=extensions.bad=bad.py' default			$ hg log -b '--config=extensions.bad=bad.py' default
	*** failed to import extension bad from bad.py: bad			*** failed to import extension bad from bad.py: bad
	abort: option --config may not be abbreviated!			abort: option --config may not be abbreviated
	[255]			[255]

	$ mkdir -p badrepo/.hg			$ mkdir -p badrepo/.hg
	$ echo 'invalid-syntax' > badrepo/.hg/hgrc			$ echo 'invalid-syntax' > badrepo/.hg/hgrc
	$ hg log -b -Rbadrepo default			$ hg log -b -Rbadrepo default
	config error at badrepo/.hg/hgrc:1: invalid-syntax			config error at badrepo/.hg/hgrc:1: invalid-syntax
	[30]			[30]


	$ hg log -b '--config=alias.log=log --config=hooks.pre-log=false'			$ hg log -b '--config=alias.log=log --config=hooks.pre-log=false'
	hg log: option -b not recognized			hg log: option -b not recognized
	error in definition for alias 'log': --config may only be given on the command			error in definition for alias 'log': --config may only be given on the command
	line			line
	[255]			[255]

	$ hg log -b '--config=defaults.log=--config=hooks.pre-log=false'			$ hg log -b '--config=defaults.log=--config=hooks.pre-log=false'
	abort: option --config may not be abbreviated!			abort: option --config may not be abbreviated
	[255]			[255]

	Shell aliases bypass any command parsing rules but for the early one:			Shell aliases bypass any command parsing rules but for the early one:

	$ hg log -b '--config=alias.log=!echo howdy'			$ hg log -b '--config=alias.log=!echo howdy'
	howdy			howdy

	Early options must come first if HGPLAIN=+strictflags is specified:			Early options must come first if HGPLAIN=+strictflags is specified:
	$ HGPLAIN=+strictflags hg log -b --debugger default			$ HGPLAIN=+strictflags hg log -b --debugger default
	abort: unknown revision '--debugger'			abort: unknown revision '--debugger'
	[255]			[255]
	$ HGPLAIN=+strictflags hg log -b --config='alias.log=!echo pwned' default			$ HGPLAIN=+strictflags hg log -b --config='alias.log=!echo pwned' default
	abort: unknown revision '--config=alias.log=!echo pwned'			abort: unknown revision '--config=alias.log=!echo pwned'
	[255]			[255]

	$ HGPLAIN=+strictflags hg log --config='hooks.pre-log=false' -b default			$ HGPLAIN=+strictflags hg log --config='hooks.pre-log=false' -b default
	abort: option --config may not be abbreviated!			abort: option --config may not be abbreviated
	[255]			[255]
	$ HGPLAIN=+strictflags hg log -q --cwd=.. -b default			$ HGPLAIN=+strictflags hg log -q --cwd=.. -b default
	abort: option --cwd may not be abbreviated!			abort: option --cwd may not be abbreviated
	[255]			[255]
	$ HGPLAIN=+strictflags hg log -q -R . -b default			$ HGPLAIN=+strictflags hg log -q -R . -b default
	abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!			abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
	[255]			[255]

	$ HGPLAIN=+strictflags hg --config='hooks.pre-log=false' log -b default			$ HGPLAIN=+strictflags hg --config='hooks.pre-log=false' log -b default
	abort: pre-log hook exited with status 1			abort: pre-log hook exited with status 1
	[255]			[255]
	$ HGPLAIN=+strictflags hg --cwd .. -q -Ra log -b default			$ HGPLAIN=+strictflags hg --cwd .. -q -Ra log -b default
	0:cb9a9f314b8b			0:cb9a9f314b8b
	$ HGPLAIN=+strictflags hg --cwd .. -q --repository a log -b default			$ HGPLAIN=+strictflags hg --cwd .. -q --repository a log -b default

tests/test-globalopts.t

	earlygetopt short option without following space:			earlygetopt short option without following space:

	$ hg -q -Rb tip			$ hg -q -Rb tip
	0:b6c483daf290			0:b6c483daf290

	earlygetopt with illegal abbreviations:			earlygetopt with illegal abbreviations:

	$ hg --confi "foo.bar=baz"			$ hg --confi "foo.bar=baz"
	abort: option --config may not be abbreviated!			abort: option --config may not be abbreviated
	[255]			[255]
	$ hg --cw a tip			$ hg --cw a tip
	abort: option --cwd may not be abbreviated!			abort: option --cwd may not be abbreviated
	[255]			[255]
	$ hg --rep a tip			$ hg --rep a tip
	abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!			abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
	[255]			[255]
	$ hg --repositor a tip			$ hg --repositor a tip
	abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!			abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
	[255]			[255]
	$ hg -qR a tip			$ hg -qR a tip
	abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!			abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
	[255]			[255]
	$ hg -qRa tip			$ hg -qRa tip
	abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!			abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
	[255]			[255]

	Testing --cwd:			Testing --cwd:

	$ hg --cwd a parents			$ hg --cwd a parents
	changeset: 0:8580ff50825a			changeset: 0:8580ff50825a
	tag: tip			tag: tip
	user: test			user: test

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23638		Nov 23 2020, 6:30 PM	★	★
Diff 2	23663	rHGca39c45014fa41241e572fb889a00d03fd02b26c	Nov 23 2020, 3:47 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

errors: remove trailing "!" in messages about bad top-level argsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23663

mercurial/dispatch.py

tests/test-dispatch.t

tests/test-globalopts.t

errors: remove trailing "!" in messages about bad top-level args
ClosedPublic

Revision Contents
Changeset List