Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.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 | 9f70512ae2cf |
line wrap: on
line diff
--- a/mercurial/subrepo.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/subrepo.py Tue Oct 08 15:06:18 2019 -0700 @@ -1232,7 +1232,7 @@ def remove(self): if self.dirty(): self.ui.warn( - _(b'not removing repo %s because ' b'it has changes.\n') + _(b'not removing repo %s because it has changes.\n') % self._path ) return @@ -1572,7 +1572,7 @@ self._gitcommand([b'fetch']) if not self._githavelocally(revision): raise error.Abort( - _(b'revision %s does not exist in subrepository ' b'"%s"\n') + _(b'revision %s does not exist in subrepository "%s"\n') % (revision, self._relpath) ) @@ -1630,11 +1630,11 @@ def rawcheckout(): # no branch to checkout, check it out with no branch self.ui.warn( - _(b'checking out detached HEAD in ' b'subrepository "%s"\n') + _(b'checking out detached HEAD in subrepository "%s"\n') % self._relpath ) self.ui.warn( - _(b'check out a git branch if you intend ' b'to make changes\n') + _(b'check out a git branch if you intend to make changes\n') ) checkout([b'-q', revision]) @@ -1822,7 +1822,7 @@ return if self.dirty(): self.ui.warn( - _(b'not removing repo %s because ' b'it has changes.\n') + _(b'not removing repo %s because it has changes.\n') % self._relpath ) return