Mercurial > public > mercurial-scm > hg-stable
diff mercurial/util.py @ 43117:8ff1ecfadcd1
cleanup: join string literals that are already on one line
Thanks to Kyle for noticing this and for providing the regular
expression to run on the codebase.
This patch has been reviewed by the test suite and they approved of
it.
# skip-blame: fallout from mass reformatting
Differential Revision: https://phab.mercurial-scm.org/D7028
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 08 Oct 2019 15:06:18 -0700 |
| parents | d783f945a701 |
| children | 5be128f669d4 70d42e2ad9b4 |
line wrap: on
line diff
--- a/mercurial/util.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/util.py Tue Oct 08 15:06:18 2019 -0700 @@ -2034,12 +2034,12 @@ ) if ord(c) <= 31: return _( - b"filename contains '%s', which is invalid " b"on Windows" + b"filename contains '%s', which is invalid on Windows" ) % stringutil.escapestr(c) base = n.split(b'.')[0] if base and base.lower() in _winreservednames: return ( - _(b"filename contains '%s', which is reserved " b"on Windows") + _(b"filename contains '%s', which is reserved on Windows") % base ) t = n[-1:] @@ -3506,7 +3506,7 @@ addpath(f) elif skip is not None: raise error.ProgrammingError( - b"skip character is only supported " b"with a dict source" + b"skip character is only supported with a dict source" ) else: for f in map: @@ -3583,7 +3583,7 @@ s = stream.read(n) if len(s) < n: raise error.Abort( - _(b"stream ended unexpectedly" b" (got %d bytes, expected %d)") + _(b"stream ended unexpectedly (got %d bytes, expected %d)") % (len(s), n) ) return s