This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D11831 errors: use detailed error for invalid commit-extras argument
Closed	martinvonz	D11830 errors: use detailed exit code in pathauditor
Closed	martinvonz	D11829 errors: use detailed exit code for RepoLookupError
Closed	martinvonz	D11828 errors: use detailed exit code for detected case-collision
Closed	martinvonz	D11827 errors: use detailed exit code when trying to merge file outside narrowspec
Closed	martinvonz	D11826 errors: use detailed exit code for non-integer number of diff context lines
Closed	martinvonz	D11825 patch: add hint about mangled whitespace on bad patch
Closed	martinvonz	D11824 errors: return more detailed errors when failing to parse or apply patch

Diff 31218

	def commit(self, innerpats, *inneropts):			def commit(self, innerpats, *inneropts):
	extras = opts.get('extra')			extras = opts.get('extra')
	for raw in extras:			for raw in extras:
	if b'=' not in raw:			if b'=' not in raw:
	msg = _(			msg = _(
	b"unable to parse '%s', should follow "			b"unable to parse '%s', should follow "
	b"KEY=VALUE format"			b"KEY=VALUE format"
	)			)
	raise error.Abort(msg % raw)			raise error.InputError(msg % raw)
	k, v = raw.split(b'=', 1)			k, v = raw.split(b'=', 1)
	if not k:			if not k:
	msg = _(b"unable to parse '%s', keys can't be empty")			msg = _(b"unable to parse '%s', keys can't be empty")
	raise error.Abort(msg % raw)			raise error.InputError(msg % raw)
	if re.search(br'[^\w-]', k):			if re.search(br'[^\w-]', k):
	msg = _(			msg = _(
	b"keys can only contain ascii letters, digits,"			b"keys can only contain ascii letters, digits,"
	b" '_' and '-'"			b" '_' and '-'"
	)			)
	raise error.Abort(msg)			raise error.InputError(msg)
	if k in usedinternally:			if k in usedinternally:
	msg = _(			msg = _(
	b"key '%s' is used internally, can't be set "			b"key '%s' is used internally, can't be set "
	b"manually"			b"manually"
	)			)
	raise error.Abort(msg % k)			raise error.InputError(msg % k)
	inneropts['extra'][k] = v			inneropts['extra'][k] = v
	return super(repoextra, self).commit(innerpats, *inneropts)			return super(repoextra, self).commit(innerpats, *inneropts)

	repo.__class__ = repoextra			repo.__class__ = repoextra
	return orig(ui, repo, pats, *opts)			return orig(ui, repo, pats, *opts)


	$ echo "[extensions]" >> $HGRCPATH			$ echo "[extensions]" >> $HGRCPATH
	$ echo "commitextras=" >> $HGRCPATH			$ echo "commitextras=" >> $HGRCPATH
	$ hg status			$ hg status
	? quux			? quux
	$ hg add quux			$ hg add quux
	$ hg commit -m "adding internal used extras" --extra amend_source=hash			$ hg commit -m "adding internal used extras" --extra amend_source=hash
	abort: key 'amend_source' is used internally, can't be set manually			abort: key 'amend_source' is used internally, can't be set manually
	[255]			[10]
	$ hg commit -m "special chars in extra" --extra id@phab=214			$ hg commit -m "special chars in extra" --extra id@phab=214
	abort: keys can only contain ascii letters, digits, '_' and '-'			abort: keys can only contain ascii letters, digits, '_' and '-'
	[255]			[10]
	$ hg commit -m "empty key" --extra =value			$ hg commit -m "empty key" --extra =value
	abort: unable to parse '=value', keys can't be empty			abort: unable to parse '=value', keys can't be empty
	[255]			[10]
	$ hg commit -m "adding extras" --extra sourcehash=foo --extra oldhash=bar			$ hg commit -m "adding extras" --extra sourcehash=foo --extra oldhash=bar
	$ hg log -r . -T '{extras % "{extra}\n"}'			$ hg log -r . -T '{extras % "{extra}\n"}'
	branch=default			branch=default
	oldhash=bar			oldhash=bar
	sourcehash=foo			sourcehash=foo

	Failed commit with --addremove should not update dirstate			Failed commit with --addremove should not update dirstate