This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2513

wireproto: only expose "between" to version 1 of wire protocols
ClosedPublic

Authored by indygreg on Mar 1 2018, 11:34 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGed7705017749: wireproto: only expose "between" to version 1 of wire protocols
Summary

We recently marked other legacy commands as only available to version 1
of the wire protocols. We held off marking "between" because it is
used as part of the SSH handshake.

Since SSH servers assume they are version 1 by default and the
"between" request that is issued as part of the version 2 handshake
is swallowed and not operated on, everything should "just work" if
"between" is not available to version 2.

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.Mar 1 2018, 11:34 AM
durin42 accepted this revision.Mar 2 2018, 7:15 PM
This revision is now accepted and ready to land.Mar 2 2018, 7:15 PM
Closed by commit rHGed7705017749: wireproto: only expose "between" to version 1 of wire protocols (authored by indygreg). · Explain WhyMar 2 2018, 7:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireproto.py (4 lines)

Diff 6414

mercurial/wireproto.py

# raw bytes (for backwards compatibility). # raw bytes (for backwards compatibility).
assert isinstance(result, (bytesresponse, bytes)) assert isinstance(result, (bytesresponse, bytes))
if isinstance(result, bytesresponse): if isinstance(result, bytesresponse):
result = result.data result = result.data
res.append(escapearg(result)) res.append(escapearg(result))
return bytesresponse(';'.join(res)) return bytesresponse(';'.join(res))
# TODO mark as version 1 transport only once interaction with @wireprotocommand('between', 'pairs', transportpolicy=POLICY_V1_ONLY)
# SSH handshake mechanism is figured out.
@wireprotocommand('between', 'pairs')
def between(repo, proto, pairs): def between(repo, proto, pairs):
pairs = [decodelist(p, '-') for p in pairs.split(" ")] pairs = [decodelist(p, '-') for p in pairs.split(" ")]
r = [] r = []
for b in repo.between(pairs): for b in repo.between(pairs):
r.append(encodelist(b) + "\n") r.append(encodelist(b) + "\n")
return bytesresponse(''.join(r)) return bytesresponse(''.join(r))