Mercurial > public > mercurial-scm > hg-stable
diff mercurial/bundle2.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 | 4aa72cdf616f |
| children | c17a63eb5d4c |
line wrap: on
line diff
--- a/mercurial/bundle2.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/bundle2.py Tue Oct 08 15:06:18 2019 -0700 @@ -1233,7 +1233,7 @@ def __call__(self): self.ui.debug( - b'bundle2-input-stream-interrupt:' b' opening out of band context\n' + b'bundle2-input-stream-interrupt: opening out of band context\n' ) indebug(self.ui, b'bundle2 stream interruption, looking for a part.') headerblock = self._readpartheader() @@ -1252,7 +1252,7 @@ if not hardabort: part.consume() self.ui.debug( - b'bundle2-input-stream-interrupt:' b' closing out of band context\n' + b'bundle2-input-stream-interrupt: closing out of band context\n' ) @@ -1320,7 +1320,7 @@ s = read(headersize) if len(s) < headersize: raise error.Abort( - _(b'stream ended unexpectedly ' b' (got %d bytes, expected %d)') + _(b'stream ended unexpectedly (got %d bytes, expected %d)') % (len(s), chunksize) ) @@ -1889,7 +1889,7 @@ assert compression is None if cg.version != b'01': raise error.Abort( - _(b'old bundle types only supports v1 ' b'changegroups') + _(b'old bundle types only supports v1 changegroups') ) header, comp = bundletypes[bundletype] if comp not in util.compengines.supportedbundletypes: @@ -2136,7 +2136,7 @@ op.gettransaction() if sorted(heads) != sorted(op.repo.heads()): raise error.PushRaced( - b'remote repository changed while pushing - ' b'please try again' + b'remote repository changed while pushing - please try again' )