comparison mercurial/wireprotoserver.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

43116:defabf63e969

            if request.startswith(b'upgrade '):
                if protoswitched:
                    _sshv1respondooberror(
                        fout,
                        ui.ferr,
                        b'cannot upgrade protocols multiple ' b'times',
                    )
                    state = b'shutdown'
                    continue

                state = b'upgrade-initial'

                if request != line:
                    _sshv1respondooberror(
                        fout,
                        ui.ferr,
                        b'malformed handshake protocol: ' b'missing %s' % line,
                    )
                    ok = False
                    state = b'shutdown'
                    break

43117:8ff1ecfadcd1

            if request.startswith(b'upgrade '):
                if protoswitched:
                    _sshv1respondooberror(
                        fout,
                        ui.ferr,
                        b'cannot upgrade protocols multiple times',
                    )
                    state = b'shutdown'
                    continue

                state = b'upgrade-initial'

                if request != line:
                    _sshv1respondooberror(
                        fout,
                        ui.ferr,
                        b'malformed handshake protocol: missing %s' % line,
                    )
                    ok = False
                    state = b'shutdown'
                    break