This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9355

errors: raise ConfigError on failure to parse config file
ClosedPublic

Authored by martinvonz on Nov 20 2020, 7:25 PM.

Details

Reviewers
durin42
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG9dc1351d0b5f: errors: raise ConfigError on failure to parse config file
Summary

This replaces two raises of ParseError by ConfigError, which makes
it so we get the desired exit code when ui.detailed-exit-code is
enabled. Because the exceptions include a location, I had to add that
to ConfigError as well. I considered making ConfigError a subclass
of ParseError, but it doesn't feel like it quite passes the "is-a"
test.

I used "config error: " as prefix for these errors instead of the
previous "hg: parse error: ", which seems a little less accurate now
(and, as I've said before, I don't know what the "hg: " part is
supposed to signify anyway). I can easily be convinced to change the
prefix to something else (including "abort: ").

Some of the exceptions raised here mean that we fail to even load the
ui object in the dispatch module. When that happens, we don't know
to use detailed exit codes, so some tests (e.g. test-hgrc.t) still
see exit code 255. I'll try to get back to that later. It should be
possible to give detailed exit codes if at least part of the config
can be read (e.g. when the system-wide one enables detailed exit codes
and the user's config fails to parse).

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.Nov 20 2020, 7:25 PM
mharbison72 added a subscriber: mharbison72.Nov 20 2020, 9:40 PM
mharbison72 added inline comments.
tests/test-hgrc.t
20

Why do the exit codes in the first couple of tests above get converted to 30 for ConfigError, but not here?

martinvonz added inline comments.Nov 21 2020, 12:56 AM
tests/test-hgrc.t
20

Ah, good question! The explanation is in the commit message of D9355 (we can't enable detailed exit codes if we fail to parse the config file that would tell us to do so, although we can probably do a little better than we do here). Now that I've fixed your comment there about using ConfigError and exit code 30, that comment belongs in this commit. I'll move it here in a bit.

martinvonz edited the summary of this revision. (Show Details)Nov 21 2020, 1:35 AM
mharbison72 accepted this revision.Nov 21 2020, 3:10 PM
This revision is now accepted and ready to land.Nov 21 2020, 3:10 PM

Revision Contents
Changeset List

Diff 23614

hgext/eol.py

# Cannot use workingctx.data() since it would load # Cannot use workingctx.data() since it would load
# and cache the filters before we configure them. # and cache the filters before we configure them.
data = repo.wvfs(b'.hgeol').read() data = repo.wvfs(b'.hgeol').read()
else: else:
data = repo[node][b'.hgeol'].data() data = repo[node][b'.hgeol'].data()
return eolfile(ui, repo.root, data) return eolfile(ui, repo.root, data)
except (IOError, LookupError): except (IOError, LookupError):
pass pass
except errormod.ParseError as inst: except errormod.ConfigError as inst:
ui.warn( ui.warn(
_( _(
b"warning: ignoring .hgeol file due to parse error " b"warning: ignoring .hgeol file due to parse error "
b"at %s: %s\n" b"at %s: %s\n"
) )
% (inst.location, inst.message) % (inst.location, inst.message)
) )
return None return None

mercurial/config.py

m = includere.match(l) m = includere.match(l)
if m and include: if m and include:
expanded = util.expandpath(m.group(1)) expanded = util.expandpath(m.group(1))
try: try:
include(expanded, remap=remap, sections=sections) include(expanded, remap=remap, sections=sections)
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise error.ParseError( raise error.ConfigError(
_(b"cannot include %s (%s)") _(b"cannot include %s (%s)")
% (expanded, encoding.strtolocal(inst.strerror)), % (expanded, encoding.strtolocal(inst.strerror)),
b"%s:%d" % (src, line), b"%s:%d" % (src, line),
) )
continue continue
if emptyre.match(l): if emptyre.match(l):
continue continue
m = sectionre.match(l) m = sectionre.match(l)
self._data[section] = self._data[section].preparewrite() self._data[section] = self._data[section].preparewrite()
del self._data[section][name] del self._data[section][name]
self._unset.append((section, name)) self._unset.append((section, name))
continue continue
message = l.rstrip() message = l.rstrip()
if l.startswith(b' '): if l.startswith(b' '):
message = b"unexpected leading whitespace: %s" % message message = b"unexpected leading whitespace: %s" % message
raise error.ParseError(message, (b"%s:%d" % (src, line))) raise error.ConfigError(message, (b"%s:%d" % (src, line)))
def read(self, path, fp=None, sections=None, remap=None): def read(self, path, fp=None, sections=None, remap=None):
if not fp: if not fp:
fp = util.posixfile(path, b'rb') fp = util.posixfile(path, b'rb')
assert getattr(fp, 'mode', 'rb') == 'rb', ( assert getattr(fp, 'mode', 'rb') == 'rb', (
b'config files must be opened in binary mode, got fp=%r mode=%r' b'config files must be opened in binary mode, got fp=%r mode=%r'
% (fp, fp.mode,) % (fp, fp.mode,)
) )

mercurial/error.py

"""raised when a validation hook fails, aborting an operation """raised when a validation hook fails, aborting an operation
Exists to allow more specialized catching.""" Exists to allow more specialized catching."""
class ConfigError(Abort): class ConfigError(Abort):
"""Exception raised when parsing config files""" """Exception raised when parsing config files"""
def __init__(self, message, location=None, hint=None):
super(ConfigError, self).__init__(message, hint=hint)
self.location = location
def format(self):
from .i18n import _
if self.location is not None:
message = _(b"config error at %s: %s\n") % (
pycompat.bytestr(self.location),
self.message,
)
else:
message = _(b"config error: %s\n") % self.message
if self.hint:
message += _(b"(%s)\n") % self.hint
return message
class UpdateAbort(Abort): class UpdateAbort(Abort):
"""Raised when an update is aborted for destination issue""" """Raised when an update is aborted for destination issue"""
class MergeDestAbort(Abort): class MergeDestAbort(Abort):
"""Raised when an update is aborted for destination issues""" """Raised when an update is aborted for destination issues"""

mercurial/ui.py

self, filename, fp, root=None, trust=False, sections=None, remap=None self, filename, fp, root=None, trust=False, sections=None, remap=None
): ):
with fp: with fp:
cfg = config.config() cfg = config.config()
trusted = sections or trust or self._trusted(fp, filename) trusted = sections or trust or self._trusted(fp, filename)
try: try:
cfg.read(filename, fp, sections=sections, remap=remap) cfg.read(filename, fp, sections=sections, remap=remap)
except error.ParseError as inst: except error.ConfigError as inst:
if trusted: if trusted:
raise raise
self.warn( self.warn(
_(b'ignored %s: %s\n') % (inst.location, inst.message) _(b'ignored %s: %s\n') % (inst.location, inst.message)
) )
self._applyconfig(cfg, trusted, root) self._applyconfig(cfg, trusted, root)

tests/test-add.t

b already tracked! b already tracked!
$ 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') config error: ui.portablefilenames value is invalid ('jump')
[30] [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
[10] [10]
$ hg st $ hg st
A a A a
A b A b
? con.xml ? con.xml

tests/test-audit-subrepo.t

on commit: on commit:
$ hg init emptypath $ hg init emptypath
$ cd emptypath $ cd emptypath
$ hg init sub $ hg init sub
$ echo '= sub' >> .hgsub $ echo '= sub' >> .hgsub
$ hg ci -qAm 'add subrepo ""' $ hg ci -qAm 'add subrepo ""'
hg: parse error at .hgsub:1: = sub config error at .hgsub:1: = sub
[255] [30]
prepare tampered repo (including the commit above): prepare tampered repo (including the commit above):
$ hg import --bypass -qm 'add subrepo ""' - <<'EOF' $ hg import --bypass -qm 'add subrepo ""' - <<'EOF'
> diff --git a/.hgsub b/.hgsub > diff --git a/.hgsub b/.hgsub
> new file mode 100644 > new file mode 100644
> --- /dev/null > --- /dev/null
> +++ b/.hgsub > +++ b/.hgsub
> @@ -0,0 +1,1 @@ > @@ -0,0 +1,1 @@
> += sub > += sub
> diff --git a/.hgsubstate b/.hgsubstate > diff --git a/.hgsubstate b/.hgsubstate
> new file mode 100644 > new file mode 100644
> --- /dev/null > --- /dev/null
> +++ b/.hgsubstate > +++ b/.hgsubstate
> @@ -0,0 +1,1 @@ > @@ -0,0 +1,1 @@
> +0000000000000000000000000000000000000000 > +0000000000000000000000000000000000000000
> EOF > EOF
$ cd .. $ cd ..
on clone (and update): on clone (and update):
$ hg clone -q emptypath emptypath2 $ hg clone -q emptypath emptypath2
hg: parse error at .hgsub:1: = sub config error at .hgsub:1: = sub
[255] [30]
Test current path Test current path
----------------- -----------------
on commit: on commit:
$ hg init currentpath $ hg init currentpath
$ cd currentpath $ cd currentpath

tests/test-config.t

hide outer repo hide outer repo
$ hg init $ hg init
Invalid syntax: no value Invalid syntax: no value
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> novaluekey > novaluekey
> EOF > EOF
$ hg showconfig $ hg showconfig
hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey config error at $TESTTMP/.hg/hgrc:1: novaluekey
[255] [30]
Invalid syntax: no key Invalid syntax: no key
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> =nokeyvalue > =nokeyvalue
> EOF > EOF
$ hg showconfig $ hg showconfig
hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue config error at $TESTTMP/.hg/hgrc:1: =nokeyvalue
[255] [30]
Test hint about invalid syntax from leading white space Test hint about invalid syntax from leading white space
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> key=value > key=value
> EOF > EOF
$ hg showconfig $ hg showconfig
hg: parse error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: key=value config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: key=value
[255] [30]
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [section] > [section]
> key=value > key=value
> EOF > EOF
$ hg showconfig $ hg showconfig
hg: parse error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: [section] config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: [section]
[255] [30]
Reset hgrc Reset hgrc
$ echo > .hg/hgrc $ echo > .hg/hgrc
Test case sensitive configuration Test case sensitive configuration
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH

tests/test-convert-git.t

$ cp baz ba-copy $ cp baz ba-copy
$ 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') config error: convert.git.similarity is not a valid integer ('foo')
[30] [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]

tests/test-default-push.t

1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> b/a $ echo b >> b/a
$ hg --cwd b ci -mb $ hg --cwd b ci -mb
Push should provide a hint when both 'default' and 'default-push' not set: Push should provide a hint when both 'default' and 'default-push' not set:
$ cd c $ cd c
$ hg push --config paths.default= $ hg push --config paths.default=
abort: default repository not configured! config error: default repository not configured!
(see 'hg help config.paths') (see 'hg help config.paths')
[30] [30]
$ cd .. $ cd ..
Push should push to 'default' when 'default-push' not set: Push should push to 'default' when 'default-push' not set:
$ hg --cwd b push $ hg --cwd b push

tests/test-dispatch.t

$ 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
hg: parse error at badrepo/.hg/hgrc:1: invalid-syntax config error at badrepo/.hg/hgrc:1: invalid-syntax
[255] [30]
$ hg log -b --cwd=inexistent default $ hg log -b --cwd=inexistent default
abort: $ENOENT$: 'inexistent' abort: $ENOENT$: 'inexistent'
[255] [255]
$ hg log -b '--config=ui.traceback=yes' 2>&1 | grep '^Traceback' $ hg log -b '--config=ui.traceback=yes' 2>&1 | grep '^Traceback'
Traceback (most recent call last): Traceback (most recent call last):
$ hg log -b '--config=profiling.enabled=yes' 2>&1 | grep -i sample $ hg log -b '--config=profiling.enabled=yes' 2>&1 | grep -i sample

tests/test-hgrc.t

$ HGRC=`pwd`/hgrc $ HGRC=`pwd`/hgrc
$ export HGRC $ export HGRC
Basic syntax error Basic syntax error
$ echo "invalid" > $HGRC $ echo "invalid" > $HGRC
$ hg version $ hg version
hg: parse error at $TESTTMP/hgrc:1: invalid config error at $TESTTMP/hgrc:1: invalid
[255] [255]
mharbison72Unsubmitted
Not Done

Why do the exit codes in the first couple of tests above get converted to 30 for ConfigError, but not here?

mharbison72: Why do the exit codes in the first couple of tests above get converted to 30 for ConfigError…
martinvonzAuthorUnsubmitted
Done

Ah, good question! The explanation is in the commit message of D9355 (we can't enable detailed exit codes if we fail to parse the config file that would tell us to do so, although we can probably do a little better than we do here). Now that I've fixed your comment there about using ConfigError and exit code 30, that comment belongs in this commit. I'll move it here in a bit.

martinvonz: Ah, good question! The explanation is in the commit message of D9355 (we can't enable detailed…
$ echo "" > $HGRC $ echo "" > $HGRC
Issue1199: Can't use '%' in hgrc (eg url encoded username) Issue1199: Can't use '%' in hgrc (eg url encoded username)
$ hg init "foo%bar" $ hg init "foo%bar"
$ hg clone "foo%bar" foobar $ hg clone "foo%bar" foobar
updating to branch default updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo '[section]' > $TESTTMP/included $ echo '[section]' > $TESTTMP/included
$ echo 'option = value' >> $TESTTMP/included $ echo 'option = value' >> $TESTTMP/included
$ echo '%include $TESTTMP/included' >> $HGRC $ echo '%include $TESTTMP/included' >> $HGRC
$ hg showconfig section $ hg showconfig section
section.option=value section.option=value
#if unix-permissions no-root #if unix-permissions no-root
$ chmod u-r $TESTTMP/included $ chmod u-r $TESTTMP/included
$ hg showconfig section $ hg showconfig section
hg: parse error at $TESTTMP/hgrc:2: cannot include $TESTTMP/included (Permission denied) config error at $TESTTMP/hgrc:2: cannot include $TESTTMP/included (Permission denied)
[255] [255]
#endif #endif
issue1829: wrong indentation issue1829: wrong indentation
$ echo '[foo]' > $HGRC $ echo '[foo]' > $HGRC
$ echo ' x = y' >> $HGRC $ echo ' x = y' >> $HGRC
$ hg version $ hg version
hg: parse error at $TESTTMP/hgrc:2: unexpected leading whitespace: x = y config error at $TESTTMP/hgrc:2: unexpected leading whitespace: x = y
[255] [255]
$ "$PYTHON" -c "from __future__ import print_function; print('[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n')" \ $ "$PYTHON" -c "from __future__ import print_function; print('[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n')" \
> > $HGRC > > $HGRC
$ hg showconfig foo $ hg showconfig foo
foo.bar=a\nb\nc\nde\nfg foo.bar=a\nb\nc\nde\nfg
foo.baz=bif cb foo.baz=bif cb
$ HGRCSKIPREPO=1 hg path $ HGRCSKIPREPO=1 hg path
foo = $TESTTMP/bar foo = $TESTTMP/bar
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [broken > [broken
> EOF > EOF
$ hg path $ hg path
hg: parse error at $TESTTMP/.hg/hgrc:3: [broken config error at $TESTTMP/.hg/hgrc:3: [broken
[255] [255]
$ HGRCSKIPREPO=1 hg path $ HGRCSKIPREPO=1 hg path
foo = $TESTTMP/bar foo = $TESTTMP/bar
Check that hgweb respect HGRCSKIPREPO=1 Check that hgweb respect HGRCSKIPREPO=1
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
hg: parse error at $TESTTMP/.hg/hgrc:3: [broken config error at $TESTTMP/.hg/hgrc:3: [broken
[255] [255]
$ test -f hg.pid && (cat hg.pid >> $DAEMON_PIDS) $ test -f hg.pid && (cat hg.pid >> $DAEMON_PIDS)
[1] [1]
$ killdaemons.py $ killdaemons.py
$ test -f access.log && cat access.log $ test -f access.log && cat access.log
[1] [1]
$ test -f errors.log && cat errors.log $ test -f errors.log && cat errors.log
[1] [1]
$ HGRCSKIPREPO=1 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ HGRCSKIPREPO=1 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ killdaemons.py $ killdaemons.py
$ cat access.log $ cat access.log
$ cat errors.log $ cat errors.log
Check that zeroconf respect HGRCSKIPREPO=1 Check that zeroconf respect HGRCSKIPREPO=1
$ hg paths --config extensions.zeroconf= $ hg paths --config extensions.zeroconf=
hg: parse error at $TESTTMP/.hg/hgrc:3: [broken config error at $TESTTMP/.hg/hgrc:3: [broken
[255] [255]
$ HGRCSKIPREPO=1 hg paths --config extensions.zeroconf= $ HGRCSKIPREPO=1 hg paths --config extensions.zeroconf=
foo = $TESTTMP/bar foo = $TESTTMP/bar

tests/test-histedit-arguments.t

> pick c8e68270e35a 3 four > pick c8e68270e35a 3 four
> pick 08d98a8350f3 4 five > pick 08d98a8350f3 4 five
> EOF > EOF
Test invalid config default Test invalid config default
--------------------------- ---------------------------
$ hg histedit --config "histedit.defaultrev=" $ hg histedit --config "histedit.defaultrev="
abort: config option histedit.defaultrev can't be empty config error: config option histedit.defaultrev can't be empty
[30] [30]
Run on a revision not descendants of the initial parent Run on a revision not descendants of the initial parent
-------------------------------------------------------------------- --------------------------------------------------------------------
Test the message shown for inconsistent histedit state, which may be Test the message shown for inconsistent histedit state, which may be
created (and forgotten) by Mercurial earlier than 2.7. This emulates created (and forgotten) by Mercurial earlier than 2.7. This emulates
Mercurial earlier than 2.7 by renaming ".hg/histedit-state" Mercurial earlier than 2.7 by renaming ".hg/histedit-state"

tests/test-lfs.t

$ cat > .hglfs << EOF $ cat > .hglfs << EOF
> [track] > [track]
> **.test = size(">5B") > **.test = size(">5B")
> bad file ... no commit > bad file ... no commit
> EOF > EOF
$ echo x > file.txt $ echo x > file.txt
$ hg ci -Aqm 'should fail' $ hg ci -Aqm 'should fail'
hg: parse error at .hglfs:3: bad file ... no commit config error at .hglfs:3: bad file ... no commit
[255] [30]
$ cat > .hglfs << EOF $ cat > .hglfs << EOF
> [track] > [track]
> **.test = size(">5B") > **.test = size(">5B")
> ** = nonexistent() > ** = nonexistent()
> EOF > EOF
$ hg ci -Aqm 'should fail' $ hg ci -Aqm 'should fail'

tests/test-merge1.t

[255] [255]
$ 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') config error: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn')
[30] [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

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') config error: phases.new-commit: not a valid phase name ('babar')
[30] [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

Test error cases Test error cases
$ 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') config error: storage.revlog.zlib.level is not a valid integer ('foobar')
abort: storage.revlog.zlib.level is not a valid integer ('foobar') config error: storage.revlog.zlib.level is not a valid integer ('foobar')
[30] [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
Test error cases Test error cases
$ 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') config error: storage.revlog.zstd.level is not a valid integer ('foobar')
abort: storage.revlog.zstd.level is not a valid integer ('foobar') config error: storage.revlog.zstd.level is not a valid integer ('foobar')
[30] [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

tests/test-trusted.py

print() print()
bprint(b"# parse error") bprint(b"# parse error")
f = open(b'.hg/hgrc', 'wb') f = open(b'.hg/hgrc', 'wb')
f.write(b'foo') f.write(b'foo')
f.close() f.close()
try: try:
testui(user=b'abc', group=b'def', silent=True) testui(user=b'abc', group=b'def', silent=True)
except error.ParseError as inst: except error.ConfigError as inst:
bprint(inst.format()) bprint(inst.format())
try: try:
testui(debug=True, silent=True) testui(debug=True, silent=True)
except error.ParseError as inst: except error.ConfigError as inst:
bprint(inst.format()) bprint(inst.format())
print() print()
bprint(b'# access typed information') bprint(b'# access typed information')
with open(b'.hg/hgrc', 'wb') as f: with open(b'.hg/hgrc', 'wb') as f:
f.write( f.write(
b'''\ b'''\
[foo] [foo]

tests/test-trusted.py.out

# same user, same group # same user, same group
# different user, different group # different user, different group
# parse error # parse error
# different user, different group # different user, different group
not trusting file .hg/hgrc from untrusted user abc, group def not trusting file .hg/hgrc from untrusted user abc, group def
ignored .hg/hgrc:1: foo ignored .hg/hgrc:1: foo
# same user, same group # same user, same group
hg: parse error at .hg/hgrc:1: foo config error at .hg/hgrc:1: foo
# access typed information # access typed information
# different user, different group # different user, different group
not trusting file .hg/hgrc from untrusted user abc, group def not trusting file .hg/hgrc from untrusted user abc, group def
# suboptions, trusted and untrusted # suboptions, trusted and untrusted
(None, []) ('main', [('one', 'one'), ('two', 'two')]) (None, []) ('main', [('one', 'one'), ('two', 'two')])
# path, trusted and untrusted # path, trusted and untrusted