upstream/mercurial-mirror Files · tests/test-wireproto-command-lookup.t

patch: don't separate \r and \n when colorizing diff output...

patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

Gregory Szorc - - Load All Authors

File last commit:

r37743:3ea8323d default


                r38649:e1987261

default

Download file

             test-wireproto-command-lookup.t
        
                    55 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-wireproto-command-lookup.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ . $TESTDIR/wireprotohelpers.sh

        $ hg init server

        $ enablehttpv2 server

        $ cd server

        $ cat >> .hg/hgrc << EOF

        > [web]

        > push_ssl = false

        > allow-push = *

        > EOF

        $ hg debugdrawdag << EOF

        > C D

        > |/

        > B

        > |

        > A

        > EOF

        $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log

        $ cat hg.pid > $DAEMON_PIDS

      lookup for known node works

        $ sendhttpv2peer << EOF

        > command lookup

        >     key 426bada5c67598ca65036d57d9e4b64b0c1ce7a0

        > EOF

        creating http peer for wire protocol version 2

        sending lookup command

        s>     *\r\n (glob)

        s>     Accept-Encoding: identity\r\n

        s>     accept: application/mercurial-exp-framing-0005\r\n

        s>     content-type: application/mercurial-exp-framing-0005\r\n

        s>     content-length: 73\r\n

        s>     host: $LOCALIP:$HGPORT\r\n (glob)

        s>     user-agent: Mercurial debugwireproto\r\n

        s>     \r\n

        s>     A\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1CkeyX(426bada5c67598ca65036d57d9e4b64b0c1ce7a0DnameFlookup

        s> makefile('rb', None)

        s>     HTTP/1.1 200 OK\r\n

        s>     Server: testing stub value\r\n

        s>     Date: $HTTP_DATE$\r\n

        s>     Content-Type: application/mercurial-exp-framing-0005\r\n

        s>     Transfer-Encoding: chunked\r\n

        s>     \r\n

        s>     28\r\n

        s>      \x00\x00\x01\x00\x02\x012

        s>     \xa1FstatusBokTBk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0

        s>     \r\n

        received frame(size=32; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)

        s>     0\r\n

        s>     \r\n

        response: b'Bk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0'

        $ cat error.log

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ . $TESTDIR/wireprotohelpers.sh

				$ hg init server
				$ enablehttpv2 server
				$ cd server
				$ cat >> .hg/hgrc << EOF
				> [web]
				> push_ssl = false
				> allow-push = *
				> EOF
				$ hg debugdrawdag << EOF
				> C D
				> \|/
				> B
				> \|
				> A
				> EOF

				$ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log
				$ cat hg.pid > $DAEMON_PIDS

				lookup for known node works

				$ sendhttpv2peer << EOF
				> command lookup
				> key 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
				> EOF
				creating http peer for wire protocol version 2
				sending lookup command
				s> *\r\n (glob)
				s> Accept-Encoding: identity\r\n
				s> accept: application/mercurial-exp-framing-0005\r\n
				s> content-type: application/mercurial-exp-framing-0005\r\n
				s> content-length: 73\r\n
				s> host: $LOCALIP:$HGPORT\r\n (glob)
				s> user-agent: Mercurial debugwireproto\r\n
				s> \r\n
				s> A\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1CkeyX(426bada5c67598ca65036d57d9e4b64b0c1ce7a0DnameFlookup
				s> makefile('rb', None)
				s> HTTP/1.1 200 OK\r\n
				s> Server: testing stub value\r\n
				s> Date: $HTTP_DATE$\r\n
				s> Content-Type: application/mercurial-exp-framing-0005\r\n
				s> Transfer-Encoding: chunked\r\n
				s> \r\n
				s> 28\r\n
				s> \x00\x00\x01\x00\x02\x012
				s> \xa1FstatusBokTBk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0
				s> \r\n
				received frame(size=32; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
				s> 0\r\n
				s> \r\n
				response: b'Bk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0'

				$ cat error.log