Mercurial > public > mercurial-scm > hg-stable
diff hgext/transplant.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 | 74802979dd9d |
| children | 9f70512ae2cf |
line wrap: on
line diff
--- a/hgext/transplant.py Tue Oct 08 15:15:37 2019 -0700 +++ b/hgext/transplant.py Tue Oct 08 15:06:18 2019 -0700 @@ -438,7 +438,7 @@ p1 = repo.dirstate.p1() if p1 != parent: raise error.Abort( - _(b'working directory not at transplant ' b'parent %s') + _(b'working directory not at transplant parent %s') % nodemod.hex(parent) ) if merge: @@ -661,7 +661,7 @@ b'c', b'continue', None, - _(b'continue last transplant session ' b'after fixing conflicts'), + _(b'continue last transplant session after fixing conflicts'), ), ( b'', @@ -788,7 +788,7 @@ raise error.Abort(_(b'--all requires a branch revision')) if revs: raise error.Abort( - _(b'--all is incompatible with a ' b'revision list') + _(b'--all is incompatible with a revision list') ) opts = pycompat.byteskwargs(opts)