diff mercurial/ui.py @ 43909:dbaf9aabfb69

config: catch intended exception when failing to parse config 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. Differential Revision: https://phab.mercurial-scm.org/D7625
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 11 Dec 2019 15:33:07 -0800
parents e63b27fb0595
children c41ed5d4f770
line wrap: on
line diff
--- a/mercurial/ui.py	Wed Dec 11 09:39:14 2019 -0800
+++ b/mercurial/ui.py	Wed Dec 11 15:33:07 2019 -0800
@@ -440,7 +440,7 @@
         try:
             cfg.read(filename, fp, sections=sections, remap=remap)
             fp.close()
-        except error.ConfigError as inst:
+        except error.ParseError as inst:
             if trusted:
                 raise
             self.warn(_(b"ignored: %s\n") % stringutil.forcebytestr(inst))