Mercurial > evolve
changeset 3412:7d4347e1b1d5 stable
tests: update test output to match 4.4
The stable branch is sitll 4.4.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 20:45:13 +0100 |
| parents | e1f3e43a50a4 |
| children | 0c4967f60eeb |
| files | tests/test-discovery-obshashrange.t tests/test-evolve-templates.t tests/test-evolve.t tests/test-topic-stack.t tests/test-wireproto.t |
| diffstat | 5 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t Mon Jan 15 19:52:00 2018 +0100 +++ b/tests/test-discovery-obshashrange.t Mon Jan 15 20:45:13 2018 +0100 @@ -178,7 +178,7 @@ running python "*/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) sending hello command sending between command - remote: 495 + remote: 483 remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob) remote: 1 preparing listkeys for "phases" @@ -213,7 +213,7 @@ 45f8b879de922f6a6e620ba04205730335b6fc7e sending unbundle command bundle2-output-bundle: "HG20", 4 parts total - bundle2-output-part: "replycaps" 195 bytes payload + bundle2-output-part: "replycaps" 185 bytes payload bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "obsmarkers" streamed payload
--- a/tests/test-evolve-templates.t Mon Jan 15 19:52:00 2018 +0100 +++ b/tests/test-evolve-templates.t Mon Jan 15 20:45:13 2018 +0100 @@ -1161,7 +1161,6 @@ o ea207398892e $ hg up -r "desc(B0)" --hidden - updating to a hidden changeset 0dec01379d3b 2 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its parent successor) @@ -1526,7 +1525,6 @@ o ea207398892e $ hg up --hidden 4 - updating to a hidden changeset 9bd10a0775e4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (9bd10a0775e4) (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
--- a/tests/test-evolve.t Mon Jan 15 19:52:00 2018 +0100 +++ b/tests/test-evolve.t Mon Jan 15 20:45:13 2018 +0100 @@ -1111,7 +1111,7 @@ $ glog @ 16:0cf3707e8971@default(draft) a3 | - | o 15:daa1ff1c7fbd@default@default(draft) add gh + | o 15:daa1ff1c7fbd@default(draft) add gh | | | | o 14:484fb3cfa7f2@default(draft) add gg | |/ @@ -1312,7 +1312,7 @@ $ glog -r "0cf3707e8971::" @ 23:0ef9ff75f8e2@default(draft) add j1 | - | o 21:89e4f7e8feb5@default(draft) add j3 + | o 21:89e4f7e8feb5@default(draft) add j3 | | | o 20:4cd61236beca@default(draft) add j2 | |
--- a/tests/test-topic-stack.t Mon Jan 15 19:52:00 2018 +0100 +++ b/tests/test-topic-stack.t Mon Jan 15 20:45:13 2018 +0100 @@ -864,13 +864,13 @@ | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000) | x 907f7d3c2333 (18) c_G - | rewritten(content) as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000) | x 3ab2eedae500 (13) c_G - | rewritten(parent) as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000) | x c7d60a180d05 (6) c_G - rewritten(user) as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000) $ hg export . # HG changeset patch
--- a/tests/test-wireproto.t Mon Jan 15 19:52:00 2018 +0100 +++ b/tests/test-wireproto.t Mon Jan 15 20:45:13 2018 +0100 @@ -195,7 +195,7 @@ $ cat hg.pid >> $DAEMON_PIDS $ curl -s http://localhost:$HGPORT/?cmd=capabilities - _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) + _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) Check we cannot use pushkey for marker exchange anymore