Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: break up a not-so-one-liner for readability
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 28 Jan 2022 14:23:56 +0100
changeset 48700 d8577d00c023
parent 48699 10407e8e3807
child 48701 85c69b0dfa8f
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12103
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri Jan 28 14:23:49 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 14:23:56 2022 +0100
@@ -346,10 +346,9 @@
     for fold, f in sorted(foldmap.items()):
         if fold.startswith(foldprefix) and not f.startswith(unfoldprefix):
             # the folded prefix matches but actual casing is different
-            raise error.StateError(
-                _(b"case-folding collision between %s and directory of %s")
-                % (lastfull, f)
-            )
+            msg = _(b"case-folding collision between %s and directory of %s")
+            msg %= (lastfull, f)
+            raise error.StateError(msg)
         foldprefix = fold + b'/'
         unfoldprefix = f + b'/'
         lastfull = f
Mercurial