hg-stable: comparison tests/test-ssh-proto.t

equal deleted inserted replaced

-:2a13ad130f49
+:a746d13987a6
 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
 devel-peer-request: hello+between
 devel-peer-request:   pairs: 81 bytes
 sending hello command
 sending between command
-remote: 444
+remote: \d+ (re)
-remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+remote: capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 > EOF
 using raw connection to peer
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 `hg debugserve --sshstdio` works
 $ cd server
 $ hg debugserve --sshstdio << EOF
 > hello
 > EOF
-444
+\d+ (re)
-capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
 I/O logging works
 $ hg debugserve --sshstdio --logiofd 1 << EOF
 > hello
 > EOF
 e> flush() -> None
 o> write(4) -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> write(444) -> 444:
+o> write\(\d+\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
-444
+\d+ (re)
-capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
 o> flush() -> None
 $ hg debugserve --sshstdio --logiofile $TESTTMP/io << EOF
 > hello
 > EOF
-444
+\d+ (re)
-capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
 $ cat $TESTTMP/io
 e> flush() -> None
 o> write(4) -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> write(444) -> 444:
+o> write\(\d+\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> flush() -> None
 $ cd ..
 >=0.9.1 clients send a "hello" + "between" for the null range as part of handshake.
 > EOF
 using raw connection to peer
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 remote: banner: line 5
 remote: banner: line 6
 remote: banner: line 7
 remote: banner: line 8
 remote: banner: line 9
-remote: 444
+remote: \d+ (re)
-remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+remote: capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 o> readline() -> 15:
 o>     banner: line 8\n
 o> readline() -> 15:
 o>     banner: line 9\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-no-args --debug debugpeer ssh://user@dummy/server
 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
 devel-peer-request: hello+between
 devel-peer-request:   pairs: 81 bytes
 sending hello command
 sending between command
 remote: 0
-remote: 444
+remote: \d+ (re)
-remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+remote: capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 sending hello command
 sending between command
 remote: 0
 remote: 0
 remote: 0
-remote: 444
+remote: \d+ (re)
-remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+remote: capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 Incomplete dictionary send
 $ hg debugwireproto --localssh --peer raw << EOF
 > raw
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 o> readline() -> 2:
 o>     0\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 > EOF
 using raw connection to peer
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 i> write(105) -> 105:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000unknown
 o> readline() -> 2:
 i>     hello\n
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 i> write(31) -> 31:
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 41:
 o>     68986213bd4485ea51533535e3fc9e78007a711f\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 And a variation that doesn't send the between command
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 41:
 o>     68986213bd4485ea51533535e3fc9e78007a711f\n
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
 $ cd ..
 Test listkeys for listing namespaces
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending pushkey command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending pushkey command
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
-o>     444\n
+o>     \d+\\n (re)
-o> readline() -> 444:
+o> readline\(\) -> \d+: (re)
-o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
+o>     capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending batch with 3 sub-commands

changeset 48671	a746d13987a6
parent 48561	04688c51f81f