Mercurial > public > mercurial-scm > hg

annotate tests/test-largefiles-cache.t @ 45892:06b64fabf91c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 556984ae0005
children 1e98f9b5bc71
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
1 Create user cache directory
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
2
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
3 $ USERCACHE=`pwd`/cache; export USERCACHE
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
4 $ cat <<EOF >> ${HGRCPATH}
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
5 > [extensions]
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
6 > hgext.largefiles=
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
7 > [largefiles]
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
8 > usercache=${USERCACHE}
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
9 > EOF
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
10 $ mkdir -p ${USERCACHE}
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
11
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
12 Create source repo, and commit adding largefile.
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
13
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
14 $ hg init src
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
15 $ cd src
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
16 $ echo large > large
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
17 $ hg add --large large
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
18 $ hg commit -m 'add largefile'
18723
e56f7cd8c67b tests: don't rely on broken behaviour in test-largefiles-cache.t
Mads Kiilerich <madski@unity3d.com>
parents: 18461
diff changeset
19 $ hg rm large
27942
eb1135d5e688 largefiles: fix an explicit largefile commit after a remove (issue4969)
Matt Harbison <matt_harbison@yahoo.com>
parents: 26951
diff changeset
20 $ hg commit -m 'branchhead without largefile' large
18723
e56f7cd8c67b tests: don't rely on broken behaviour in test-largefiles-cache.t
Mads Kiilerich <madski@unity3d.com>
parents: 18461
diff changeset
21 $ hg up -qr 0
27947
571ba161f6be largefiles: prevent committing a missing largefile
Matt Harbison <matt_harbison@yahoo.com>
parents: 27942
diff changeset
22 $ rm large
571ba161f6be largefiles: prevent committing a missing largefile
Matt Harbison <matt_harbison@yahoo.com>
parents: 27942
diff changeset
23 $ echo "0000000000000000000000000000000000000000" > .hglf/large
571ba161f6be largefiles: prevent committing a missing largefile
Matt Harbison <matt_harbison@yahoo.com>
parents: 27942
diff changeset
24 $ hg commit -m 'commit missing file with corrupt standin' large
571ba161f6be largefiles: prevent committing a missing largefile
Matt Harbison <matt_harbison@yahoo.com>
parents: 27942
diff changeset
25 abort: large: file not found!
571ba161f6be largefiles: prevent committing a missing largefile
Matt Harbison <matt_harbison@yahoo.com>
parents: 27942
diff changeset
26 [255]
571ba161f6be largefiles: prevent committing a missing largefile
Matt Harbison <matt_harbison@yahoo.com>
parents: 27942
diff changeset
27 $ hg up -Cqr 0
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
28 $ cd ..
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
29
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
30 Discard all cached largefiles in USERCACHE
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
31
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
32 $ rm -rf ${USERCACHE}
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
33
15478
f8a0c7925496 tests: fix trailing whitespace
Matt Mackall <mpm@selenic.com>
parents: 15472
diff changeset
34 Create mirror repo, and pull from source without largefile:
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
35 "pull" is used instead of "clone" for suppression of (1) updating to
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20471
diff changeset
36 tip (= caching largefile from source repo), and (2) recording source
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
37 repo as "default" path in .hg/hgrc.
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
38
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
39 $ hg init mirror
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
40 $ cd mirror
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
41 $ hg pull ../src
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
42 pulling from ../src
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
43 requesting all changes
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
44 adding changesets
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
45 adding manifests
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
46 adding file changes
18723
e56f7cd8c67b tests: don't rely on broken behaviour in test-largefiles-cache.t
Mads Kiilerich <madski@unity3d.com>
parents: 18461
diff changeset
47 added 2 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: 33990
diff changeset
48 new changesets eb85d9124f3f:26c18ce05e4e
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
49 (run 'hg update' to get a working copy)
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
50
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
51 Update working directory to "tip", which requires largefile("large"),
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
52 but there is no cache file for it. So, hg must treat it as
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
53 "missing"(!) file.
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
54
18723
e56f7cd8c67b tests: don't rely on broken behaviour in test-largefiles-cache.t
Mads Kiilerich <madski@unity3d.com>
parents: 18461
diff changeset
55 $ hg update -r0
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
56 getting changed largefiles
20471
ea005e754c9c tests: lines with largefile .* file://$TESTTMP also match on windows
Simon Heimberg <simohe@besonet.ch>
parents: 19950
diff changeset
57 large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:/*/$TESTTMP/mirror (glob)
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
58 0 largefiles updated, 0 removed
18459
c9db897d5a43 largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 18159
diff changeset
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
60 $ hg status
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
61 ! large
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
62
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
63 Update working directory to null: this cleanup .hg/largefiles/dirstate
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
64
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
65 $ hg update null
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
66 getting changed largefiles
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
67 0 largefiles updated, 0 removed
18459
c9db897d5a43 largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 18159
diff changeset
68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
69
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
70 Update working directory to tip, again.
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
71
18723
e56f7cd8c67b tests: don't rely on broken behaviour in test-largefiles-cache.t
Mads Kiilerich <madski@unity3d.com>
parents: 18461
diff changeset
72 $ hg update -r0
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
73 getting changed largefiles
20471
ea005e754c9c tests: lines with largefile .* file://$TESTTMP also match on windows
Simon Heimberg <simohe@besonet.ch>
parents: 19950
diff changeset
74 large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:/*/$TESTTMP/mirror (glob)
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
75 0 largefiles updated, 0 removed
18459
c9db897d5a43 largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 18159
diff changeset
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15472
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
77 $ hg status
6a7e874390b0 largefiles: treat status of cache missed largefiles as "missing" correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff changeset
78 ! large
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16928
diff changeset
79 $ cd ..
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16928
diff changeset
80
18724
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
81 Verify that largefiles from pulled branchheads are fetched, also to an empty repo
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
82
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
83 $ hg init mirror2
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
84 $ hg -R mirror2 pull src -r0
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
85 pulling from src
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
86 adding changesets
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
87 adding manifests
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
88 adding file changes
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
89 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: 33990
diff changeset
90 new changesets eb85d9124f3f
18724
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
91 (run 'hg update' to get a working copy)
894a5897a9dd largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents: 18723
diff changeset
92
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16928
diff changeset
93 #if unix-permissions
16153
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
94
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
95 Portable way to print file permissions:
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
96
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
97 $ cat > ls-l.py <<EOF
32938
b6776b34e44e tests: use $PYTHON in #! so we always use the right Python
Augie Fackler <augie@google.com>
parents: 32698
diff changeset
98 > #!$PYTHON
33990
b4707311d982 tests: update test-largefiles-cache to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33721
diff changeset
99 > from __future__ import absolute_import, print_function
b4707311d982 tests: update test-largefiles-cache to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33721
diff changeset
100 > import os
b4707311d982 tests: update test-largefiles-cache to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33721
diff changeset
101 > import sys
16153
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
102 > path = sys.argv[1]
33990
b4707311d982 tests: update test-largefiles-cache to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33721
diff changeset
103 > print('%03o' % (os.lstat(path).st_mode & 0o777))
16153
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
104 > EOF
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
105 $ chmod +x ls-l.py
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
106
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
107 Test that files in .hg/largefiles inherit mode from .hg/store, not
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
108 from file in working copy:
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
109
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
110 $ cd src
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
111 $ chmod 750 .hg/store
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
112 $ chmod 660 large
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
113 $ echo change >> large
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
114 $ hg commit -m change
18723
e56f7cd8c67b tests: don't rely on broken behaviour in test-largefiles-cache.t
Mads Kiilerich <madski@unity3d.com>
parents: 18461
diff changeset
115 created new head
16153
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
116 $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea
05197f9fd1f3 largefiles: use repo.store.createmode for new files in .hg/largefiles
Martin Geisler <mg@aragost.com>
parents: 15916
diff changeset
117 640
16154
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
118
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
119 Test permission of with files in .hg/largefiles created by update:
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
120
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
121 $ cd ../mirror
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
122 $ rm -r "$USERCACHE" .hg/largefiles # avoid links
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
123 $ chmod 750 .hg/store
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
124 $ hg pull ../src --update -q
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
125 $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea
9b072a5f8f92 largefiles: respect store.createmode in basestore.get
Martin Geisler <mg@aragost.com>
parents: 16153
diff changeset
126 640
16155
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
127
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
128 Test permission of files created by push:
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
129
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
130 $ hg serve -R ../src -d -p $HGPORT --pid-file hg.pid \
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
131 > --config "web.allow_push=*" --config web.push_ssl=no
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
132 $ cat hg.pid >> $DAEMON_PIDS
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
133
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
134 $ echo change >> large
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
135 $ hg commit -m change
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
136
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
137 $ rm -r "$USERCACHE"
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
138
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
139 $ hg push -q http://localhost:$HGPORT/
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
140
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
141 $ ../ls-l.py ../src/.hg/largefiles/b734e14a0971e370408ab9bce8d56d8485e368a9
1b2b42e866be largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents: 16154
diff changeset
142 640
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16155
diff changeset
143
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16155
diff changeset
144 $ cd ..
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16928
diff changeset
145
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16928
diff changeset
146 #endif
23618
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
147
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
148 Test issue 4053 (remove --after on a deleted, uncommitted file shouldn't say
24180
d8e0c591781c spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23619
diff changeset
149 it is missing, but a remove on a nonexistent unknown file still should. Same
23619
70afc58c32d3 largefiles: fix a spurious missing file warning with forget (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23618
diff changeset
150 for a forget.)
23618
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
151
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
152 $ cd src
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
153 $ touch x
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
154 $ hg add x
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
155 $ mv x y
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
156 $ hg remove -A x y ENOENT
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
157 ENOENT: * (glob)
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
158 not removing y: file is untracked
9dd5dfeaab4c largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 21024
diff changeset
159 [1]
23619
70afc58c32d3 largefiles: fix a spurious missing file warning with forget (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23618
diff changeset
160 $ hg add y
70afc58c32d3 largefiles: fix a spurious missing file warning with forget (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23618
diff changeset
161 $ mv y z
70afc58c32d3 largefiles: fix a spurious missing file warning with forget (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23618
diff changeset
162 $ hg forget y z ENOENT
70afc58c32d3 largefiles: fix a spurious missing file warning with forget (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23618
diff changeset
163 ENOENT: * (glob)
70afc58c32d3 largefiles: fix a spurious missing file warning with forget (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23618
diff changeset
164 not removing z: file is already untracked
70afc58c32d3 largefiles: fix a spurious missing file warning with forget (issue4053)
Matt Harbison <matt_harbison@yahoo.com>
parents: 23618
diff changeset
165 [1]
24631
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
166
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
167 Largefiles are accessible from the share's store
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
168 $ cd ..
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
169 $ hg share -q src share_dst --config extensions.share=
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
170 $ hg -R share_dst update -r0
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
171 getting changed largefiles
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
172 1 largefiles updated, 0 removed
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
173 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
174
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
175 $ echo modified > share_dst/large
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
176 $ hg -R share_dst ci -m modified
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
177 created new head
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
178
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
179 Only dirstate is in the local store for the share, and the largefile is in the
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
180 share source's local store. Avoid the extra largefiles added in the unix
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
181 conditional above.
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
182 $ hash=`hg -R share_dst cat share_dst/.hglf/large`
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
183 $ echo $hash
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
184 e2fb5f2139d086ded2cb600d5a91a196e76bf020
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
185
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
186 $ find share_dst/.hg/largefiles/* | sort
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
187 share_dst/.hg/largefiles/dirstate
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
188
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
189 $ find src/.hg/largefiles/* | egrep "(dirstate|$hash)" | sort
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
190 src/.hg/largefiles/dirstate
2a3f24786d09 largefiles: use the share source as the primary local store (issue4471)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24180
diff changeset
191 src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020
26822
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
192
29329
f359cdc91e21 largefiles: fix support for local largefiles while using share extension
Henrik Stuart <henriks@unity3d.com>
parents: 28887
diff changeset
193 Verify that backwards compatibility is maintained for old storage layout
f359cdc91e21 largefiles: fix support for local largefiles while using share extension
Henrik Stuart <henriks@unity3d.com>
parents: 28887
diff changeset
194 $ mv src/.hg/largefiles/$hash share_dst/.hg/largefiles
f359cdc91e21 largefiles: fix support for local largefiles while using share extension
Henrik Stuart <henriks@unity3d.com>
parents: 28887
diff changeset
195 $ hg verify --quiet --lfa -R share_dst --config largefiles.usercache=
f359cdc91e21 largefiles: fix support for local largefiles while using share extension
Henrik Stuart <henriks@unity3d.com>
parents: 28887
diff changeset
196
26822
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
197 Inject corruption into the largefiles store and see how update handles that:
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
198
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
199 $ cd src
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28029
diff changeset
200 $ hg up -qC tip
26822
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
201 $ cat large
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
202 modified
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
203 $ rm large
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
204 $ cat .hglf/large
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
205 e2fb5f2139d086ded2cb600d5a91a196e76bf020
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
206 $ mv .hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 ..
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
207 $ echo corruption > .hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
208 $ hg up -C
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
209 getting changed largefiles
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
210 large: data corruption in $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 with hash 6a7bb2556144babe3899b25e5428123735bb1e27
26823
45e8bd2f36f0 largefiles: check hash of files in the store before copying to working dir
Mads Kiilerich <madski@unity3d.com>
parents: 26822
diff changeset
211 0 largefiles updated, 0 removed
26822
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
212 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698
1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 31766
diff changeset
213 updated to "cd24c147f45c: modified"
28887
71f9956074a3 test-largefiles: stabilize output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 28878
diff changeset
214 [12] other heads for branch "default" (re)
26822
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
215 $ hg st
26823
45e8bd2f36f0 largefiles: check hash of files in the store before copying to working dir
Mads Kiilerich <madski@unity3d.com>
parents: 26822
diff changeset
216 ! large
26822
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
217 ? z
d881c072050a largefiles: test coverage of handling of store corruption
Mads Kiilerich <madski@unity3d.com>
parents: 24631
diff changeset
218 $ rm .hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020
26824
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
219
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
220 #if serve
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
221
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
222 Test coverage of error handling from putlfile:
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
223
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
224 $ mkdir $TESTTMP/mirrorcache
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
225 $ hg serve -R ../mirror -d -p $HGPORT1 --pid-file hg.pid --config largefiles.usercache=$TESTTMP/mirrorcache
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
226 $ cat hg.pid >> $DAEMON_PIDS
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
227
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
228 $ hg push http://localhost:$HGPORT1 -f --config files.usercache=nocache
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
229 pushing to http://localhost:$HGPORT1/
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
230 searching for changes
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
231 abort: remotestore: could not open file $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020: HTTP Error 403: ssl required
26824
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
232 [255]
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
233
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
234 $ rm .hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
235
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
236 Test coverage of 'missing from store':
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
237
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
238 $ hg serve -R ../mirror -d -p $HGPORT2 --pid-file hg.pid --config largefiles.usercache=$TESTTMP/mirrorcache --config "web.allow_push=*" --config web.push_ssl=no
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
239 $ cat hg.pid >> $DAEMON_PIDS
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
240
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
241 $ hg push http://localhost:$HGPORT2 -f --config largefiles.usercache=nocache
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
242 pushing to http://localhost:$HGPORT2/
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
243 searching for changes
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
244 abort: largefile e2fb5f2139d086ded2cb600d5a91a196e76bf020 missing from store (needs to be uploaded)
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
245 [255]
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
246
28878
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
247 Verify that --lfrev controls which revisions are checked for largefiles to push
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
248
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
249 $ hg push http://localhost:$HGPORT2 -f --config largefiles.usercache=nocache --lfrev tip
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
250 pushing to http://localhost:$HGPORT2/
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
251 searching for changes
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
252 abort: largefile e2fb5f2139d086ded2cb600d5a91a196e76bf020 missing from store (needs to be uploaded)
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
253 [255]
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
254
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
255 $ hg push http://localhost:$HGPORT2 -f --config largefiles.usercache=nocache --lfrev null
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
256 pushing to http://localhost:$HGPORT2/
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
257 searching for changes
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
258 remote: adding changesets
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
259 remote: adding manifests
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
260 remote: adding file changes
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
261 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
a75c9665ef06 largefiles: introduce push --lfrev to control which revisions are pushed
Mads Kiilerich <madski@unity3d.com>
parents: 28065
diff changeset
262
26824
30db531e4146 largefiles: test coverage of error handling from putlfile
Mads Kiilerich <madski@unity3d.com>
parents: 26823
diff changeset
263 #endif