D1944: wireproto: provide accessors for client capabilities
joerg.sonnenberger (Joerg Sonnenberger)
phabricator at mercurial-scm.org
Sat Mar 24 16:59:03 UTC 2018
joerg.sonnenberger updated this revision to Diff 7268.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1944?vs=5011&id=7268
REVISION DETAIL
https://phab.mercurial-scm.org/D1944
AFFECTED FILES
mercurial/help/internals/wireprotocol.txt
mercurial/sshpeer.py
mercurial/wireproto.py
mercurial/wireprotoserver.py
mercurial/wireprototypes.py
tests/test-debugcommands.t
tests/test-ssh-bundle1.t
tests/test-ssh-proto-unbundle.t
tests/test-ssh-proto.t
tests/test-ssh.t
CHANGE DETAILS
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -496,10 +496,13 @@
devel-peer-request: between
devel-peer-request: pairs: 81 bytes
sending between command
- remote: 403 (sshv1 !)
+ remote: 413 (sshv1 !)
protocol upgraded to exp-ssh-v2-0001 (sshv2 !)
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1 (sshv1 !)
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
query 1; heads
devel-peer-request: batched-content
devel-peer-request: - heads (0 arguments)
diff --git a/tests/test-ssh-proto.t b/tests/test-ssh-proto.t
--- a/tests/test-ssh-proto.t
+++ b/tests/test-ssh-proto.t
@@ -63,9 +63,12 @@
devel-peer-request: between
devel-peer-request: pairs: 81 bytes
sending between command
- remote: 403
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: 413
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
url: ssh://user@dummy/server
local: no
pushable: yes
@@ -82,43 +85,43 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
`hg debugserve --sshstdio` works
$ cd server
$ hg debugserve --sshstdio << EOF
> hello
> EOF
- 403
- capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ 413
+ capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
I/O logging works
$ hg debugserve --sshstdio --logiofd 1 << EOF
> hello
> EOF
o> write(4) -> 4:
- o> 403\n
- o> write(403) -> 403:
- o> capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
- 403
- capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 413\n
+ o> write(413) -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
+ 413
+ capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> flush() -> None
$ hg debugserve --sshstdio --logiofile $TESTTMP/io << EOF
> hello
> EOF
- 403
- capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ 413
+ capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
$ cat $TESTTMP/io
o> write(4) -> 4:
- o> 403\n
- o> write(403) -> 403:
- o> capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
+ o> 413\n
+ o> write(413) -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> flush() -> None
$ cd ..
@@ -143,9 +146,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -182,9 +185,12 @@
remote: banner: line 7
remote: banner: line 8
remote: banner: line 9
- remote: 403
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: 413
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
url: ssh://user@dummy/server
local: no
pushable: yes
@@ -237,9 +243,9 @@
o> readline() -> 15:
o> banner: line 9\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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -290,13 +296,13 @@
i> write(6) -> 6:
i> hello\n
o> readline() -> 4:
- o> 403\n
+ o> 413\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
- 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> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
@@ -310,9 +316,12 @@
devel-peer-request: pairs: 81 bytes
sending between command
remote: 0
- remote: 403
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: 413
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
url: ssh://user@dummy/server
local: no
pushable: yes
@@ -356,9 +365,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -382,9 +391,12 @@
remote: 0
remote: 0
remote: 0
- remote: 403
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: 413
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
url: ssh://user@dummy/server
local: no
pushable: yes
@@ -436,9 +448,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -483,9 +495,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -528,9 +540,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -598,9 +610,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
Incomplete dictionary send
@@ -680,9 +692,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -714,9 +726,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -757,9 +769,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -786,9 +798,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(105) -> 105:
i> between\n
i> pairs 81\n
@@ -827,9 +839,9 @@
i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -876,9 +888,9 @@
o> readline() -> 41:
o> 68986213bd4485ea51533535e3fc9e78007a711f\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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
@@ -903,7 +915,7 @@
o> readline() -> 41:
o> 68986213bd4485ea51533535e3fc9e78007a711f\n
o> readline() -> 4:
- o> 403\n
+ o> 413\n
Send an upgrade request to a server that doesn't support that command
@@ -932,9 +944,9 @@
i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -952,9 +964,12 @@
devel-peer-request: pairs: 81 bytes
sending between command
remote: 0
- remote: 403
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: 413
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
url: ssh://user@dummy/server
local: no
pushable: yes
@@ -992,9 +1007,9 @@
o> readline() -> 44:
o> upgraded this-is-some-token exp-ssh-v2-0001\n
o> readline() -> 4:
- o> 402\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> 412\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
$ cd ..
@@ -1008,7 +1023,10 @@
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 batch
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
url: ssh://user@dummy/server
local: no
pushable: yes
@@ -1025,15 +1043,19 @@
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 batch
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
Main capabilities:
batch
branchmap
$USUAL_BUNDLE2_CAPS_SERVER$
changegroupsubset
getbundle
known
lookup
+ protocaps
pushkey
streamreqs=generaldelta,revlogv1
unbundle=HG10GZ,HG10BZ,HG10UN
@@ -1092,15 +1114,15 @@
o> readline() -> 44:
o> upgraded this-is-some-token exp-ssh-v2-0001\n
o> readline() -> 4:
- o> 402\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> 412\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(6) -> 6:
i> hello\n
o> readline() -> 4:
- o> 385\n
- o> readline() -> 385:
- o> capabilities: lookup branchmap pushkey known getbundle unbundlehash streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
+ o> 395\n
+ o> readline() -> 395:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
Multiple upgrades is not allowed
@@ -1130,9 +1152,9 @@
o> readline() -> 44:
o> upgraded this-is-some-token exp-ssh-v2-0001\n
o> readline() -> 4:
- o> 402\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> 412\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(45) -> 45:
i> upgrade another-token proto=irrelevant\n
i> hello\n
@@ -1203,9 +1225,9 @@
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(98) -> 98:
i> between\n
i> pairs 81\n
@@ -1323,9 +1345,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1357,8 +1379,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1403,9 +1425,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1433,8 +1455,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1464,9 +1486,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1495,8 +1517,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1527,9 +1549,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1560,8 +1582,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1596,9 +1618,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1636,8 +1658,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending pushkey command
@@ -1688,9 +1710,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1719,8 +1741,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1767,9 +1789,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1801,8 +1823,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1836,9 +1858,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1869,8 +1891,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1903,9 +1925,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1934,8 +1956,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending listkeys command
@@ -1970,9 +1992,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -2011,8 +2033,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending pushkey command
@@ -2077,9 +2099,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -2117,8 +2139,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending batch with 3 sub-commands
diff --git a/tests/test-ssh-proto-unbundle.t b/tests/test-ssh-proto-unbundle.t
--- a/tests/test-ssh-proto-unbundle.t
+++ b/tests/test-ssh-proto-unbundle.t
@@ -56,9 +56,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -110,8 +110,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -225,9 +225,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -285,8 +285,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -353,9 +353,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -414,8 +414,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -483,9 +483,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -543,8 +543,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -611,9 +611,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -672,8 +672,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -741,9 +741,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -804,8 +804,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -875,9 +875,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -935,8 +935,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1003,9 +1003,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1066,8 +1066,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1137,9 +1137,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1200,8 +1200,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1277,9 +1277,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1338,8 +1338,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1408,9 +1408,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1469,8 +1469,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1541,9 +1541,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1604,8 +1604,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1684,9 +1684,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1751,8 +1751,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1826,9 +1826,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -1882,8 +1882,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
@@ -1958,9 +1958,9 @@
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None
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> 413\n
+ o> readline() -> 413:
+ o> capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
o> readline() -> 2:
o> 1\n
o> readline() -> 1:
@@ -2018,8 +2018,8 @@
o> readline() -> 62:
o> upgraded * exp-ssh-v2-0001\n (glob)
o> readline() -> 4:
- o> 402\n
- o> read(402) -> 402: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ o> 412\n
+ o> read(412) -> 412: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
o> read(1) -> 1:
o> \n
sending unbundle command
diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
--- a/tests/test-ssh-bundle1.t
+++ b/tests/test-ssh-bundle1.t
@@ -478,10 +478,11 @@
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
sending hello command
sending between command
- remote: 403 (sshv1 !)
+ remote: 413 (sshv1 !)
protocol upgraded to exp-ssh-v2-0001 (sshv2 !)
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1 (sshv1 !)
+ sending protocaps command
preparing listkeys for "bookmarks"
sending listkeys command
received listkey for "bookmarks": 45 bytes
diff --git a/tests/test-debugcommands.t b/tests/test-debugcommands.t
--- a/tests/test-debugcommands.t
+++ b/tests/test-debugcommands.t
@@ -398,9 +398,12 @@
devel-peer-request: between
devel-peer-request: pairs: 81 bytes
sending between command
- remote: 403
- remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
+ remote: 413
+ remote: capabilities: lookup branchmap pushkey known getbundle unbundlehash protocaps changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch
remote: 1
+ devel-peer-request: protocaps
+ devel-peer-request: caps: * bytes (glob)
+ sending protocaps command
url: ssh://user@dummy/debugrevlog
local: no
pushable: yes
diff --git a/mercurial/wireprototypes.py b/mercurial/wireprototypes.py
--- a/mercurial/wireprototypes.py
+++ b/mercurial/wireprototypes.py
@@ -119,6 +119,13 @@
returns a list of values (same order as <args>)"""
@abc.abstractmethod
+ def getprotocaps(self):
+ """Returns the list of protocol-level capabilities of client
+
+ Returns a list of capabilities as declared by the client for
+ the current request (or connection for stateful protocol handlers)."""
+
+ @abc.abstractmethod
def forwardpayload(self, fp):
"""Read the raw payload and forward to a file.
@@ -160,3 +167,15 @@
doesn't have that permission, the exception should raise or abort
in a protocol specific manner.
"""
+
+ def getcompressionsupport(self):
+ """Returns a list of compression methods supported by the client.
+
+ Returns a list of the compression methods supported by the client
+ according to the protocol capabilities. If no such capability has
+ been announced, fallback to the default of zlib and uncompressed.
+ """
+ for cap in self.getprotocaps():
+ if cap.startswith('comp='):
+ return cap[5:].split(',')
+ return ['zlib', 'none']
diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py
--- a/mercurial/wireprotoserver.py
+++ b/mercurial/wireprotoserver.py
@@ -60,6 +60,7 @@
self._req = req
self._ui = ui
self._checkperm = checkperm
+ self._protocaps = None
@property
def name(self):
@@ -92,6 +93,12 @@
args.update(urlreq.parseqs(argvalue, keep_blank_values=True))
return args
+ def getprotocaps(self):
+ if self._protocaps is None:
+ value = decodevaluefromheaders(self._req, r'X-HgProto')
+ self._protocaps = set(value.split(' '))
+ return self._protocaps
+
def forwardpayload(self, fp):
# Existing clients *always* send Content-Length.
length = int(self._req.headers[b'Content-Length'])
@@ -571,6 +578,7 @@
self._req = req
self._ui = ui
self._args = args
+ self._protocaps = None
@property
def name(self):
@@ -586,6 +594,12 @@
return [data[k] for k in args.split()]
+ def getprotocaps(self):
+ if self._protocaps is None:
+ value = decodevaluefromheaders(self._req, r'X-HgProto')
+ self._protocaps = set(value.split(' '))
+ return self._protocaps
+
def forwardpayload(self, fp):
raise NotImplementedError
@@ -602,28 +616,21 @@
def checkperm(self, perm):
raise NotImplementedError
-def _httpresponsetype(ui, req, prefer_uncompressed):
+def _httpresponsetype(ui, proto, prefer_uncompressed):
"""Determine the appropriate response type and compression settings.
Returns a tuple of (mediatype, compengine, engineopts).
"""
# Determine the response media type and compression engine based
# on the request parameters.
- protocaps = decodevaluefromheaders(req, 'X-HgProto').split(' ')
- if '0.2' in protocaps:
+ if '0.2' in proto.getprotocaps():
# All clients are expected to support uncompressed data.
if prefer_uncompressed:
return HGTYPE2, util._noopengine(), {}
- # Default as defined by wire protocol spec.
- compformats = ['zlib', 'none']
- for cap in protocaps:
- if cap.startswith('comp='):
- compformats = cap[5:].split(',')
- break
-
# Now find an agreed upon compression format.
+ compformats = proto.getcompressionsupport()
for engine in wireproto.supportedcompengines(ui, util.SERVERROLE):
if engine.wireprotosupport().name in compformats:
opts = {}
@@ -692,7 +699,7 @@
# This code for compression should not be streamres specific. It
# is here because we only compress streamres at the moment.
mediatype, engine, engineopts = _httpresponsetype(
- repo.ui, req, rsp.prefer_uncompressed)
+ repo.ui, proto, rsp.prefer_uncompressed)
gen = engine.compressstream(gen, engineopts)
if mediatype == HGTYPE2:
@@ -735,6 +742,7 @@
self._ui = ui
self._fin = fin
self._fout = fout
+ self._protocaps = set()
@property
def name(self):
@@ -761,6 +769,9 @@
data[arg] = val
return [data[k] for k in keys]
+ def getprotocaps(self):
+ return self._protocaps
+
def forwardpayload(self, fpout):
# We initially send an empty response. This tells the client it is
# OK to start sending data. If a client sees any other response, it
diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -841,6 +841,10 @@
# copy to prevent modification of the global list
caps = list(wireprotocaps)
+ if proto.name in (wireprototypes.SSHV1, wireprototypes.SSHV2):
+ # Advertise support for the ssh-only protocaps command
+ caps.append('protocaps')
+
# Command of same name as capability isn't exposed to version 1 of
# transports. So conditionally add it.
if commands.commandavailable('changegroupsubset', proto):
@@ -1007,6 +1011,12 @@
v = ''.join(b and '1' or '0' for b in repo.known(decodelist(nodes)))
return bytesresponse(v)
+ at wireprotocommand('protocaps', 'caps', permission='pull')
+def protocaps(repo, proto, caps):
+ if proto.name in (wireprototypes.SSHV1, wireprototypes.SSHV2):
+ repo._protocaps = set(caps.split(' '))
+ return bytesresponse('OK')
+
@wireprotocommand('pushkey', 'namespace key old new', permission='push')
def pushkey(repo, proto, namespace, key, old, new):
# compatibility with pre-1.8 clients which were accidentally
diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py
--- a/mercurial/sshpeer.py
+++ b/mercurial/sshpeer.py
@@ -160,6 +160,17 @@
return proc, stdin, stdout, stderr
+def _clientcapabilities():
+ """Return list of capabilities of this client.
+
+ Returns a list of capabilities that are supported by this client.
+ """
+ protoparams = []
+ comps = [e.wireprotosupport().name for e in
+ util.compengines.supportedwireengines(util.CLIENTROLE)]
+ protoparams.append('comp=%s' % ','.join(comps))
+ return protoparams
+
def _performhandshake(ui, stdin, stdout, stderr):
def badresponse():
# Flush any output on stderr.
@@ -610,4 +621,15 @@
proc, stdin, stdout, stderr = _makeconnection(ui, sshcmd, args, remotecmd,
remotepath, sshenv)
- return makepeer(ui, path, proc, stdin, stdout, stderr)
+ peer = makepeer(ui, path, proc, stdin, stdout, stderr)
+
+ # Finally, if supported by the server, notify it about our own
+ # capabilities.
+ if 'protocaps' in peer.capabilities():
+ try:
+ peer._call("protocaps", caps=' '.join(_clientcapabilities()))
+ except IOError:
+ peer._cleanup()
+ raise error.RepoError(_('capability exchange failed'))
+
+ return peer
diff --git a/mercurial/help/internals/wireprotocol.txt b/mercurial/help/internals/wireprotocol.txt
--- a/mercurial/help/internals/wireprotocol.txt
+++ b/mercurial/help/internals/wireprotocol.txt
@@ -388,6 +388,10 @@
in response lines and have reasonable certainty that the line did not
originate from a *banner* message.
+If the server announces support for the ``protocaps`` capability, the client
+should issue a ``protocaps`` command after the initial handshake to annonunce
+its own capabilities. The client capabilities are persistent.
+
SSH Version 1 Transport
-----------------------
To: joerg.sonnenberger, #hg-reviewers
Cc: indygreg, mharbison72, mercurial-devel
More information about the Mercurial-devel
mailing list