Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 48712:937998e43e93
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12101
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 28 Jan 2022 14:23:37 +0100 |
| parents | 7e503eff3c76 |
| children | 10407e8e3807 |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Feb 03 06:49:48 2022 +0100 +++ b/mercurial/merge.py Fri Jan 28 14:23:37 2022 +0100 @@ -41,10 +41,9 @@ valid = [b'abort', b'ignore', b'warn'] if config not in valid: validstr = b', '.join([b"'" + v + b"'" for v in valid]) - raise error.ConfigError( - _(b"%s.%s not valid ('%s' is none of %s)") - % (section, name, config, validstr) - ) + msg = _(b"%s.%s not valid ('%s' is none of %s)") + msg %= (section, name, config, validstr) + raise error.ConfigError(msg) return config