mercurial-scm/hg-stable: rust/hg-core/src/utils/files.rs annotate

annotate rust/hg-core/src/utils/files.rs @ 45986:cc759d3db1e8

copies-rust: leverage the immutability for efficient update The immutable OrdMap has a diff function. That function yield items for each difference (missing in minor; missing in major; present in both, but different). We reorganise the manifest merging code to use this new function. We gather the data we would need to inject into the `minor` or `major` dict and eventually update one of them. The semantic of the merge itself is kept as is. Why are we doing this? Last year we contributed a patch making that diff function quickly detect some of the identical subsection when comparing two OrdMap cloned from a common ancestors (because they point to the very same node in memory). As a result: - That diff function is very fast in most of our cases, - It is important to maximize the "common" part by minimising the amount of unnecessary changes we do in theses Map. This is why we gather update for both and update the one with the smaller update. In practice, this yield a massive speed up on all our slow cases. Some examples below.: Repo Cases Source-Rev Dest-Rev Old-Time New-Time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 33.527067 s, 2.780174 s, -30.746893 s, ? 0.0829 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : killed(>120), 1.231869 s mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : killed(>120), 3.478747 s mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 83.508590 s, 9.843481 s, -73.665109 s, ? 0.1179 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 55.079813 s, 1.465128 s, -53.614685 s, ? 0.0266 The performance compared to the Python code are now comparable (worst case are a score percent slower)" You an check the full table below for details. The big new is that, with this change, we are now faster filelog in most case, . Below is an highlight of some pretty nice win: Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.354211 s, 0.252125 s, -1.102086 s, ? 0.186179 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.939593 s, 0.112534 s, -0.827059 s, ? 0.119769 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.824967 s, 1.231869 s, -2.593098 s, ? 0.322060 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.142414 s, 0.102184 s, -1.040230 s, ? 0.089446 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.667504 s, 0.046220 s, -6.621284 s, ? 0.006932 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.267274 s, 0.315271 s, -2.952003 s, ? 0.096494 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 16.038104 s, 3.478747 s, -12.559357 s, ? 0.216905 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.639928 s, 4.766435 s, -15.873493 s, ? 0.230933 They they are a handful of slower case where we perform less well. A good Share of them are really pathological "service" merge in mozilla-try, but not all of them. Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001055 s, 2.780174 s, +2.779119 s, ? 2635.236019 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.088715 s, 0.435381 s, +0.346666 s, ? 4.907637 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.080765 s, 0.415461 s, +0.334696 s, ? 5.144072 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.598509 s, 9.843481 s, +2.244972 s, ? 1.295449 mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.092232 s, killed mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.093892 s, killed mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.227503 s, killed mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.145391 s, killed mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 25.304164 s, killed Below are two different tables for full performance comparison - this changeset against the previous one (spoiler: it is much better) - this changeset against the python code (spoiler: still slower, but it gets more comparable) - this changeset against the filelog code (spoiler: better in many case, but not all) Repo Cases Source-Rev Dest-Rev Old-Time New-Time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000049 s, 0.000049 s, +0.000000 s, ? 1.0000 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000179 s, 0.000182 s, +0.000003 s, ? 1.0168 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.006494 s, 0.005872 s, -0.000622 s, ? 0.9042 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000339 s, 0.000229 s, -0.000110 s, ? 0.6755 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000057 s, 0.000058 s, +0.000001 s, ? 1.0175 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000299 s, 0.000148 s, -0.000151 s, ? 0.4950 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001200 s, 0.001205 s, +0.000005 s, ? 1.0042 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.025120 s, 0.025662 s, +0.000542 s, ? 1.0216 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.506921 s, 0.080113 s, -0.426808 s, ? 0.1580 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.272060 s, 0.153030 s, -1.119030 s, ? 0.1203 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.690941 s, 0.098774 s, -0.592167 s, ? 0.1430 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 33.527067 s, 2.780174 s, -30.746893 s, ? 0.0829 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.021970 s, 0.022218 s, +0.000248 s, ? 1.0113 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.772094 s, 0.252125 s, -1.519969 s, ? 0.1423 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000185 s, 0.000186 s, +0.000001 s, ? 1.0054 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000135 s, 0.000133 s, -0.000002 s, ? 0.9852 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000329 s, 0.000320 s, -0.000009 s, ? 0.9726 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001343 s, 0.001336 s, -0.000007 s, ? 0.9948 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.029396 s, 0.015573 s, -0.013823 s, ? 0.5298 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.040210 s, 0.018667 s, -0.021543 s, ? 0.4642 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 4.556794 s, 0.112534 s, -4.444260 s, ? 0.0247 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : killed , 1.231869 s mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000199 s, 0.000197 s, -0.000002 s, ? 0.9899 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000639 s, 0.000637 s, -0.000002 s, ? 0.9969 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000542 s, 0.000303 s, -0.000239 s, ? 0.5590 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001685 s, 0.001663 s, -0.000022 s, ? 0.9869 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.006954 s, 0.007008 s, +0.000054 s, ? 1.0078 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.132938 s, 0.127385 s, -0.005553 s, ? 0.9582 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.008683 s, 0.008740 s, +0.000057 s, ? 1.0066 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.005956 s, 0.005783 s, -0.000173 s, ? 0.9710 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.963905 s, 0.102184 s, -0.861721 s, ? 0.1060 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.049239 s, 0.046220 s, -0.003019 s, ? 0.9387 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 4.217003 s, 0.315271 s, -3.901732 s, ? 0.0748 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : killed , 3.478747 s mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : killed , 4.766435 s mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001197 s, 0.001214 s, +0.000017 s, ? 1.0142 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001213 s, 0.001221 s, +0.000008 s, ? 1.0066 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000762 s, 0.000613 s, -0.000149 s, ? 0.8045 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001909 s, 0.001904 s, -0.000005 s, ? 0.9974 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.093021 s, 0.093000 s, -0.000021 s, ? 0.9998 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.134536 s, 0.132194 s, -0.002342 s, ? 0.9826 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.009071 s, 0.009069 s, -0.000002 s, ? 0.9998 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.006206 s, 0.006169 s, -0.000037 s, ? 0.9940 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.150502 s, 0.115540 s, -1.034962 s, ? 0.1004 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 1.114864 s, 0.435381 s, -0.679483 s, ? 0.3905 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 1.042658 s, 0.415461 s, -0.627197 s, ? 0.3985 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.447402 s, 0.155946 s, -0.291456 s, ? 0.3486 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.051132 s, 0.048521 s, -0.002611 s, ? 0.9489 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 83.508590 s, 9.843481 s, -73.665109 s, ? 0.1179 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 55.079813 s, 1.465128 s, -53.614685 s, ? 0.0266 mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.442793 s, 1.374283 s, -0.068510 s, ? 0.9525 mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : killed , 5.255158 s Repo Cases Source-Rev Dest-Rev Py-time Rust-time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000049 s, +0.000005 s, ? 1.1136 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000182 s, +0.000044 s, ? 1.3188 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005052 s, 0.005872 s, +0.000820 s, ? 1.1623 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000219 s, 0.000229 s, +0.000010 s, ? 1.0457 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000055 s, 0.000058 s, +0.000003 s, ? 1.0545 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000128 s, 0.000148 s, +0.000020 s, ? 1.1562 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001089 s, 0.001205 s, +0.000116 s, ? 1.1065 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017407 s, 0.025662 s, +0.008255 s, ? 1.4742 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.094175 s, 0.080113 s, -0.014062 s, ? 0.8507 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.238009 s, 0.153030 s, -0.084979 s, ? 0.6430 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.125876 s, 0.098774 s, -0.027102 s, ? 0.7847 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 3.581556 s, 2.780174 s, -0.801382 s, ? 0.7762 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016721 s, 0.022218 s, +0.005497 s, ? 1.3287 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.242367 s, 0.252125 s, +0.009758 s, ? 1.0403 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000165 s, 0.000186 s, +0.000021 s, ? 1.1273 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000114 s, 0.000133 s, +0.000019 s, ? 1.1667 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000320 s, +0.000024 s, ? 1.0811 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001124 s, 0.001336 s, +0.000212 s, ? 1.1886 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.013060 s, 0.015573 s, +0.002513 s, ? 1.1924 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.017112 s, 0.018667 s, +0.001555 s, ? 1.0909 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.660350 s, 0.112534 s, -0.547816 s, ? 0.1704 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 10.032499 s, 1.231869 s, -8.800630 s, ? 0.1228 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000189 s, 0.000197 s, +0.000008 s, ? 1.0423 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000462 s, 0.000637 s, +0.000175 s, ? 1.3788 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000270 s, 0.000303 s, +0.000033 s, ? 1.1222 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001474 s, 0.001663 s, +0.000189 s, ? 1.1282 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004806 s, 0.007008 s, +0.002202 s, ? 1.4582 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.085150 s, 0.127385 s, +0.042235 s, ? 1.4960 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007064 s, 0.008740 s, +0.001676 s, ? 1.2373 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004741 s, 0.005783 s, +0.001042 s, ? 1.2198 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.190133 s, 0.102184 s, -0.087949 s, ? 0.5374 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.035651 s, 0.046220 s, +0.010569 s, ? 1.2965 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.440694 s, 0.315271 s, -0.125423 s, ? 0.7154 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 18.454163 s, 3.478747 s, -14.975416 s, ? 0.1885 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 31.562719 s, 4.766435 s, -26.796284 s, ? 0.1510 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001189 s, 0.001214 s, +0.000025 s, ? 1.0210 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001204 s, 0.001221 s, +0.000017 s, ? 1.0141 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000586 s, 0.000613 s, +0.000027 s, ? 1.0461 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001845 s, 0.001904 s, +0.000059 s, ? 1.0320 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.063822 s, 0.093000 s, +0.029178 s, ? 1.4572 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088038 s, 0.132194 s, +0.044156 s, ? 1.5016 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007389 s, 0.009069 s, +0.001680 s, ? 1.2274 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004868 s, 0.006169 s, +0.001301 s, ? 1.2673 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.222450 s, 0.115540 s, -0.106910 s, ? 0.5194 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.370675 s, 0.435381 s, +0.064706 s, ? 1.1746 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.358020 s, 0.415461 s, +0.057441 s, ? 1.1604 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.145235 s, 0.155946 s, +0.010711 s, ? 1.0737 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.037606 s, 0.048521 s, +0.010915 s, ? 1.2902 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.382439 s, 9.843481 s, +2.461042 s, ? 1.3334 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 7.273506 s, 1.465128 s, -5.808378 s, ? 0.2014 mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.074593 s, 1.374283 s, +0.299690 s, ? 1.2789 mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 27.746195 s, 5.255158 s, -22.491037 s, ? 0.1894 Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000906 s, 0.000049 s, -0.000857 s, ? 0.054084 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001832 s, 0.000182 s, -0.001650 s, ? 0.099345 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.018101 s, 0.005872 s, -0.012229 s, ? 0.324402 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001508 s, 0.000229 s, -0.001279 s, ? 0.151857 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.207438 s, 0.000058 s, -0.207380 s, ? 0.000280 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016956 s, 0.000148 s, -0.016808 s, ? 0.008728 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019129 s, 0.001205 s, -0.017924 s, ? 0.062993 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.772050 s, 0.025662 s, -0.746388 s, ? 0.033239 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.181775 s, 0.080113 s, -1.101662 s, ? 0.067790 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.255717 s, 0.153030 s, -1.102687 s, ? 0.121867 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.628132 s, 0.098774 s, -1.529358 s, ? 0.060667 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001055 s, 2.780174 s, +2.779119 s, ? 2635.236019 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.056756 s, 0.022218 s, -1.034538 s, ? 0.021025 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.354211 s, 0.252125 s, -1.102086 s, ? 0.186179 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027759 s, 0.000186 s, -0.027573 s, ? 0.006701 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.133382 s, 0.000133 s, -0.133249 s, ? 0.000997 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.025353 s, 0.000320 s, -0.025033 s, ? 0.012622 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052939 s, 0.001336 s, -0.051603 s, ? 0.025237 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037532 s, 0.015573 s, -0.021959 s, ? 0.414926 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.195401 s, 0.018667 s, -0.176734 s, ? 0.095532 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.939593 s, 0.112534 s, -0.827059 s, ? 0.119769 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.824967 s, 1.231869 s, -2.593098 s, ? 0.322060 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024626 s, 0.000197 s, -0.024429 s, ? 0.008000 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141098 s, 0.000637 s, -0.140461 s, ? 0.004515 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025973 s, 0.000303 s, -0.025670 s, ? 0.011666 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.085098 s, 0.001663 s, -0.083435 s, ? 0.019542 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.196623 s, 0.007008 s, -0.189615 s, ? 0.035642 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.182911 s, 0.127385 s, -2.055526 s, ? 0.058356 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.088865 s, 0.008740 s, -0.080125 s, ? 0.098351 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.731211 s, 0.005783 s, -0.725428 s, ? 0.007909 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.142414 s, 0.102184 s, -1.040230 s, ? 0.089446 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.667504 s, 0.046220 s, -6.621284 s, ? 0.006932 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.267274 s, 0.315271 s, -2.952003 s, ? 0.096494 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 16.038104 s, 3.478747 s, -12.559357 s, ? 0.216905 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.639928 s, 4.766435 s, -15.873493 s, ? 0.230933 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080513 s, 0.001214 s, -0.079299 s, ? 0.015078 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.502965 s, 0.001221 s, -0.501744 s, ? 0.002428 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021408 s, 0.000613 s, -0.020795 s, ? 0.028634 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.228498 s, 0.001904 s, -0.226594 s, ? 0.008333 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118490 s, 0.093000 s, -1.025490 s, ? 0.083148 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.188390 s, 0.132194 s, -2.056196 s, ? 0.060407 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089755 s, 0.009069 s, -0.080686 s, ? 0.101042 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.750223 s, 0.006169 s, -0.744054 s, ? 0.008223 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.189708 s, 0.115540 s, -1.074168 s, ? 0.097116 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.088715 s, 0.435381 s, +0.346666 s, ? 4.907637 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.080765 s, 0.415461 s, +0.334696 s, ? 5.144072 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.487310 s, 0.155946 s, -7.331364 s, ? 0.020828 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.676682 s, 0.048521 s, -6.628161 s, ? 0.007267 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.598509 s, 9.843481 s, +2.244972 s, ? 1.295449 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.871850 s, 1.465128 s, -8.406722 s, ? 0.148415 mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.092232 s, killed mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.471560 s, 1.374283 s, -25.097277 s, ? 0.051915 mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.093892 s, killed mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.227503 s, killed mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 19.064699 s, 5.255158 s, -13.809541 s, ? 0.275649 mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.145391 s, killed mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 25.304164 s, killed Differential Revision: https://phab.mercurial-scm.org/D9302

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 21 Apr 2020 15:00:32 +0200
parents	1b3197047f5c
children	95d6f31e88db

rev	line source
42767 4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	1 // files.rs
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	2 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	3 // Copyright 2019
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	4 // Raphaël Gomès <rgomes@octobus.net>,
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	5 // Yuya Nishihara <yuya@tcha.org>
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	6 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	7 // This software may be used and distributed according to the terms of the
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	8 // GNU General Public License version 2 or any later version.
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	9
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	10 //! Functions for fiddling with files.
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	11
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	12 use crate::utils::{
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	13 hg_path::{path_to_hg_path_buf, HgPath, HgPathBuf, HgPathError},
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	14 path_auditor::PathAuditor,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	15 replace_slice,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	16 };
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	17 use lazy_static::lazy_static;
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	18 use same_file::is_same_file;
45447 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	19 use std::borrow::{Cow, ToOwned};
43271 99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	20 use std::fs::Metadata;
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	21 use std::iter::FusedIterator;
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	22 use std::ops::Deref;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	23 use std::path::{Path, PathBuf};
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	24
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	25 pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	26 let os_str;
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	27 #[cfg(unix)]
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 {
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	29 use std::os::unix::ffi::OsStrExt;
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	30 os_str = std::ffi::OsStr::from_bytes(bytes);
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	31 }
43250 98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	32 // TODO Handle other platforms
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	33 // TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	34 // Perhaps, the return type would have to be Result<PathBuf>.
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	35
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	36 Path::new(os_str)
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	37 }
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	38
43467 b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	39 // TODO: need to convert from WTF8 to MBCS bytes on Windows.
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	40 // that's why Vec<u8> is returned.
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	41 #[cfg(unix)]
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	42 pub fn get_bytes_from_path(path: impl AsRef<Path>) -> Vec<u8> {
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	43 use std::os::unix::ffi::OsStrExt;
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	44 path.as_ref().as_os_str().as_bytes().to_vec()
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	45 }
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	46
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	47 /// An iterator over repository path yielding itself and its ancestors.
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	48 #[derive(Copy, Clone, Debug)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	49 pub struct Ancestors<'a> {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	50 next: Option<&'a HgPath>,
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	51 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	52
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	53 impl<'a> Iterator for Ancestors<'a> {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	54 type Item = &'a HgPath;
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	55
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	56 fn next(&mut self) -> Option<Self::Item> {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	57 let next = self.next;
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	58 self.next = match self.next {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	59 Some(s) if s.is_empty() => None,
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	60 Some(s) => {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	61 let p = s.bytes().rposition(\|c\| *c == b'/').unwrap_or(0);
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	62 Some(HgPath::new(&s.as_bytes()[..p]))
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	63 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	64 None => None,
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	65 };
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	66 next
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	67 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	68 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	69
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	70 impl<'a> FusedIterator for Ancestors<'a> {}
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	71
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	72 /// An iterator over repository path yielding itself and its ancestors.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	73 #[derive(Copy, Clone, Debug)]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	74 pub(crate) struct AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	75 next: Option<(&'a HgPath, &'a HgPath)>,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	76 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	77
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	78 impl<'a> Iterator for AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	79 type Item = (&'a HgPath, &'a HgPath);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	80
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	81 fn next(&mut self) -> Option<Self::Item> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	82 let next = self.next;
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	83 self.next = match self.next {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	84 Some((s, _)) if s.is_empty() => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	85 Some((s, _)) => Some(s.split_filename()),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	86 None => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	87 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	88 next
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	89 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	90 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	91
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	92 impl<'a> FusedIterator for AncestorsWithBase<'a> {}
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	93
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	94 /// Returns an iterator yielding ancestor directories of the given repository
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	95 /// path.
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	96 ///
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	97 /// The path is separated by '/', and must not start with '/'.
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	98 ///
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	99 /// The path itself isn't included unless it is b"" (meaning the root
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	100 /// directory.)
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	101 pub fn find_dirs(path: &HgPath) -> Ancestors {
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	102 let mut dirs = Ancestors { next: Some(path) };
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	103 if !path.is_empty() {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	104 dirs.next(); // skip itself
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	105 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	106 dirs
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	107 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	108
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	109 /// Returns an iterator yielding ancestor directories of the given repository
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	110 /// path.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	111 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	112 /// The path is separated by '/', and must not start with '/'.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	113 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	114 /// The path itself isn't included unless it is b"" (meaning the root
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	115 /// directory.)
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	116 pub(crate) fn find_dirs_with_base(path: &HgPath) -> AncestorsWithBase {
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	117 let mut dirs = AncestorsWithBase {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	118 next: Some((path, HgPath::new(b""))),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	119 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	120 if !path.is_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	121 dirs.next(); // skip itself
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	122 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	123 dirs
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	124 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	125
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	126 /// TODO more than ASCII?
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	127 pub fn normalize_case(path: &HgPath) -> HgPathBuf {
42850 b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	128 #[cfg(windows)] // NTFS compares via upper()
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	129 return path.to_ascii_uppercase();
42850 b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	130 #[cfg(unix)]
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	131 path.to_ascii_lowercase()
42850 b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	132 }
b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	133
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	134 lazy_static! {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	135 static ref IGNORED_CHARS: Vec<Vec<u8>> = {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	136 [
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	137 0x200c, 0x200d, 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	138 0x202e, 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	139 ]
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	140 .iter()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	141 .map(\|code\| {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	142 std::char::from_u32(*code)
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	143 .unwrap()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	144 .encode_utf8(&mut [0; 3])
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	145 .bytes()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	146 .collect()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	147 })
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	148 .collect()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	149 };
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	150 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	151
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	152 fn hfs_ignore_clean(bytes: &[u8]) -> Vec<u8> {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	153 let mut buf = bytes.to_owned();
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	154 let needs_escaping = bytes.iter().any(\|b\| b == b'\xe2' \|\| b == b'\xef');
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	155 if needs_escaping {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	156 for forbidden in IGNORED_CHARS.iter() {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	157 replace_slice(&mut buf, forbidden, &[])
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	158 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	159 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	160 } else {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	161 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	162 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	163 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	164
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	165 pub fn lower_clean(bytes: &[u8]) -> Vec<u8> {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	166 hfs_ignore_clean(&bytes.to_ascii_lowercase())
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	167 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	168
43271 99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	169 #[derive(Eq, PartialEq, Ord, PartialOrd, Copy, Clone)]
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	170 pub struct HgMetadata {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	171 pub st_dev: u64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	172 pub st_mode: u32,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	173 pub st_nlink: u64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	174 pub st_size: u64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	175 pub st_mtime: i64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	176 pub st_ctime: i64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	177 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	178
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	179 // TODO support other plaforms
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	180 #[cfg(unix)]
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	181 impl HgMetadata {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	182 pub fn from_metadata(metadata: Metadata) -> Self {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	183 use std::os::unix::fs::MetadataExt;
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	184 Self {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	185 st_dev: metadata.dev(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	186 st_mode: metadata.mode(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	187 st_nlink: metadata.nlink(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	188 st_size: metadata.size(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	189 st_mtime: metadata.mtime(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	190 st_ctime: metadata.ctime(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	191 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	192 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	193 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	194
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	195 /// Returns the canonical path of `name`, given `cwd` and `root`
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	196 pub fn canonical_path(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	197 root: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	198 cwd: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	199 name: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	200 ) -> Result<PathBuf, HgPathError> {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	201 // TODO add missing normalization for other platforms
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	202 let root = root.as_ref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	203 let cwd = cwd.as_ref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	204 let name = name.as_ref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	205
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	206 let name = if !name.is_absolute() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	207 root.join(&cwd).join(&name)
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	208 } else {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	209 name.to_owned()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	210 };
44545 07d9fd6097e6 rust-pathauditor: use interior mutability for use in multi-threaded contexts Rapha?l Gom?s <rgomes@octobus.net> parents: 44345 diff changeset	211 let auditor = PathAuditor::new(&root);
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	212 if name != root && name.starts_with(&root) {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	213 let name = name.strip_prefix(&root).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	214 auditor.audit_path(path_to_hg_path_buf(name)?)?;
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	215 Ok(name.to_owned())
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	216 } else if name == root {
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	217 Ok("".into())
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	218 } else {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	219 // Determine whether `name' is in the hierarchy at or beneath `root',
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	220 // by iterating name=name.parent() until it returns `None` (can't
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	221 // check name == '/', because that doesn't work on windows).
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	222 let mut name = name.deref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	223 let original_name = name.to_owned();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	224 loop {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	225 let same = is_same_file(&name, &root).unwrap_or(false);
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	226 if same {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	227 if name == original_name {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	228 // `name` was actually the same as root (maybe a symlink)
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	229 return Ok("".into());
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	230 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	231 // `name` is a symlink to root, so `original_name` is under
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	232 // root
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	233 let rel_path = original_name.strip_prefix(&name).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	234 auditor.audit_path(path_to_hg_path_buf(&rel_path)?)?;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	235 return Ok(rel_path.to_owned());
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	236 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	237 name = match name.parent() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	238 None => break,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	239 Some(p) => p,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	240 };
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	241 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	242 // TODO hint to the user about using --cwd
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	243 // Bubble up the responsibility to Python for now
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	244 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	245 path: original_name.to_owned(),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	246 root: root.to_owned(),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	247 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	248 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	249 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	250
45447 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	251 /// Returns the representation of the path relative to the current working
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	252 /// directory for display purposes.
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	253 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	254 /// `cwd` is a `HgPath`, so it is considered relative to the root directory
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	255 /// of the repository.
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	256 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	257 /// # Examples
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	258 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	259 /// ```
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	260 /// use hg::utils::hg_path::HgPath;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	261 /// use hg::utils::files::relativize_path;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	262 /// use std::borrow::Cow;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	263 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	264 /// let file = HgPath::new(b"nested/file");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	265 /// let cwd = HgPath::new(b"");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	266 /// assert_eq!(relativize_path(file, cwd), Cow::Borrowed(b"nested/file"));
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	267 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	268 /// let cwd = HgPath::new(b"nested");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	269 /// assert_eq!(relativize_path(file, cwd), Cow::Borrowed(b"file"));
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	270 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	271 /// let cwd = HgPath::new(b"other");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	272 /// assert_eq!(relativize_path(file, cwd), Cow::Borrowed(b"../nested/file"));
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	273 /// ```
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	274 pub fn relativize_path(path: &HgPath, cwd: impl AsRef<HgPath>) -> Cow<[u8]> {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	275 if cwd.as_ref().is_empty() {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	276 Cow::Borrowed(path.as_bytes())
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	277 } else {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	278 let mut res: Vec<u8> = Vec::new();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	279 let mut path_iter = path.as_bytes().split(\|b\| *b == b'/').peekable();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	280 let mut cwd_iter =
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	281 cwd.as_ref().as_bytes().split(\|b\| *b == b'/').peekable();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	282 loop {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	283 match (path_iter.peek(), cwd_iter.peek()) {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	284 (Some(a), Some(b)) if a == b => (),
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	285 _ => break,
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	286 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	287 path_iter.next();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	288 cwd_iter.next();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	289 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	290 let mut need_sep = false;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	291 for _ in cwd_iter {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	292 if need_sep {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	293 res.extend(b"/")
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	294 } else {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	295 need_sep = true
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	296 };
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	297 res.extend(b"..");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	298 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	299 for c in path_iter {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	300 if need_sep {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	301 res.extend(b"/")
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	302 } else {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	303 need_sep = true
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	304 };
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	305 res.extend(c);
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	306 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	307 Cow::Owned(res)
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	308 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	309 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	310
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	311 #[cfg(test)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	312 mod tests {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	313 use super::*;
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	314 use pretty_assertions::assert_eq;
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	315
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	316 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	317 fn find_dirs_some() {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	318 let mut dirs = super::find_dirs(HgPath::new(b"foo/bar/baz"));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	319 assert_eq!(dirs.next(), Some(HgPath::new(b"foo/bar")));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	320 assert_eq!(dirs.next(), Some(HgPath::new(b"foo")));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	321 assert_eq!(dirs.next(), Some(HgPath::new(b"")));
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	322 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	323 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	324 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	325
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	326 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	327 fn find_dirs_empty() {
43677 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43271 diff changeset	328 // looks weird, but mercurial.pathutil.finddirs(b"") yields b""
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	329 let mut dirs = super::find_dirs(HgPath::new(b""));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	330 assert_eq!(dirs.next(), Some(HgPath::new(b"")));
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	331 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	332 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	333 }
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	334
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	335 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	336 fn test_find_dirs_with_base_some() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	337 let mut dirs = super::find_dirs_with_base(HgPath::new(b"foo/bar/baz"));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	338 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	339 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	340 Some((HgPath::new(b"foo/bar"), HgPath::new(b"baz")))
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	341 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	342 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	343 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	344 Some((HgPath::new(b"foo"), HgPath::new(b"bar")))
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	345 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	346 assert_eq!(dirs.next(), Some((HgPath::new(b""), HgPath::new(b"foo"))));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	347 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	348 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	349 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	350
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	351 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	352 fn test_find_dirs_with_base_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	353 let mut dirs = super::find_dirs_with_base(HgPath::new(b""));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	354 assert_eq!(dirs.next(), Some((HgPath::new(b""), HgPath::new(b""))));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	355 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	356 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	357 }
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	358
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	359 #[test]
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	360 fn test_canonical_path() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	361 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	362 let cwd = Path::new("/dir");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	363 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	364 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	365 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	366 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	367 path: PathBuf::from("/dir/filename"),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	368 root: root.to_path_buf()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	369 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	370 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	371
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	372 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	373 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	374 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	375 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	376 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	377 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	378 path: PathBuf::from("/filename"),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	379 root: root.to_path_buf()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	380 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	381 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	382
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	383 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	384 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	385 let name = Path::new("repo/filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	386 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	387 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	388 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	389 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	390
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	391 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	392 let cwd = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	393 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	394 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	395 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	396 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	397 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	398
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	399 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	400 let cwd = Path::new("/repo/subdir");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	401 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	402 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	403 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	404 Ok(PathBuf::from("subdir/filename"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	405 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	406 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	407
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	408 #[test]
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	409 fn test_canonical_path_not_rooted() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	410 use std::fs::create_dir;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	411 use tempfile::tempdir;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	412
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	413 let base_dir = tempdir().unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	414 let base_dir_path = base_dir.path();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	415 let beneath_repo = base_dir_path.join("a");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	416 let root = base_dir_path.join("a/b");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	417 let out_of_repo = base_dir_path.join("c");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	418 let under_repo_symlink = out_of_repo.join("d");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	419
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	420 create_dir(&beneath_repo).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	421 create_dir(&root).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	422
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	423 // TODO make portable
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	424 std::os::unix::fs::symlink(&root, &out_of_repo).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	425
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	426 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	427 canonical_path(&root, Path::new(""), out_of_repo),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	428 Ok(PathBuf::from(""))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	429 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	430 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	431 canonical_path(&root, Path::new(""), &beneath_repo),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	432 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	433 path: beneath_repo.to_owned(),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	434 root: root.to_owned()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	435 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	436 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	437 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	438 canonical_path(&root, Path::new(""), &under_repo_symlink),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	439 Ok(PathBuf::from("d"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	440 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	441 }
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	442 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/utils/files.rs @ 45986:cc759d3db1e8