This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9311

errors: set detailed exit code to 30 for config errors
ClosedPublic

Authored by martinvonz on Nov 12 2020, 11:37 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGbff719525815: errors: set detailed exit code to 30 for config errors
Summary

This is per https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.

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.

Revision Contents
Changeset List

Diff 23522

mercurial/scmutil.py

coarse_exit_code = 1 coarse_exit_code = 1
except error.WdirUnsupported: except error.WdirUnsupported:
ui.error(_(b"abort: working directory revision cannot be specified\n")) ui.error(_(b"abort: working directory revision cannot be specified\n"))
except error.Abort as inst: except error.Abort as inst:
if isinstance(inst, error.InputError): if isinstance(inst, error.InputError):
detailed_exit_code = 10 detailed_exit_code = 10
elif isinstance(inst, error.StateError): elif isinstance(inst, error.StateError):
detailed_exit_code = 20 detailed_exit_code = 20
elif isinstance(inst, error.ConfigError):
detailed_exit_code = 30
ui.error(_(b"abort: %s\n") % inst.message) ui.error(_(b"abort: %s\n") % inst.message)
if inst.hint: if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint) ui.error(_(b"(%s)\n") % inst.hint)
except error.WorkerError as inst: except error.WorkerError as inst:
# Don't print a message -- the worker already should have # Don't print a message -- the worker already should have
return inst.status_code return inst.status_code
except ImportError as inst: except ImportError as inst:
ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst)) ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst))

tests/test-add.t

$ hg st $ hg st
A a A a
A b A b
#if no-windows #if no-windows
$ echo foo > con.xml $ echo foo > con.xml
$ hg --config ui.portablefilenames=jump add con.xml $ hg --config ui.portablefilenames=jump add con.xml
abort: ui.portablefilenames value is invalid ('jump') abort: ui.portablefilenames value is invalid ('jump')
[255] [30]
$ hg --config ui.portablefilenames=abort add con.xml $ hg --config ui.portablefilenames=abort add con.xml
abort: filename contains 'con', which is reserved on Windows: con.xml abort: filename contains 'con', which is reserved on Windows: con.xml
[255] [255]
$ hg st $ hg st
A a A a
A b A b
? con.xml ? con.xml
$ hg add con.xml $ hg add con.xml

tests/test-convert-git.t

$ echo baz2 >> baz $ echo baz2 >> baz
$ git add bar-copied baz-copied baz-copied2 ba-copy $ git add bar-copied baz-copied baz-copied2 ba-copy
$ commit -a -m 'rename and copy' $ commit -a -m 'rename and copy'
$ cd .. $ cd ..
input validation input validation
$ hg convert --config convert.git.similarity=foo --datesort git-repo2 fullrepo $ hg convert --config convert.git.similarity=foo --datesort git-repo2 fullrepo
abort: convert.git.similarity is not a valid integer ('foo') abort: convert.git.similarity is not a valid integer ('foo')
[255] [30]
$ hg convert --config convert.git.similarity=-1 --datesort git-repo2 fullrepo $ hg convert --config convert.git.similarity=-1 --datesort git-repo2 fullrepo
abort: similarity must be between 0 and 100 abort: similarity must be between 0 and 100
[255] [255]
$ hg convert --config convert.git.similarity=101 --datesort git-repo2 fullrepo $ hg convert --config convert.git.similarity=101 --datesort git-repo2 fullrepo
abort: similarity must be between 0 and 100 abort: similarity must be between 0 and 100
[255] [255]
$ hg -q convert --config convert.git.similarity=100 --datesort git-repo2 fullrepo $ hg -q convert --config convert.git.similarity=100 --datesort git-repo2 fullrepo

tests/test-merge1.t

$ rm b $ rm b
$ echo This is file b2 > b $ echo This is file b2 > b
#endif #endif
bad config bad config
$ hg merge 1 --config merge.checkunknown=x $ hg merge 1 --config merge.checkunknown=x
abort: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn') abort: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn')
[255] [30]
this merge should fail this merge should fail
$ hg merge 1 --config merge.checkunknown=abort $ hg merge 1 --config merge.checkunknown=abort
b: untracked file differs b: untracked file differs
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
this merge should warn this merge should warn
$ hg merge 1 --config merge.checkunknown=warn $ hg merge 1 --config merge.checkunknown=warn

tests/test-phases.t

(Issue3707) (Issue3707)
test invalid phase name test invalid phase name
$ mkcommit I --config phases.new-commit='babar' $ mkcommit I --config phases.new-commit='babar'
transaction abort! transaction abort!
rollback completed rollback completed
abort: phases.new-commit: not a valid phase name ('babar') abort: phases.new-commit: not a valid phase name ('babar')
[255] [30]
Test phase command Test phase command
=================== ===================
initial picture initial picture
$ hg log -G --template "{rev} {phase} {desc}\n" $ hg log -G --template "{rev} {phase} {desc}\n"
@ 7 secret merge B' and E @ 7 secret merge B' and E
|\ |\

tests/test-repo-compengines.t

$ hg init zlib-level-invalid $ hg init zlib-level-invalid
$ cat << EOF >> zlib-level-invalid/.hg/hgrc $ cat << EOF >> zlib-level-invalid/.hg/hgrc
> [storage] > [storage]
> revlog.zlib.level=foobar > revlog.zlib.level=foobar
> EOF > EOF
$ commitone zlib-level-invalid $ commitone zlib-level-invalid
abort: storage.revlog.zlib.level is not a valid integer ('foobar') abort: storage.revlog.zlib.level is not a valid integer ('foobar')
abort: storage.revlog.zlib.level is not a valid integer ('foobar') abort: storage.revlog.zlib.level is not a valid integer ('foobar')
[255] [30]
$ hg init zlib-level-out-of-range $ hg init zlib-level-out-of-range
$ cat << EOF >> zlib-level-out-of-range/.hg/hgrc $ cat << EOF >> zlib-level-out-of-range/.hg/hgrc
> [storage] > [storage]
> revlog.zlib.level=42 > revlog.zlib.level=42
> EOF > EOF
$ commitone zlib-level-out-of-range $ commitone zlib-level-out-of-range
$ hg init zstd-level-invalid --config format.revlog-compression=zstd $ hg init zstd-level-invalid --config format.revlog-compression=zstd
$ cat << EOF >> zstd-level-invalid/.hg/hgrc $ cat << EOF >> zstd-level-invalid/.hg/hgrc
> [storage] > [storage]
> revlog.zstd.level=foobar > revlog.zstd.level=foobar
> EOF > EOF
$ commitone zstd-level-invalid $ commitone zstd-level-invalid
abort: storage.revlog.zstd.level is not a valid integer ('foobar') abort: storage.revlog.zstd.level is not a valid integer ('foobar')
abort: storage.revlog.zstd.level is not a valid integer ('foobar') abort: storage.revlog.zstd.level is not a valid integer ('foobar')
[255] [30]
$ hg init zstd-level-out-of-range --config format.revlog-compression=zstd $ hg init zstd-level-out-of-range --config format.revlog-compression=zstd
$ cat << EOF >> zstd-level-out-of-range/.hg/hgrc $ cat << EOF >> zstd-level-out-of-range/.hg/hgrc
> [storage] > [storage]
> revlog.zstd.level=42 > revlog.zstd.level=42
> EOF > EOF
$ commitone zstd-level-out-of-range $ commitone zstd-level-out-of-range
abort: invalid value for `storage.revlog.zstd.level` config: 42 abort: invalid value for `storage.revlog.zstd.level` config: 42
abort: invalid value for `storage.revlog.zstd.level` config: 42 abort: invalid value for `storage.revlog.zstd.level` config: 42
[255] [255]
#endif #endif