##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

sshpeer: reflect actual command activity one handshake...
Boris Feld -
r37831:58bbd14b stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -261,11 +261,9 b' def _performhandshake(ui, stdin, stdout,'
261 handshake.insert(0, 'upgrade %s %s\n' % (token, upgradecaps))
261 handshake.insert(0, 'upgrade %s %s\n' % (token, upgradecaps))
262
262
263 if requestlog:
263 if requestlog:
264 ui.debug('devel-peer-request: hello\n')
264 ui.debug('devel-peer-request: hello+between\n')
265 ui.debug('devel-peer-request: pairs: %d bytes\n' % len(pairsarg))
265 ui.debug('sending hello command\n')
266 ui.debug('sending hello command\n')
266 if requestlog:
267 ui.debug('devel-peer-request: between\n')
268 ui.debug('devel-peer-request: pairs: %d bytes\n' % len(pairsarg))
269 ui.debug('sending between command\n')
267 ui.debug('sending between command\n')
270
268
271 stdin.write(''.join(handshake))
269 stdin.write(''.join(handshake))
Show file before | Show file after | Hide comments
@@ -411,10 +411,9 b' Test debugpeer'
411 $ hg --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" --debug debugpeer ssh://user@dummy/debugrevlog
411 $ hg --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" --debug debugpeer ssh://user@dummy/debugrevlog
412 running "*" "*/tests/dummyssh" 'user@dummy' 'hg -R debugrevlog serve --stdio' (glob) (no-windows !)
412 running "*" "*/tests/dummyssh" 'user@dummy' 'hg -R debugrevlog serve --stdio' (glob) (no-windows !)
413 running "*" "*\tests/dummyssh" "user@dummy" "hg -R debugrevlog serve --stdio" (glob) (windows !)
413 running "*" "*\tests/dummyssh" "user@dummy" "hg -R debugrevlog serve --stdio" (glob) (windows !)
414 devel-peer-request: hello
414 devel-peer-request: hello+between
415 devel-peer-request: pairs: 81 bytes
415 sending hello command
416 sending hello command
416 devel-peer-request: between
417 devel-peer-request: pairs: 81 bytes
418 sending between command
417 sending between command
419 remote: 413
418 remote: 413
420 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
419 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
Show file before | Show file after | Hide comments
@@ -58,10 +58,9 b' Test a normal behaving server, for sanit'
58 $ hg --debug debugpeer ssh://user@dummy/server
58 $ hg --debug debugpeer ssh://user@dummy/server
59 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
59 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
60 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
60 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
61 devel-peer-request: hello
61 devel-peer-request: hello+between
62 devel-peer-request: pairs: 81 bytes
62 sending hello command
63 sending hello command
63 devel-peer-request: between
64 devel-peer-request: pairs: 81 bytes
65 sending between command
64 sending between command
66 remote: 413
65 remote: 413
67 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
66 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
@@ -170,10 +169,9 b' SSH banner is not printed by default, ig'
170 $ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server
169 $ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server
171 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
170 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
172 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
171 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
173 devel-peer-request: hello
172 devel-peer-request: hello+between
173 devel-peer-request: pairs: 81 bytes
174 sending hello command
174 sending hello command
175 devel-peer-request: between
176 devel-peer-request: pairs: 81 bytes
177 sending between command
175 sending between command
178 remote: banner: line 0
176 remote: banner: line 0
179 remote: banner: line 1
177 remote: banner: line 1
@@ -262,10 +260,9 b' servers.'
262 $ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server
260 $ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server
263 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
261 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
264 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
262 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
265 devel-peer-request: hello
263 devel-peer-request: hello+between
264 devel-peer-request: pairs: 81 bytes
266 sending hello command
265 sending hello command
267 devel-peer-request: between
268 devel-peer-request: pairs: 81 bytes
269 sending between command
266 sending between command
270 remote: 0
267 remote: 0
271 remote: 1
268 remote: 1
@@ -310,10 +307,9 b' Sending an unknown command to the server'
310 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
307 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
311 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
308 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
312 sending no-args command
309 sending no-args command
313 devel-peer-request: hello
310 devel-peer-request: hello+between
311 devel-peer-request: pairs: 81 bytes
314 sending hello command
312 sending hello command
315 devel-peer-request: between
316 devel-peer-request: pairs: 81 bytes
317 sending between command
313 sending between command
318 remote: 0
314 remote: 0
319 remote: 413
315 remote: 413
@@ -383,10 +379,9 b' Send multiple unknown commands before he'
383 sending unknown1 command
379 sending unknown1 command
384 sending unknown2 command
380 sending unknown2 command
385 sending unknown3 command
381 sending unknown3 command
386 devel-peer-request: hello
382 devel-peer-request: hello+between
383 devel-peer-request: pairs: 81 bytes
387 sending hello command
384 sending hello command
388 devel-peer-request: between
389 devel-peer-request: pairs: 81 bytes
390 sending between command
385 sending between command
391 remote: 0
386 remote: 0
392 remote: 0
387 remote: 0
@@ -958,10 +953,9 b' Send an upgrade request to a server that'
958 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
953 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
959 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
954 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
960 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
955 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
961 devel-peer-request: hello
956 devel-peer-request: hello+between
957 devel-peer-request: pairs: 81 bytes
962 sending hello command
958 sending hello command
963 devel-peer-request: between
964 devel-peer-request: pairs: 81 bytes
965 sending between command
959 sending between command
966 remote: 0
960 remote: 0
967 remote: 413
961 remote: 413
@@ -1017,10 +1011,9 b' Send an upgrade request to a server that'
1017 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
1011 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
1018 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1012 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1019 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
1013 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
1020 devel-peer-request: hello
1014 devel-peer-request: hello+between
1015 devel-peer-request: pairs: 81 bytes
1021 sending hello command
1016 sending hello command
1022 devel-peer-request: between
1023 devel-peer-request: pairs: 81 bytes
1024 sending between command
1017 sending between command
1025 protocol upgraded to exp-ssh-v2-0001
1018 protocol upgraded to exp-ssh-v2-0001
1026 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
1019 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
@@ -1037,10 +1030,9 b' Verify the peer has capabilities'
1037 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
1030 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
1038 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1031 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1039 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
1032 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
1040 devel-peer-request: hello
1033 devel-peer-request: hello+between
1034 devel-peer-request: pairs: 81 bytes
1041 sending hello command
1035 sending hello command
1042 devel-peer-request: between
1043 devel-peer-request: pairs: 81 bytes
1044 sending between command
1036 sending between command
1045 protocol upgraded to exp-ssh-v2-0001
1037 protocol upgraded to exp-ssh-v2-0001
1046 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
1038 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
Show file before | Show file after | Hide comments
@@ -490,10 +490,9 b' debug output'
490 pulling from ssh://user@dummy/remote
490 pulling from ssh://user@dummy/remote
491 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
491 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
492 sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
492 sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
493 devel-peer-request: hello
493 devel-peer-request: hello+between
494 devel-peer-request: pairs: 81 bytes
494 sending hello command
495 sending hello command
495 devel-peer-request: between
496 devel-peer-request: pairs: 81 bytes
497 sending between command
496 sending between command
498 remote: 413 (sshv1 !)
497 remote: 413 (sshv1 !)
499 protocol upgraded to exp-ssh-v2-0001 (sshv2 !)
498 protocol upgraded to exp-ssh-v2-0001 (sshv2 !)
General Comments 0
You need to be logged in to leave comments. Login now