This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2205

sshpeer: log remote capabilities after protocol upgrade
ClosedPublic

Authored by indygreg on Feb 12 2018, 7:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7218e93ade47: sshpeer: log remote capabilities after protocol upgrade
rHGb06bba6d821d: sshpeer: log remote capabilities after protocol upgrade
Summary

This helps reduce variance with version 1 and will help prevent
test output divergence as we start testing protocol version 2 more
widely.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 12 2018, 7:46 PM
Closed by commit rHGb06bba6d821d: sshpeer: log remote capabilities after protocol upgrade (authored by indygreg). · Explain WhyFeb 14 2018, 9:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (2 lines)
Mtests/test-ssh-proto.t (2 lines)

Diff 5739

mercurial/sshpeer.py

valuelen = int(line) valuelen = int(line)
except ValueError: except ValueError:
badresponse() badresponse()
capsline = stdout.read(valuelen) capsline = stdout.read(valuelen)
if not capsline.startswith('capabilities: '): if not capsline.startswith('capabilities: '):
badresponse() badresponse()
ui.debug('remote: %s\n' % capsline)
caps.update(capsline.split(':')[1].split()) caps.update(capsline.split(':')[1].split())
# Trailing newline. # Trailing newline.
stdout.read(1) stdout.read(1)
# Error if we couldn't find capabilities, this means: # Error if we couldn't find capabilities, this means:
# #
# 1. Remote isn't a Mercurial server # 1. Remote isn't a Mercurial server
# 2. Remote is a <0.9.1 Mercurial server # 2. Remote is a <0.9.1 Mercurial server

tests/test-ssh-proto.t

running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
devel-peer-request: hello devel-peer-request: hello
sending hello command sending hello command
devel-peer-request: between devel-peer-request: between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending between command sending between command
protocol upgraded to exp-ssh-v2-0001 protocol upgraded to exp-ssh-v2-0001
remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
url: ssh://user@dummy/server url: ssh://user@dummy/server
local: no local: no
pushable: yes pushable: yes
Verify the peer has capabilities Verify the peer has capabilities
$ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
devel-peer-request: hello devel-peer-request: hello
sending hello command sending hello command
devel-peer-request: between devel-peer-request: between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending between command sending between command
protocol upgraded to exp-ssh-v2-0001 protocol upgraded to exp-ssh-v2-0001
remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
Main capabilities: Main capabilities:
batch batch
branchmap branchmap
$USUAL_BUNDLE2_CAPS_SERVER$ $USUAL_BUNDLE2_CAPS_SERVER$
changegroupsubset changegroupsubset
getbundle getbundle
known known
lookup lookup