Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.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 | 9391784299e9 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/cmdutil.py Tue Oct 08 15:06:18 2019 -0700 @@ -257,13 +257,9 @@ the ``date`` option is set. """ if opts.get(b'date') and opts.get(b'currentdate'): - raise error.Abort( - _(b'--date and --currentdate are mutually ' b'exclusive') - ) + raise error.Abort(_(b'--date and --currentdate are mutually exclusive')) if opts.get(b'user') and opts.get(b'currentuser'): - raise error.Abort( - _(b'--user and --currentuser are mutually ' b'exclusive') - ) + raise error.Abort(_(b'--user and --currentuser are mutually exclusive')) datemaydiffer = False # date-only change should be ignored? @@ -1010,7 +1006,7 @@ if message and logfile: raise error.Abort( - _(b'options --message and --logfile are mutually ' b'exclusive') + _(b'options --message and --logfile are mutually exclusive') ) if not message and logfile: try: @@ -1180,7 +1176,7 @@ newname.append(stringutil.escapestr(pat[i:n])) if n + 2 > end: raise error.Abort( - _(b"incomplete format spec in output " b"filename") + _(b"incomplete format spec in output filename") ) c = pat[n + 1 : n + 2] i = n + 2 @@ -1188,7 +1184,7 @@ newname.append(expander[c]) except KeyError: raise error.Abort( - _(b"invalid format spec '%%%s' in output " b"filename") % c + _(b"invalid format spec '%%%s' in output filename") % c ) return b''.join(newname) @@ -2264,7 +2260,7 @@ if follow: raise error.Abort( - _(b'can only follow copies/renames for explicit ' b'filenames') + _(b'can only follow copies/renames for explicit filenames') ) # The slow path checks files modified in every changeset.