Mercurial > hg
changeset 48699:10407e8e3807
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12102
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 28 Jan 2022 14:23:49 +0100 |
| parents | 937998e43e93 |
| children | d8577d00c023 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Jan 28 14:23:37 2022 +0100 +++ b/mercurial/merge.py Fri Jan 28 14:23:49 2022 +0100 @@ -336,10 +336,9 @@ for f in pmmf: fold = util.normcase(f) if fold in foldmap: - raise error.StateError( - _(b"case-folding collision between %s and %s") - % (f, foldmap[fold]) - ) + msg = _(b"case-folding collision between %s and %s") + msg %= (f, foldmap[fold]) + raise error.StateError(msg) foldmap[fold] = f # check case-folding of directories