( )⚙ D7625 config: catch intended exception when failing to parse config

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7625

config: catch intended exception when failing to parse config
ClosedPublic

Authored by martinvonz on Dec 12 2019, 6:44 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdbaf9aabfb69: config: catch intended exception when failing to parse config
Summary

When a new config parser was introduced in fca54469480e (ui: introduce
new config parser, 2009-04-23), the reading side would raise a
ConfigError which was then caught in the ui code. Then, in
2123aad24d56 (error: add new ParseError for various parsing errors,
2010-06-04), a ParseError was raised instead, but the call site was
not updated. Let's start catching that ParseError. We still don't
print it in a friendly way, but that's not worse than before.

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.Dec 12 2019, 6:44 PM
martinvonz updated this revision to Diff 18777.Dec 16 2019, 6:33 PM
pulkit accepted this revision.Dec 17 2019, 6:31 AM
This revision is now accepted and ready to land.Dec 17 2019, 6:31 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (2 lines)
Mtests/test-trusted.py.out (2 lines)

Diff 18804

mercurial/ui.py

raise raise
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)
fp.close() fp.close()
except error.ConfigError as inst: except error.ParseError as inst:
if trusted: if trusted:
raise raise
self.warn(_(b"ignored: %s\n") % stringutil.forcebytestr(inst)) self.warn(_(b"ignored: %s\n") % stringutil.forcebytestr(inst))
if self.plain(): if self.plain():
for k in ( for k in (
b'debug', b'debug',
b'fallbackencoding', b'fallbackencoding',

tests/test-trusted.py.out

# error handling # error handling
# file doesn't exist # file doesn't exist
# 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
ParseError('foo', '.hg/hgrc:1') ignored: ('foo', '.hg/hgrc:1')
# same user, same group # same user, same group
ParseError('foo', '.hg/hgrc:1') ParseError('foo', '.hg/hgrc:1')
# 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')])