Mercurial > public > mercurial-scm > hg-stable
diff tests/test-ssh-proto.t @ 40176:41263df08109
wireprotov2: change how revisions are specified to changesetdata
Right now, we have a handful of arguments for specifying the revisions
whose data should be returned. Defining how all these arguments
interact when various combinations are present is difficult.
This commit establishes a new, generic mechanism for specifying
revisions. Instead of a hodgepodge of arguments defining things, we
have a list of dicts that specify revision selectors. The final set
of revisions is a union of all these selectors.
We implement support for specifying revisions based on:
* An explicit list of changeset revisions
* An explicit list of changeset revisions plus ancestry depth
* A DAG range between changeset roots and heads
If you squint hard enough, this problem has already been solved by
revsets. But I'm reluctant to expose revsets to the wire protocol
because that would require servers to implement a revset parser.
Plus there are security and performance implications: the set
of revision selectors needs to be narrowly and specifically tailored
for what is appropriate to be executing on a server. Perhaps there
would be a way for us to express the "parse tree" of a revset
query, for example. I'm not sure. We can explore this space another
time. For now, the new mechanism should bring sufficient flexibility
while remaining relatively simple.
The selector "types" are prefixed with "changeset" because I plan
to add manifest and file-flavored selectors as well. This will enable
us to e.g. select file revisions based on a range of changeset
revisions.
Differential Revision: https://phab.mercurial-scm.org/D4979
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 08 Oct 2018 18:17:12 -0700 |
| parents | d059cb669632 |
| children | 1a1b957f5f2a |
line wrap: on
line diff
--- a/tests/test-ssh-proto.t Mon Oct 08 17:54:14 2018 -0700 +++ b/tests/test-ssh-proto.t Mon Oct 08 18:17:12 2018 -0700 @@ -954,7 +954,7 @@ $ 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 !) running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) - sending upgrade request: * proto=exp-ssh-v2-0002 (glob) + sending upgrade request: * proto=exp-ssh-v2-0003 (glob) devel-peer-request: hello+between devel-peer-request: pairs: 81 bytes sending hello command @@ -984,7 +984,7 @@ $ hg debugwireproto --localssh --peer raw << EOF > raw - > upgrade this-is-some-token proto=exp-ssh-v2-0002\n + > upgrade this-is-some-token proto=exp-ssh-v2-0003\n > hello\n > between\n > pairs 81\n @@ -995,13 +995,13 @@ > EOF using raw connection to peer i> write(153) -> 153: - i> upgrade this-is-some-token proto=exp-ssh-v2-0002\n + i> upgrade this-is-some-token proto=exp-ssh-v2-0003\n i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 o> readline() -> 44: - o> upgraded this-is-some-token exp-ssh-v2-0002\n + o> upgraded this-is-some-token exp-ssh-v2-0003\n o> readline() -> 4: o> 426\n o> readline() -> 427: @@ -1012,12 +1012,12 @@ $ 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 !) running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) - sending upgrade request: * proto=exp-ssh-v2-0002 (glob) + sending upgrade request: * proto=exp-ssh-v2-0003 (glob) devel-peer-request: hello+between devel-peer-request: pairs: 81 bytes sending hello command sending between command - protocol upgraded to exp-ssh-v2-0002 + protocol upgraded to exp-ssh-v2-0003 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash devel-peer-request: protocaps devel-peer-request: caps: * bytes (glob) @@ -1031,12 +1031,12 @@ $ 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) (windows !) - sending upgrade request: * proto=exp-ssh-v2-0002 (glob) + sending upgrade request: * proto=exp-ssh-v2-0003 (glob) devel-peer-request: hello+between devel-peer-request: pairs: 81 bytes sending hello command sending between command - protocol upgraded to exp-ssh-v2-0002 + protocol upgraded to exp-ssh-v2-0003 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash devel-peer-request: protocaps devel-peer-request: caps: * bytes (glob) @@ -1087,7 +1087,7 @@ $ hg debugwireproto --localssh --peer raw << EOF > raw - > upgrade this-is-some-token proto=exp-ssh-v2-0002\n + > upgrade this-is-some-token proto=exp-ssh-v2-0003\n > hello\n > between\n > pairs 81\n @@ -1102,13 +1102,13 @@ > EOF using raw connection to peer i> write(153) -> 153: - i> upgrade this-is-some-token proto=exp-ssh-v2-0002\n + i> upgrade this-is-some-token proto=exp-ssh-v2-0003\n i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 o> readline() -> 44: - o> upgraded this-is-some-token exp-ssh-v2-0002\n + o> upgraded this-is-some-token exp-ssh-v2-0003\n o> readline() -> 4: o> 426\n o> readline() -> 427: @@ -1124,7 +1124,7 @@ $ hg debugwireproto --localssh --peer raw << EOF > raw - > upgrade this-is-some-token proto=exp-ssh-v2-0002\n + > upgrade this-is-some-token proto=exp-ssh-v2-0003\n > hello\n > between\n > pairs 81\n @@ -1140,13 +1140,13 @@ > EOF using raw connection to peer i> write(153) -> 153: - i> upgrade this-is-some-token proto=exp-ssh-v2-0002\n + i> upgrade this-is-some-token proto=exp-ssh-v2-0003\n i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 o> readline() -> 44: - o> upgraded this-is-some-token exp-ssh-v2-0002\n + o> upgraded this-is-some-token exp-ssh-v2-0003\n o> readline() -> 4: o> 426\n o> readline() -> 427: @@ -1236,14 +1236,14 @@ $ hg debugwireproto --localssh --peer raw << EOF > raw - > upgrade token proto=exp-ssh-v2-0002\n + > upgrade token proto=exp-ssh-v2-0003\n > invalid\n > readline > readavailable > EOF using raw connection to peer i> write(44) -> 44: - i> upgrade token proto=exp-ssh-v2-0002\n + i> upgrade token proto=exp-ssh-v2-0003\n i> invalid\n o> readline() -> 1: o> \n @@ -1253,7 +1253,7 @@ $ hg debugwireproto --localssh --peer raw << EOF > raw - > upgrade token proto=exp-ssh-v2-0002\n + > upgrade token proto=exp-ssh-v2-0003\n > hello\n > invalid\n > readline @@ -1261,7 +1261,7 @@ > EOF using raw connection to peer i> write(50) -> 50: - i> upgrade token proto=exp-ssh-v2-0002\n + i> upgrade token proto=exp-ssh-v2-0003\n i> hello\n i> invalid\n o> readline() -> 1: @@ -1272,7 +1272,7 @@ $ hg debugwireproto --localssh --peer raw << EOF > raw - > upgrade token proto=exp-ssh-v2-0002\n + > upgrade token proto=exp-ssh-v2-0003\n > hello\n > between\n > invalid\n @@ -1281,7 +1281,7 @@ > EOF using raw connection to peer i> write(58) -> 58: - i> upgrade token proto=exp-ssh-v2-0002\n + i> upgrade token proto=exp-ssh-v2-0003\n i> hello\n i> between\n i> invalid\n @@ -1368,14 +1368,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1448,14 +1448,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1512,14 +1512,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1582,14 +1582,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1661,14 +1661,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1746,14 +1746,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1834,14 +1834,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1909,14 +1909,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -1979,14 +1979,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -2058,14 +2058,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash @@ -2164,14 +2164,14 @@ testing ssh2 creating ssh peer from handshake results i> write(171) -> 171: - i> upgrade * proto=exp-ssh-v2-0002\n (glob) + i> upgrade * proto=exp-ssh-v2-0003\n (glob) i> hello\n i> between\n i> pairs 81\n i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> flush() -> None o> readline() -> 62: - o> upgraded * exp-ssh-v2-0002\n (glob) + o> upgraded * exp-ssh-v2-0003\n (glob) o> readline() -> 4: o> 426\n o> read(426) -> 426: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash