Mercurial > public > mercurial-scm > hg
annotate tests/test-clone-uncompressed.t @ 45892:06b64fabf91c
copies: cache the ancestor checking call when tracing copy
A good share of the time spent in this function is spent doing ancestors
checking. To avoid spending time in duplicated call, we cache the result of
calls.
In the slower case, this provide a quite significant performance boost. Below
are the result for a set of selected pairs (many of them pathological):
(And further down is another table that summarize the current state of filelog
based vs changeset base copy tracing)
The benchmark have been configured to be killed after 6 minutes of runtime,
which mean that any detect slower than 2 minutes will be marked as "killed".
This drop some useful information about how much slower these case are? but also
prevent 99% of the benchmark time to be spent on case that can be labelled "very
slow" anyway.
Repo Case Source-Rev Dest-Rev Old-Time New-Time Difference Factor
------------------------------------------------------------------------------------------------------------------------------------
mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000044 s, +0.000000 s, ? 1.0000
mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000138 s, +0.000000 s, ? 1.0000
mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005067 s, 0.005052 s, -0.000015 s, ? 0.9970
pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000218 s, 0.000219 s, +0.000001 s, ? 1.0046
pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000053 s, 0.000055 s, +0.000002 s, ? 1.0377
pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000125 s, 0.000128 s, +0.000003 s, ? 1.0240
pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001098 s, 0.001089 s, -0.000009 s, ? 0.9918
pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017546 s, 0.017407 s, -0.000139 s, ? 0.9921
pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.096723 s, 0.094175 s, -0.002548 s, ? 0.9737
pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.271796 s, 0.238009 s, -0.033787 s, ? 0.8757
pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.128602 s, 0.125876 s, -0.002726 s, ? 0.9788
pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 7.086742 s, 3.581556 s, -3.505186 s, ? 0.5054
pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016634 s, 0.016721 s, +0.000087 s, ? 1.0052
pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.254225 s, 0.242367 s, -0.011858 s, ? 0.9534
netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000166 s, 0.000165 s, -0.000001 s, ? 0.9940
netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000118 s, 0.000114 s, -0.000004 s, ? 0.9661
netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000296 s, +0.000000 s, ? 1.0000
netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001137 s, 0.001124 s, -0.000013 s, ? 0.9886
netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.014133 s, 0.013060 s, -0.001073 s, ? 0.9241
netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.016988 s, 0.017112 s, +0.000124 s, ? 1.0073
netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.676361 s, 0.660350 s, -0.016011 s, ? 0.9763
netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 12.515149 s, 10.032499 s, -2.482650 s, ? 0.8016
mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000186 s, 0.000189 s, +0.000003 s, ? 1.0161
mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000459 s, 0.000462 s, +0.000003 s, ? 1.0065
mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000273 s, 0.000270 s, -0.000003 s, ? 0.9890
mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001503 s, 0.001474 s, -0.000029 s, ? 0.9807
mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004862 s, 0.004806 s, -0.000056 s, ? 0.9885
mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088291 s, 0.085150 s, -0.003141 s, ? 0.9644
mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007113 s, 0.007064 s, -0.000049 s, ? 0.9931
mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004687 s, 0.004741 s, +0.000054 s, ? 1.0115
mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.198710 s, 0.190133 s, -0.008577 s, ? 0.9568
mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.036068 s, 0.035651 s, -0.000417 s, ? 0.9884
mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.465362 s, 0.440694 s, -0.024668 s, ? 0.9470
mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 24.519684 s, 18.454163 s, -6.065521 s, ? 0.7526
mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 42.711897 s, 31.562719 s, -11.149178 s, ? 0.7390
mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001201 s, 0.001189 s, -0.000012 s, ? 0.9900
mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001216 s, 0.001204 s, -0.000012 s, ? 0.9901
mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000595 s, 0.000586 s, -0.000009 s, ? 0.9849
mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001856 s, 0.001845 s, -0.000011 s, ? 0.9941
mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.064936 s, 0.063822 s, -0.001114 s, ? 0.9828
mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.090601 s, 0.088038 s, -0.002563 s, ? 0.9717
mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007510 s, 0.007389 s, -0.000121 s, ? 0.9839
mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004911 s, 0.004868 s, -0.000043 s, ? 0.9912
mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.233231 s, 0.222450 s, -0.010781 s, ? 0.9538
mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.419989 s, 0.370675 s, -0.049314 s, ? 0.8826
mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.401521 s, 0.358020 s, -0.043501 s, ? 0.8917
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.179555 s, 0.145235 s, -0.034320 s, ? 0.8089
mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.038004 s, 0.037606 s, -0.000398 s, ? 0.9895
mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 52.838482 s, 7.382439 s, -45.456043 s, ? 0.1397
mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 8.705874 s, 7.273506 s, -1.432368 s, ? 0.8355
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.126708 s, 1.074593 s, -0.052115 s, ? 0.9537
mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 83.854020 s, 27.746195 s, -56.107825 s, ? 0.3309
Below is a table comparing the runtime of the current "filelog centric"
algorithm, with the "changeset centric" one, we just modified.
The changeset centric algorithm is a significant win in many scenario, but they
are still various cases where it is quite slower. When many revision has to be
considered the cost of retrieving the copy information, creating new
dictionaries, merging dictionaries and checking if revision are ancestors of
each other can slow things down.
The rest of this series, will introduce a rust version of the copy tracing code
to deal with most of theses issues.
Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor
---------------------------------------------------------------------------------------------------------------------------------------
mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000914 s, 0.000044 s, - 0.000870 s, ? 0.048140
mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001812 s, 0.000138 s, - 0.001674 s, ? 0.076159
mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.017954 s, 0.005052 s, - 0.012902 s, ? 0.281386
pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001509 s, 0.000219 s, - 0.001290 s, ? 0.145129
pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.206881 s, 0.000055 s, - 0.206826 s, ? 0.000266
pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016951 s, 0.000128 s, - 0.016823 s, ? 0.007551
pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019096 s, 0.001089 s, - 0.018007 s, ? 0.057028
pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.762506 s, 0.017407 s, - 0.745099 s, ? 0.022829
pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.179211 s, 0.094175 s, - 1.085036 s, ? 0.079863
pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.249058 s, 0.238009 s, - 1.011049 s, ? 0.190551
pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.614107 s, 0.125876 s, - 1.488231 s, ? 0.077985
pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001064 s, 3.581556 s, + 3.580492 s, ? 3366.124060
pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.061275 s, 0.016721 s, - 1.044554 s, ? 0.015756
pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.341119 s, 0.242367 s, - 1.098752 s, ? 0.180720
netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027803 s, 0.000165 s, - 0.027638 s, ? 0.005935
netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.130014 s, 0.000114 s, - 0.129900 s, ? 0.000877
netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.024990 s, 0.000296 s, - 0.024694 s, ? 0.011845
netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052201 s, 0.001124 s, - 0.051077 s, ? 0.021532
netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037642 s, 0.013060 s, - 0.024582 s, ? 0.346953
netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.197086 s, 0.017112 s, - 0.179974 s, ? 0.086825
netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.935148 s, 0.660350 s, - 0.274798 s, ? 0.706145
netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.920674 s, 10.032499 s, + 6.111825 s, ? 2.558871
mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024232 s, 0.000189 s, - 0.024043 s, ? 0.007800
mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141483 s, 0.000462 s, - 0.141021 s, ? 0.003265
mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025775 s, 0.000270 s, - 0.025505 s, ? 0.010475
mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.084922 s, 0.001474 s, - 0.083448 s, ? 0.017357
mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.194784 s, 0.004806 s, - 0.189978 s, ? 0.024673
mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.161103 s, 0.085150 s, - 2.075953 s, ? 0.039401
mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089347 s, 0.007064 s, - 0.082283 s, ? 0.079063
mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.732171 s, 0.004741 s, - 0.727430 s, ? 0.006475
mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.157287 s, 0.190133 s, - 0.967154 s, ? 0.164292
mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.726568 s, 0.035651 s, - 6.690917 s, ? 0.005300
mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.266229 s, 0.440694 s, - 2.825535 s, ? 0.134924
mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 15.860534 s, 18.454163 s, + 2.593629 s, ? 1.163527
mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.450475 s, 31.562719 s, +11.112244 s, ? 1.543373
mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080442 s, 0.001189 s, - 0.079253 s, ? 0.014781
mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.497672 s, 0.001204 s, - 0.496468 s, ? 0.002419
mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021183 s, 0.000586 s, - 0.020597 s, ? 0.027664
mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.230991 s, 0.001845 s, - 0.229146 s, ? 0.007987
mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118461 s, 0.063822 s, - 1.054639 s, ? 0.057062
mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.206083 s, 0.088038 s, - 2.118045 s, ? 0.039907
mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089404 s, 0.007389 s, - 0.082015 s, ? 0.082647
mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.733043 s, 0.004868 s, - 0.728175 s, ? 0.006641
mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.163367 s, 0.222450 s, - 0.940917 s, ? 0.191212
mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.085456 s, 0.370675 s, + 0.285219 s, ? 4.337612
mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.083601 s, 0.358020 s, + 0.274419 s, ? 4.282485
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.366614 s, 0.145235 s, - 7.221379 s, ? 0.019715
mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.664464 s, 0.037606 s, - 6.626858 s, ? 0.005643
mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.467836 s, 7.382439 s, - 0.085397 s, ? 0.988565
mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.801294 s, 7.273506 s, - 2.527788 s, ? 0.742097
mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.091886 s, killed
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.491140 s, 1.074593 s, -25.416547 s, ? 0.040564
mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.092863 s, killed
mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.226823 s, killed
mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 18.914630 s, 27.746195 s, + 8.831565 s, ? 1.466917
mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.198903 s, killed
mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 24.952268 s, killed
Differential Revision: https://phab.mercurial-scm.org/D9296
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 02 Nov 2020 11:03:56 +0100 |
parents | 23119371df5e |
children | 95a615dd77bf |
rev | line source |
---|---|
38021
538e850ae737
tests: mark tests that fail when using chg as #require no-chg
Kyle Lippincott <spectral@google.com>
parents:
37667
diff
changeset
|
1 #require serve no-reposimplestore no-chg |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
3 #testcases stream-legacy stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
4 |
39722
4bd6e444c76f
bundle2: make server.bundle2.stream default to True
Anton Shestakov <av6@dwimlabs.net>
parents:
39721
diff
changeset
|
5 #if stream-legacy |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
6 $ cat << EOF >> $HGRCPATH |
39721
1b5880352314
bundle2: graduate bundle2.stream option from experimental to server section
Anton Shestakov <av6@dwimlabs.net>
parents:
39301
diff
changeset
|
7 > [server] |
39722
4bd6e444c76f
bundle2: make server.bundle2.stream default to True
Anton Shestakov <av6@dwimlabs.net>
parents:
39721
diff
changeset
|
8 > bundle2.stream = no |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
9 > EOF |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
10 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
11 |
28389
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
12 Initialize repository |
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
13 the status call is to check for issue5130 |
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
14 |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
15 $ hg init server |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
16 $ cd server |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
17 $ touch foo |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
18 $ hg -q commit -A -m initial |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
19 >>> for i in range(1024): |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
20 ... with open(str(i), 'wb') as fh: |
37667
701c261fba83
py3: use b"%d" instead of str() to convert int to bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37349
diff
changeset
|
21 ... fh.write(b"%d" % i) and None |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
22 $ hg -q commit -A -m 'add a lot of files' |
28389
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
23 $ hg st |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
24 $ hg --config server.uncompressed=false serve -p $HGPORT -d --pid-file=hg.pid |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
25 $ cat hg.pid > $DAEMON_PIDS |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
26 $ cd .. |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
27 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
28 Cannot stream clone when server.uncompressed is set |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
29 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
30 $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=stream_out' |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
31 200 Script output follows |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
32 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
33 1 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
34 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
35 #if stream-legacy |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
36 $ hg debugcapabilities http://localhost:$HGPORT |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
37 Main capabilities: |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
38 batch |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
39 branchmap |
35792
1d118f9f4f57
bundle2: always advertise client support for stream parts
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35791
diff
changeset
|
40 $USUAL_BUNDLE2_CAPS_SERVER$ |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
41 changegroupsubset |
35806
ab239e3de23b
tests: add a pattern to fix --pure tests
Augie Fackler <augie@google.com>
parents:
35805
diff
changeset
|
42 compression=$BUNDLE2_COMPRESSIONS$ |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
43 getbundle |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
44 httpheader=1024 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
45 httpmediatype=0.1rx,0.1tx,0.2tx |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
46 known |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
47 lookup |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
48 pushkey |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
49 unbundle=HG10GZ,HG10BZ,HG10UN |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
50 unbundlehash |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
51 Bundle2 capabilities: |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
52 HG20 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
53 bookmarks |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
54 changegroup |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
55 01 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
56 02 |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42931
diff
changeset
|
57 checkheads |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42931
diff
changeset
|
58 related |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
59 digests |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
60 md5 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
61 sha1 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
62 sha512 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
63 error |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
64 abort |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
65 unsupportedcontent |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
66 pushraced |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
67 pushkey |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
68 hgtagsfnodes |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
69 listkeys |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
70 phases |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
71 heads |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
72 pushkey |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
73 remote-changegroup |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
74 http |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
75 https |
36968
2090044a288d
revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents:
35813
diff
changeset
|
76 rev-branch-cache |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
77 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
78 $ hg clone --stream -U http://localhost:$HGPORT server-disabled |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
79 warning: stream clone requested but server has them disabled |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
80 requesting all changes |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
81 adding changesets |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
82 adding manifests |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
83 adding file changes |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
84 added 2 changesets with 1025 changes to 1025 files |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
85 new changesets 96ee1d7354c4:c17445101a72 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
86 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
87 $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto 0.2 --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1" |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
88 200 Script output follows |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
89 content-type: application/mercurial-0.2 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
90 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
91 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
92 $ f --size body --hexdump --bytes 100 |
35791
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
93 body: size=232 |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
94 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| |
35791
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
95 0010: cf 0b 45 52 52 4f 52 3a 41 42 4f 52 54 00 00 00 |..ERROR:ABORT...| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
96 0020: 00 01 01 07 3c 04 72 6d 65 73 73 61 67 65 73 74 |....<.rmessagest| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
97 0030: 72 65 61 6d 20 64 61 74 61 20 72 65 71 75 65 73 |ream data reques| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
98 0040: 74 65 64 20 62 75 74 20 73 65 72 76 65 72 20 64 |ted but server d| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
99 0050: 6f 65 73 20 6e 6f 74 20 61 6c 6c 6f 77 20 74 68 |oes not allow th| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
100 0060: 69 73 20 66 |is f| |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
101 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
102 #endif |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
103 #if stream-bundle2 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
104 $ hg debugcapabilities http://localhost:$HGPORT |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
105 Main capabilities: |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
106 batch |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
107 branchmap |
35792
1d118f9f4f57
bundle2: always advertise client support for stream parts
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35791
diff
changeset
|
108 $USUAL_BUNDLE2_CAPS_SERVER$ |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
109 changegroupsubset |
35806
ab239e3de23b
tests: add a pattern to fix --pure tests
Augie Fackler <augie@google.com>
parents:
35805
diff
changeset
|
110 compression=$BUNDLE2_COMPRESSIONS$ |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
111 getbundle |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
112 httpheader=1024 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
113 httpmediatype=0.1rx,0.1tx,0.2tx |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
114 known |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
115 lookup |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
116 pushkey |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
117 unbundle=HG10GZ,HG10BZ,HG10UN |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
118 unbundlehash |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
119 Bundle2 capabilities: |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
120 HG20 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
121 bookmarks |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
122 changegroup |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
123 01 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
124 02 |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42931
diff
changeset
|
125 checkheads |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42931
diff
changeset
|
126 related |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
127 digests |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
128 md5 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
129 sha1 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
130 sha512 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
131 error |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
132 abort |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
133 unsupportedcontent |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
134 pushraced |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
135 pushkey |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
136 hgtagsfnodes |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
137 listkeys |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
138 phases |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
139 heads |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
140 pushkey |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
141 remote-changegroup |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
142 http |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
143 https |
36968
2090044a288d
revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents:
35813
diff
changeset
|
144 rev-branch-cache |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
145 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
146 $ hg clone --stream -U http://localhost:$HGPORT server-disabled |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
147 warning: stream clone requested but server has them disabled |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
148 requesting all changes |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
149 adding changesets |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
150 adding manifests |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
151 adding file changes |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
152 added 2 changesets with 1025 changes to 1025 files |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
153 new changesets 96ee1d7354c4:c17445101a72 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
154 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
155 $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto 0.2 --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1" |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
156 200 Script output follows |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
157 content-type: application/mercurial-0.2 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
158 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
159 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
160 $ f --size body --hexdump --bytes 100 |
35791
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
161 body: size=232 |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
162 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| |
35791
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
163 0010: cf 0b 45 52 52 4f 52 3a 41 42 4f 52 54 00 00 00 |..ERROR:ABORT...| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
164 0020: 00 01 01 07 3c 04 72 6d 65 73 73 61 67 65 73 74 |....<.rmessagest| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
165 0030: 72 65 61 6d 20 64 61 74 61 20 72 65 71 75 65 73 |ream data reques| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
166 0040: 74 65 64 20 62 75 74 20 73 65 72 76 65 72 20 64 |ted but server d| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
167 0050: 6f 65 73 20 6e 6f 74 20 61 6c 6c 6f 77 20 74 68 |oes not allow th| |
9adae6a20e1f
exchange: don't send stream data when server.uncompressed is set
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35790
diff
changeset
|
168 0060: 69 73 20 66 |is f| |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
169 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
170 #endif |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
171 |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
172 $ killdaemons.py |
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
173 $ cd server |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
174 $ hg serve -p $HGPORT -d --pid-file=hg.pid |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
175 $ cat hg.pid > $DAEMON_PIDS |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
176 $ cd .. |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
177 |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
178 Basic clone |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
179 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
180 #if stream-legacy |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
181 $ hg clone --stream -U http://localhost:$HGPORT clone1 |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
182 streaming all changes |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
183 1027 files to transfer, 96.3 KB of data |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
184 transferred 96.3 KB in * seconds (*/sec) (glob) |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
185 searching for changes |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
186 no changes found |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
187 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
188 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
189 $ hg clone --stream -U http://localhost:$HGPORT clone1 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
190 streaming all changes |
40978
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
191 1030 files to transfer, 96.5 KB of data |
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
192 transferred 96.5 KB in * seconds (* */sec) (glob) |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
193 |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
194 $ ls -1 clone1/.hg/cache |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
195 branch2-served |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
196 rbc-names-v1 |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
197 rbc-revs-v1 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
198 #endif |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
199 |
35787
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
200 getbundle requests with stream=1 are uncompressed |
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
201 |
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
202 $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto '0.1 0.2 comp=zlib,none' --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1" |
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
203 200 Script output follows |
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
204 content-type: application/mercurial-0.2 |
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
205 |
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
206 |
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
207 $ f --size --hex --bytes 256 body |
40978
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
208 body: size=112262 |
35787
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
209 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| |
40890
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
210 0010: 7f 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
211 0020: 05 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 39 38 |....Dbytecount98| |
40978
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
212 0030: 37 37 35 66 69 6c 65 63 6f 75 6e 74 31 30 33 30 |775filecount1030| |
35788
b116a66bcc44
bundle2: move version of stream clone into part name
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35787
diff
changeset
|
213 0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote| |
35813
768326377e4d
bundle2: fix the formatting of the stream part requirements
Boris Feld <boris.feld@octobus.net>
parents:
35806
diff
changeset
|
214 0050: 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 25 |ncode%2Cfncache%| |
768326377e4d
bundle2: fix the formatting of the stream part requirements
Boris Feld <boris.feld@octobus.net>
parents:
35806
diff
changeset
|
215 0060: 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 32 |2Cgeneraldelta%2| |
40890
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
216 0070: 43 72 65 76 6c 6f 67 76 31 25 32 43 73 70 61 72 |Crevlogv1%2Cspar| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
217 0080: 73 65 72 65 76 6c 6f 67 25 32 43 73 74 6f 72 65 |serevlog%2Cstore| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
218 0090: 00 00 80 00 73 08 42 64 61 74 61 2f 30 2e 69 00 |....s.Bdata/0.i.| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
219 00a0: 03 00 01 00 00 00 00 00 00 00 02 00 00 00 01 00 |................| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
220 00b0: 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff 80 |................| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
221 00c0: 29 63 a0 49 d3 23 87 bf ce fe 56 67 92 67 2c 69 |)c.I.#....Vg.g,i| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
222 00d0: d1 ec 39 00 00 00 00 00 00 00 00 00 00 00 00 75 |..9............u| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
223 00e0: 30 73 08 42 64 61 74 61 2f 31 2e 69 00 03 00 01 |0s.Bdata/1.i....| |
5db7efa238bd
test: enable sparse-revlog for test-clone-uncompressed.t
Boris Feld <boris.feld@octobus.net>
parents:
40399
diff
changeset
|
224 00f0: 00 00 00 00 00 00 00 02 00 00 00 01 00 00 00 00 |................| |
35787
a84dbc87dae9
exchange: send bundle2 stream clones uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35767
diff
changeset
|
225 |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
226 --uncompressed is an alias to --stream |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
227 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
228 #if stream-legacy |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
229 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
230 streaming all changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
231 1027 files to transfer, 96.3 KB of data |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
232 transferred 96.3 KB in * seconds (*/sec) (glob) |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
233 searching for changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
234 no changes found |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
235 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
236 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
237 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
238 streaming all changes |
40978
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
239 1030 files to transfer, 96.5 KB of data |
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
240 transferred 96.5 KB in * seconds (* */sec) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
241 #endif |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
242 |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
243 Clone with background file closing enabled |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
244 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
245 #if stream-legacy |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
246 $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
247 using http://localhost:$HGPORT/ |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
248 sending capabilities command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
249 sending branchmap command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
250 streaming all changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
251 sending stream_out command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
252 1027 files to transfer, 96.3 KB of data |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
253 starting 4 threads for background file closing |
39301
5763216ba311
transaction: remember original len(repo) instead of tracking added revs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
38021
diff
changeset
|
254 updating the branch cache |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
255 transferred 96.3 KB in * seconds (*/sec) (glob) |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
256 query 1; heads |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
257 sending batch command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
258 searching for changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
259 all remote heads known locally |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
260 no changes found |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
261 sending getbundle command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
262 bundle2-input-bundle: with-transaction |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
263 bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
34322
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
32744
diff
changeset
|
264 bundle2-input-part: "phase-heads" supported |
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
32744
diff
changeset
|
265 bundle2-input-part: total payload size 24 |
42931
181ee2118a96
bundle2: fix an off-by-one in debug message of number of parts
Martin von Zweigbergk <martinvonz@google.com>
parents:
42893
diff
changeset
|
266 bundle2-input-bundle: 2 parts total |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
267 checking for updated bookmarks |
40034
393e44324037
httppeer: report http statistics
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39722
diff
changeset
|
268 (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
269 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
270 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
271 $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
272 using http://localhost:$HGPORT/ |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
273 sending capabilities command |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
274 query 1; heads |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
275 sending batch command |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
276 streaming all changes |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
277 sending getbundle command |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
278 bundle2-input-bundle: with-transaction |
35788
b116a66bcc44
bundle2: move version of stream clone into part name
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35787
diff
changeset
|
279 bundle2-input-part: "stream2" (params: 3 mandatory) supported |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
280 applying stream bundle |
40978
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
281 1030 files to transfer, 96.5 KB of data |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
282 starting 4 threads for background file closing |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
283 starting 4 threads for background file closing |
39301
5763216ba311
transaction: remember original len(repo) instead of tracking added revs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
38021
diff
changeset
|
284 updating the branch cache |
40978
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
285 transferred 96.5 KB in * seconds (* */sec) (glob) |
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
286 bundle2-input-part: total payload size 112094 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
287 bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
42931
181ee2118a96
bundle2: fix an off-by-one in debug message of number of parts
Martin von Zweigbergk <martinvonz@google.com>
parents:
42893
diff
changeset
|
288 bundle2-input-bundle: 2 parts total |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
289 checking for updated bookmarks |
40034
393e44324037
httppeer: report http statistics
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39722
diff
changeset
|
290 (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
291 #endif |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
292 |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
293 Cannot stream clone when there are secret changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
294 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
295 $ hg -R server phase --force --secret -r tip |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
296 $ hg clone --stream -U http://localhost:$HGPORT secret-denied |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
297 warning: stream clone requested but server has them disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
298 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
299 adding changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
300 adding manifests |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
301 adding file changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
302 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34483
diff
changeset
|
303 new changesets 96ee1d7354c4 |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
304 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
305 $ killdaemons.py |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
306 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
307 Streaming of secrets can be overridden by server config |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
308 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
309 $ cd server |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34393
diff
changeset
|
310 $ hg serve --config server.uncompressedallowsecret=true -p $HGPORT -d --pid-file=hg.pid |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
311 $ cat hg.pid > $DAEMON_PIDS |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
312 $ cd .. |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
313 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
314 #if stream-legacy |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
315 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
316 streaming all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
317 1027 files to transfer, 96.3 KB of data |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
318 transferred 96.3 KB in * seconds (*/sec) (glob) |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
319 searching for changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
320 no changes found |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
321 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
322 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
323 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
324 streaming all changes |
40978
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
325 1030 files to transfer, 96.5 KB of data |
42f59d3f714d
delta: exclude base candidate much smaller than the target
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
326 transferred 96.5 KB in * seconds (* */sec) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
327 #endif |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
328 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
329 $ killdaemons.py |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
330 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
331 Verify interaction between preferuncompressed and secret presence |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
332 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
333 $ cd server |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34393
diff
changeset
|
334 $ hg serve --config server.preferuncompressed=true -p $HGPORT -d --pid-file=hg.pid |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
335 $ cat hg.pid > $DAEMON_PIDS |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
336 $ cd .. |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
337 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
338 $ hg clone -U http://localhost:$HGPORT preferuncompressed-secret |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
339 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
340 adding changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
341 adding manifests |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
342 adding file changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
343 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34483
diff
changeset
|
344 new changesets 96ee1d7354c4 |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
345 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
346 $ killdaemons.py |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
347 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
348 Clone not allowed when full bundles disabled and can't serve secrets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
349 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
350 $ cd server |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34393
diff
changeset
|
351 $ hg serve --config server.disablefullbundle=true -p $HGPORT -d --pid-file=hg.pid |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
352 $ cat hg.pid > $DAEMON_PIDS |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
353 $ cd .. |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
354 |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
355 $ hg clone --stream http://localhost:$HGPORT secret-full-disabled |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
356 warning: stream clone requested but server has them disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
357 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
358 remote: abort: server has pull-based clones disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
359 abort: pull failed on remote |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
360 (remove --pull if specified or upgrade Mercurial) |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
361 [255] |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
362 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
363 Local stream clone with secrets involved |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
364 (This is just a test over behavior: if you have access to the repo's files, |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
365 there is no security so it isn't important to prevent a clone here.) |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
366 |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
367 $ hg clone -U --stream server local-secret |
32744
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
368 warning: stream clone requested but server has them disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
369 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
370 adding changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
371 adding manifests |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
372 adding file changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31252
diff
changeset
|
373 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34483
diff
changeset
|
374 new changesets 96ee1d7354c4 |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
375 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
376 Stream clone while repo is changing: |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
377 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
378 $ mkdir changing |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
379 $ cd changing |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
380 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
381 extension for delaying the server process so we reliably can modify the repo |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
382 while cloning |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
383 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
384 $ cat > delayer.py <<EOF |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
385 > import time |
31252
e7a35f18d91f
vfs: use 'vfs' module directly in 'test-clone-uncompressed'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29064
diff
changeset
|
386 > from mercurial import extensions, vfs |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
387 > def __call__(orig, self, path, *args, **kwargs): |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
388 > if path == 'data/f1.i': |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
389 > time.sleep(2) |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
390 > return orig(self, path, *args, **kwargs) |
31252
e7a35f18d91f
vfs: use 'vfs' module directly in 'test-clone-uncompressed'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29064
diff
changeset
|
391 > extensions.wrapfunction(vfs.vfs, '__call__', __call__) |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
392 > EOF |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
393 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
394 prepare repo with small and big file to cover both code paths in emitrevlogdata |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
395 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
396 $ hg init repo |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
397 $ touch repo/f1 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
398 $ $TESTDIR/seq.py 50000 > repo/f2 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
399 $ hg -R repo ci -Aqm "0" |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34393
diff
changeset
|
400 $ hg serve -R repo -p $HGPORT1 -d --pid-file=hg.pid --config extensions.delayer=delayer.py |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
401 $ cat hg.pid >> $DAEMON_PIDS |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
402 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
403 clone while modifying the repo between stating file with write lock and |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
404 actually serving file content |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
405 |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
406 $ hg clone -q --stream -U http://localhost:$HGPORT1 clone & |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
407 $ sleep 1 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
408 $ echo >> repo/f1 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
409 $ echo >> repo/f2 |
45076
23119371df5e
test-clone-uncompressed: use config to silence the lock warning
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45016
diff
changeset
|
410 $ hg -R repo ci -m "1" --config ui.timeout.warn=-1 |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
411 $ wait |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
412 $ hg -R clone id |
28518
aa440c3d7c5d
streamclone: fix error when store files grow while stream cloning
Mads Kiilerich <madski@unity3d.com>
parents:
28517
diff
changeset
|
413 000000000000 |
35747
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
414 $ cd .. |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
415 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
416 Stream repository with bookmarks |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
417 -------------------------------- |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
418 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
419 (revert introduction of secret changeset) |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
420 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
421 $ hg -R server phase --draft 'secret()' |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
422 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
423 add a bookmark |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
424 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
425 $ hg -R server bookmark -r tip some-bookmark |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
426 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
427 clone it |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
428 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
429 #if stream-legacy |
35747
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
430 $ hg clone --stream http://localhost:$HGPORT with-bookmarks |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
431 streaming all changes |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
432 1027 files to transfer, 96.3 KB of data |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
433 transferred 96.3 KB in * seconds (*) (glob) |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
434 searching for changes |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
435 no changes found |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
436 updating to branch default |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
437 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
438 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
439 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
440 $ hg clone --stream http://localhost:$HGPORT with-bookmarks |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
441 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
442 1033 files to transfer, 96.6 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
443 transferred 96.6 KB in * seconds (* */sec) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
444 updating to branch default |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
445 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
446 #endif |
35747
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
447 $ hg -R with-bookmarks bookmarks |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
448 some-bookmark 1:c17445101a72 |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
449 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
450 Stream repository with phases |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
451 ----------------------------- |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
452 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
453 Clone as publishing |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
454 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
455 $ hg -R server phase -r 'all()' |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
456 0: draft |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
457 1: draft |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
458 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
459 #if stream-legacy |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
460 $ hg clone --stream http://localhost:$HGPORT phase-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
461 streaming all changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
462 1027 files to transfer, 96.3 KB of data |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
463 transferred 96.3 KB in * seconds (*) (glob) |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
464 searching for changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
465 no changes found |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
466 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
467 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
468 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
469 #if stream-bundle2 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
470 $ hg clone --stream http://localhost:$HGPORT phase-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
471 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
472 1033 files to transfer, 96.6 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
473 transferred 96.6 KB in * seconds (* */sec) (glob) |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
474 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
475 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
476 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
477 $ hg -R phase-publish phase -r 'all()' |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
478 0: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
479 1: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
480 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
481 Clone as non publishing |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
482 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
483 $ cat << EOF >> server/.hg/hgrc |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
484 > [phases] |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
485 > publish = False |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
486 > EOF |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
487 $ killdaemons.py |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
488 $ hg -R server serve -p $HGPORT -d --pid-file=hg.pid |
35789
8ed5f7609728
tests: add more testing around server.uncompressed
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35788
diff
changeset
|
489 $ cat hg.pid > $DAEMON_PIDS |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
490 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
491 #if stream-legacy |
35805
784ac51f8bab
streamclone: add a comment about non-publishing being broken with v1
Boris Feld <boris.feld@octobus.net>
parents:
35793
diff
changeset
|
492 |
784ac51f8bab
streamclone: add a comment about non-publishing being broken with v1
Boris Feld <boris.feld@octobus.net>
parents:
35793
diff
changeset
|
493 With v1 of the stream protocol, changeset are always cloned as public. It make |
784ac51f8bab
streamclone: add a comment about non-publishing being broken with v1
Boris Feld <boris.feld@octobus.net>
parents:
35793
diff
changeset
|
494 stream v1 unsuitable for non-publishing repository. |
784ac51f8bab
streamclone: add a comment about non-publishing being broken with v1
Boris Feld <boris.feld@octobus.net>
parents:
35793
diff
changeset
|
495 |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
496 $ hg clone --stream http://localhost:$HGPORT phase-no-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
497 streaming all changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
498 1027 files to transfer, 96.3 KB of data |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
499 transferred 96.3 KB in * seconds (*) (glob) |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
500 searching for changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
501 no changes found |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
502 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
503 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
504 $ hg -R phase-no-publish phase -r 'all()' |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
505 0: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
506 1: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
507 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
508 #if stream-bundle2 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
509 $ hg clone --stream http://localhost:$HGPORT phase-no-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
510 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
511 1034 files to transfer, 96.7 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
512 transferred 96.7 KB in * seconds (* */sec) (glob) |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
513 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
514 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
515 $ hg -R phase-no-publish phase -r 'all()' |
35765
56c30b31afbe
streamclone: add support for cloning non append-only file
Boris Feld <boris.feld@octobus.net>
parents:
35764
diff
changeset
|
516 0: draft |
56c30b31afbe
streamclone: add support for cloning non append-only file
Boris Feld <boris.feld@octobus.net>
parents:
35764
diff
changeset
|
517 1: draft |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
518 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
519 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
520 $ killdaemons.py |
40398
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
521 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
522 #if stream-legacy |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
523 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
524 With v1 of the stream protocol, changeset are always cloned as public. There's |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
525 no obsolescence markers exchange in stream v1. |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
526 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
527 #endif |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
528 #if stream-bundle2 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
529 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
530 Stream repository with obsolescence |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
531 ----------------------------------- |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
532 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
533 Clone non-publishing with obsolescence |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
534 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
535 $ cat >> $HGRCPATH << EOF |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
536 > [experimental] |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
537 > evolution=all |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
538 > EOF |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
539 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
540 $ cd server |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
541 $ echo foo > foo |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
542 $ hg -q commit -m 'about to be pruned' |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
543 $ hg debugobsolete `hg log -r . -T '{node}'` -d '0 0' -u test --record-parents |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
40978
diff
changeset
|
544 1 new obsolescence markers |
40398
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
545 obsoleted 1 changesets |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
546 $ hg up null -q |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
547 $ hg log -T '{rev}: {phase}\n' |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
548 1: draft |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
549 0: draft |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
550 $ hg serve -p $HGPORT -d --pid-file=hg.pid |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
551 $ cat hg.pid > $DAEMON_PIDS |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
552 $ cd .. |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
553 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
554 $ hg clone -U --stream http://localhost:$HGPORT with-obsolescence |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
555 streaming all changes |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
556 1035 files to transfer, 97.1 KB of data |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
557 transferred 97.1 KB in * seconds (* */sec) (glob) |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
558 $ hg -R with-obsolescence log -T '{rev}: {phase}\n' |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
559 1: draft |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
560 0: draft |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
561 $ hg debugobsolete -R with-obsolescence |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
562 50382b884f66690b7045cac93a540cba4d4c906f 0 {c17445101a72edac06facd130d14808dfbd5c7c2} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
563 |
40399
4ab6e7b4fe8a
streamclone: abort when client needs to handle obsmarkers, but doesn't
Anton Shestakov <av6@dwimlabs.net>
parents:
40398
diff
changeset
|
564 $ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution |
4ab6e7b4fe8a
streamclone: abort when client needs to handle obsmarkers, but doesn't
Anton Shestakov <av6@dwimlabs.net>
parents:
40398
diff
changeset
|
565 streaming all changes |
4ab6e7b4fe8a
streamclone: abort when client needs to handle obsmarkers, but doesn't
Anton Shestakov <av6@dwimlabs.net>
parents:
40398
diff
changeset
|
566 remote: abort: server has obsolescence markers, but client cannot receive them via stream clone |
4ab6e7b4fe8a
streamclone: abort when client needs to handle obsmarkers, but doesn't
Anton Shestakov <av6@dwimlabs.net>
parents:
40398
diff
changeset
|
567 abort: pull failed on remote |
4ab6e7b4fe8a
streamclone: abort when client needs to handle obsmarkers, but doesn't
Anton Shestakov <av6@dwimlabs.net>
parents:
40398
diff
changeset
|
568 [255] |
4ab6e7b4fe8a
streamclone: abort when client needs to handle obsmarkers, but doesn't
Anton Shestakov <av6@dwimlabs.net>
parents:
40398
diff
changeset
|
569 |
40398
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
570 $ killdaemons.py |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
571 |
0ac794e0e285
streamclone: include obsstore file into stream bundle if client can read it
Anton Shestakov <av6@dwimlabs.net>
parents:
40034
diff
changeset
|
572 #endif |