[Request] [+ ] D12103: merge: break up a not-so-one-liner for readability
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Sat Jan 29 14:13:43 UTC 2022
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D12103
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20220129/91023b11/attachment-0001.html>
More information about the Mercurial-patches
mailing list