This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D11498 errors: use InputError for bad path arguments to `hg annotate`
Closed	martinvonz	D11497 errors: use InputError for bad --similarity value
Closed	martinvonz	D11496 errors: use InputError for some invalid revsets and such

Diff 30393

	def addremove(repo, matcher, prefix, uipathfn, opts=None):			def addremove(repo, matcher, prefix, uipathfn, opts=None):
	if opts is None:			if opts is None:
	opts = {}			opts = {}
	m = matcher			m = matcher
	dry_run = opts.get(b'dry_run')			dry_run = opts.get(b'dry_run')
	try:			try:
	similarity = float(opts.get(b'similarity') or 0)			similarity = float(opts.get(b'similarity') or 0)
	except ValueError:			except ValueError:
	raise error.Abort(_(b'similarity must be a number'))			raise error.InputError(_(b'similarity must be a number'))
	if similarity < 0 or similarity > 100:			if similarity < 0 or similarity > 100:
	raise error.Abort(_(b'similarity must be between 0 and 100'))			raise error.InputError(_(b'similarity must be between 0 and 100'))
	similarity /= 100.0			similarity /= 100.0

	ret = 0			ret = 0

	wctx = repo[None]			wctx = repo[None]
	for subpath in sorted(wctx.substate):			for subpath in sorted(wctx.substate):
	submatch = matchmod.subdirmatcher(subpath, m)			submatch = matchmod.subdirmatcher(subpath, m)
	if opts.get(b'subrepos') or m.exact(subpath) or any(submatch.files()):			if opts.get(b'subrepos') or m.exact(subpath) or any(submatch.files()):

	adding a			adding a
	recording removal of 0 as rename to a (99% similar)			recording removal of 0 as rename to a (99% similar)
	$ hg commit -m 'always the same file should be selected'			$ hg commit -m 'always the same file should be selected'

	should all fail			should all fail

	$ hg addremove -s foo			$ hg addremove -s foo
	abort: similarity must be a number			abort: similarity must be a number
	[255]			[10]
	$ hg addremove -s -1			$ hg addremove -s -1
	abort: similarity must be between 0 and 100			abort: similarity must be between 0 and 100
	[255]			[10]
	$ hg addremove -s 1e6			$ hg addremove -s 1e6
	abort: similarity must be between 0 and 100			abort: similarity must be between 0 and 100
	[255]			[10]

	$ cd ..			$ cd ..

	Issue1527: repeated addremove causes Abort			Issue1527: repeated addremove causes Abort

	$ hg init rep3; cd rep3			$ hg init rep3; cd rep3
	$ mkdir d			$ mkdir d
	$ echo a > d/a			$ echo a > d/a