upstream/mercurial-mirror Files · tests/test-wireproto-command-pushkey.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-pushkey.t
        
                    89 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-wireproto-command-pushkey.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        $ . $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

      pushkey for a bookmark works

        $ sendhttpv2peer << EOF

        > command pushkey

        >     namespace bookmarks

        >     key @

        >     old

        >     new 426bada5c67598ca65036d57d9e4b64b0c1ce7a0

        > EOF

        creating http peer for wire protocol version 2

        sending pushkey command

        s>     *\r\n (glob)

        s>     Accept-Encoding: identity\r\n

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

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

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

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     content-length: 105\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\xa4CkeyA@CnewX(426bada5c67598ca65036d57d9e4b64b0c1ce7a0Cold@InamespaceIbookmarksDnameGpushkey

        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

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

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

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     Transfer-Encoding: chunked\r\n

        s>     \r\n

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

              r37743
            
        s>     14\r\n

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

        s>     \xa1FstatusBok\xf5

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     \r\n

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

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

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     0\r\n

        s>     \r\n

        Gregory Szorc
    
wireprotov2: decode responses to their expected types...

              r37739
            
        response: True

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        $ sendhttpv2peer << EOF

        > command listkeys

        >     namespace bookmarks

        > EOF

        creating http peer for wire protocol version 2

        sending listkeys command

        s>     POST /api/exp-http-v2-0001/ro/listkeys HTTP/1.1\r\n

        s>     Accept-Encoding: identity\r\n

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

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

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

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     content-length: 49\r\n

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

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

        s>     \r\n

        s>     )\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1InamespaceIbookmarksDnameHlistkeys

        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

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

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

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     Transfer-Encoding: chunked\r\n

        s>     \r\n

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

              r37743
            
        s>     40\r\n

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

        s>     \xa1FstatusBok\xa1A@X(426bada5c67598ca65036d57d9e4b64b0c1ce7a0

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     \r\n

        Gregory Szorc
    
wireprotov2: change command response protocol to include a leading map...

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

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        s>     0\r\n

        s>     \r\n

        Gregory Szorc
    
wireprotov2: decode responses to their expected types...

              r37739
            
        response: {b'@': b'426bada5c67598ca65036d57d9e4b64b0c1ce7a0'}

        Gregory Szorc
    
wireproto: port pushkey command to wire protocol version 2...

              r37555
            
        $ 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

Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	$ . $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

		pushkey for a bookmark works

		$ sendhttpv2peer << EOF
		> command pushkey
		> namespace bookmarks
		> key @
		> old
		> new 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
		> EOF
		creating http peer for wire protocol version 2
		sending pushkey command
		s> *\r\n (glob)
		s> Accept-Encoding: identity\r\n
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	s> accept: application/mercurial-exp-framing-0005\r\n
		s> content-type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> content-length: 105\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\xa4CkeyA@CnewX(426bada5c67598ca65036d57d9e4b64b0c1ce7a0Cold@InamespaceIbookmarksDnameGpushkey
		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
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	s> Content-Type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> Transfer-Encoding: chunked\r\n
		s> \r\n
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	s> 14\r\n
		s> \x0c\x00\x00\x01\x00\x02\x012
		s> \xa1FstatusBok\xf5
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> \r\n
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	received frame(size=12; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> 0\r\n
		s> \r\n
Gregory Szorc wireprotov2: decode responses to their expected types...	r37739	response: True
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555
		$ sendhttpv2peer << EOF
		> command listkeys
		> namespace bookmarks
		> EOF
		creating http peer for wire protocol version 2
		sending listkeys command
		s> POST /api/exp-http-v2-0001/ro/listkeys HTTP/1.1\r\n
		s> Accept-Encoding: identity\r\n
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	s> accept: application/mercurial-exp-framing-0005\r\n
		s> content-type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> content-length: 49\r\n
		s> host: $LOCALIP:$HGPORT\r\n (glob)
		s> user-agent: Mercurial debugwireproto\r\n
		s> \r\n
		s> )\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1InamespaceIbookmarksDnameHlistkeys
		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
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	s> Content-Type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> Transfer-Encoding: chunked\r\n
		s> \r\n
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	s> 40\r\n
		s> 8\x00\x00\x01\x00\x02\x012
		s> \xa1FstatusBok\xa1A@X(426bada5c67598ca65036d57d9e4b64b0c1ce7a0
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> \r\n
Gregory Szorc wireprotov2: change command response protocol to include a leading map...	r37743	received frame(size=56; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555	s> 0\r\n
		s> \r\n
Gregory Szorc wireprotov2: decode responses to their expected types...	r37739	response: {b'@': b'426bada5c67598ca65036d57d9e4b64b0c1ce7a0'}
Gregory Szorc wireproto: port pushkey command to wire protocol version 2...	r37555
		$ cat error.log