This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11497

errors: use InputError for bad --similarity value
ClosedPublic

Authored by martinvonz on Sep 23 2021, 2:25 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5b89626c11e9: errors: use InputError for bad --similarity value

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

martinvonz created this revision.Sep 23 2021, 2:25 PM
Alphare accepted this revision.Sep 24 2021, 6:24 AM
This revision is now accepted and ready to land.Sep 24 2021, 6:24 AM
martinvonz added a commit: rHG5b89626c11e9: errors: use InputError for bad --similarity value.Sep 24 2021, 8:05 AM
Closed by commit rHG5b89626c11e9: errors: use InputError for bad --similarity value (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (4 lines)
Mtests/test-addremove-similar.t (6 lines)

Diff 30396

mercurial/scmutil.py

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()):

tests/test-addremove-similar.t

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