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

equal deleted inserted replaced

-:1d459f61b42a
+:33af46d639b4
 sending hello command
 devel-peer-request: between
 devel-peer-request:   pairs: 81 bytes
 sending between command
 remote: 413
-remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 `hg debugserve --sshstdio` works
 $ cd server
 $ hg debugserve --sshstdio << EOF
 > hello
 > EOF
 413
-capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 I/O logging works
 $ hg debugserve --sshstdio --logiofd 1 << EOF
 > hello
 > EOF
 o> write(4) -> 4:
 o>     413\n
 o> write(413) -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 413
-capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> flush() -> None
 $ hg debugserve --sshstdio --logiofile $TESTTMP/io << EOF
 > hello
 > EOF
 413
-capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 $ cat $TESTTMP/io
 o> write(4) -> 4:
 o>     413\n
 o> write(413) -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> flush() -> None
 $ cd ..
 >=0.9.1 clients send a "hello" + "between" for the null range as part of handshake.
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 remote: banner: line 6
 remote: banner: line 7
 remote: banner: line 8
 remote: banner: line 9
 remote: 413
-remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 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 9\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 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 * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
 devel-peer-request: between
 devel-peer-request:   pairs: 81 bytes
 sending between command
 remote: 0
 remote: 413
-remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 sending between command
 remote: 0
 remote: 0
 remote: 0
 remote: 413
-remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 Incomplete dictionary send
 $ hg debugwireproto --localssh --peer raw << EOF
 > raw
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(105) -> 105:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000unknown
 o> readline() -> 2:
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 i> write(31) -> 31:
 o> readline() -> 41:
 o>     68986213bd4485ea51533535e3fc9e78007a711f\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 And a variation that doesn't send the between command
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 devel-peer-request: between
 devel-peer-request:   pairs: 81 bytes
 sending between command
 remote: 0
 remote: 413
-remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 remote: 1
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 o> readline() -> 44:
 o>     upgraded this-is-some-token exp-ssh-v2-0001\n
 o> readline() -> 4:
 o>     412\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 $ cd ..
 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
 sending hello command
 devel-peer-request: between
 devel-peer-request:   pairs: 81 bytes
 sending between command
 protocol upgraded to exp-ssh-v2-0001
-remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 url: ssh://user@dummy/server
 local: no
 sending hello command
 devel-peer-request: between
 devel-peer-request:   pairs: 81 bytes
 sending between command
 protocol upgraded to exp-ssh-v2-0001
-remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 devel-peer-request: protocaps
 devel-peer-request:   caps: * bytes (glob)
 sending protocaps command
 Main capabilities:
 batch
 o> readline() -> 44:
 o>     upgraded this-is-some-token exp-ssh-v2-0001\n
 o> readline() -> 4:
 o>     412\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     403\n
 o> readline() -> 403:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 Multiple upgrades is not allowed
 $ hg debugwireproto --localssh --peer raw << EOF
 > raw
 o> readline() -> 44:
 o>     upgraded this-is-some-token exp-ssh-v2-0001\n
 o> readline() -> 4:
 o>     412\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(45) -> 45:
 i>     upgrade another-token proto=irrelevant\n
 i>     hello\n
 o> readline() -> 1:
 o>     \n
 i> write(6) -> 6:
 i>     hello\n
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 i> write(98) -> 98:
 i>     between\n
 i>     pairs 81\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 o> readline() -> 2:
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending pushkey command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending pushkey command
 i> write(8) -> 8:
 i>     pushkey\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending listkeys command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending listkeys command
 i> write(9) -> 9:
 i>     listkeys\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending pushkey command
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending pushkey command
 i> write(8) -> 8:
 i>     pushkey\n
 i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
 i> flush() -> None
 o> readline() -> 4:
 o>     413\n
 o> readline() -> 413:
-o>     capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch\n
+o>     capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
 o> readline() -> 2:
 o>     1\n
 o> readline() -> 1:
 o>     \n
 sending batch with 3 sub-commands
 i> flush() -> None
 o> readline() -> 62:
 o>     upgraded * exp-ssh-v2-0001\n (glob)
 o> readline() -> 4:
 o>     412\n
-o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN protocaps batch
+o> read(412) -> 412: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
 o> read(1) -> 1:
 o>     \n
 sending batch with 3 sub-commands
 i> write(6) -> 6:
 i>     batch\n

changeset 37413	33af46d639b4
parent 37393	afcfdf53e4b5
child 37533	df4985497986