Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.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 | 81efc4a295e7 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/localrepo.py Tue Oct 08 15:06:18 2019 -0700 @@ -223,12 +223,12 @@ def callcommand(self, command, args): if self._sent: raise error.ProgrammingError( - b'callcommand() cannot be used after ' b'sendcommands()' + b'callcommand() cannot be used after sendcommands()' ) if self._closed: raise error.ProgrammingError( - b'callcommand() cannot be used after ' b'close()' + b'callcommand() cannot be used after close()' ) # We don't need to support anything fancy. Just call the named @@ -343,9 +343,7 @@ return self._repo.pushkey(namespace, key, old, new) def stream_out(self): - raise error.Abort( - _(b'cannot perform stream clone against local ' b'peer') - ) + raise error.Abort(_(b'cannot perform stream clone against local peer')) def unbundle(self, bundle, heads, url): """apply a bundle on a repo @@ -568,7 +566,7 @@ if not sharedvfs.exists(): raise error.RepoError( - _(b'.hg/sharedpath points to nonexistent ' b'directory %s') + _(b'.hg/sharedpath points to nonexistent directory %s') % sharedvfs.base ) @@ -1453,7 +1451,7 @@ if not self._dirstatevalidatewarned: self._dirstatevalidatewarned = True self.ui.warn( - _(b"warning: ignoring unknown" b" working parent %s!\n") + _(b"warning: ignoring unknown working parent %s!\n") % short(node) ) return nullid @@ -2302,7 +2300,7 @@ ) % (oldtip, desc, detail) else: msg = _( - b'repository tip rolled back to revision %d' b' (undo %s)\n' + b'repository tip rolled back to revision %d (undo %s)\n' ) % (oldtip, desc) except IOError: msg = _(b'rolling back unknown transaction\n') @@ -2367,8 +2365,7 @@ ) else: ui.status( - _(b'working directory now based on ' b'revision %d\n') - % parents + _(b'working directory now based on revision %d\n') % parents ) mergemod.mergestate.clean(self, self[b'.'].node()) @@ -3600,7 +3597,7 @@ if not isinstance(unknownopts, dict): raise error.ProgrammingError( - b'filterknowncreateopts() did not return ' b'a dict' + b'filterknowncreateopts() did not return a dict' ) if unknownopts: @@ -3687,7 +3684,7 @@ return object.__getattribute__(self, item) raise error.ProgrammingError( - b'repo instances should not be used ' b'after unshare' + b'repo instances should not be used after unshare' ) def close(self):