comparison mercurial/ui.py @ 45894:9dc1351d0b5f

errors: raise ConfigError on failure to parse config file 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). Differential Revision: https://phab.mercurial-scm.org/D9355
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 20 Nov 2020 14:43:21 -0800
parents e5a0efd26f7a
children 87e7dd8e7734
comparison
equal deleted inserted replaced
45893:f4065c3f09b8 45894:9dc1351d0b5f
464 cfg = config.config() 464 cfg = config.config()
465 trusted = sections or trust or self._trusted(fp, filename) 465 trusted = sections or trust or self._trusted(fp, filename)
466 466
467 try: 467 try:
468 cfg.read(filename, fp, sections=sections, remap=remap) 468 cfg.read(filename, fp, sections=sections, remap=remap)
469 except error.ParseError as inst: 469 except error.ConfigError as inst:
470 if trusted: 470 if trusted:
471 raise 471 raise
472 self.warn( 472 self.warn(
473 _(b'ignored %s: %s\n') % (inst.location, inst.message) 473 _(b'ignored %s: %s\n') % (inst.location, inst.message)
474 ) 474 )