Mercurial > hg
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
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 08 Oct 2019 15:06:18 -0700 |
parents | 687b865b95ad |
children | b7b8a1538161 |
comparison
equal
deleted
inserted
replaced
43116:defabf63e969 | 43117:8ff1ecfadcd1 |
---|---|
677 if request.startswith(b'upgrade '): | 677 if request.startswith(b'upgrade '): |
678 if protoswitched: | 678 if protoswitched: |
679 _sshv1respondooberror( | 679 _sshv1respondooberror( |
680 fout, | 680 fout, |
681 ui.ferr, | 681 ui.ferr, |
682 b'cannot upgrade protocols multiple ' b'times', | 682 b'cannot upgrade protocols multiple times', |
683 ) | 683 ) |
684 state = b'shutdown' | 684 state = b'shutdown' |
685 continue | 685 continue |
686 | 686 |
687 state = b'upgrade-initial' | 687 state = b'upgrade-initial' |
785 | 785 |
786 if request != line: | 786 if request != line: |
787 _sshv1respondooberror( | 787 _sshv1respondooberror( |
788 fout, | 788 fout, |
789 ui.ferr, | 789 ui.ferr, |
790 b'malformed handshake protocol: ' b'missing %s' % line, | 790 b'malformed handshake protocol: missing %s' % line, |
791 ) | 791 ) |
792 ok = False | 792 ok = False |
793 state = b'shutdown' | 793 state = b'shutdown' |
794 break | 794 break |
795 | 795 |