Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/utils/path.rs @ 45907:06b64fabf91c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: cache the ancestor checking call when tracing copy A good share of the time spent in this function is spent doing ancestors checking. To avoid spending time in duplicated call, we cache the result of calls. In the slower case, this provide a quite significant performance boost. Below are the result for a set of selected pairs (many of them pathological): (And further down is another table that summarize the current state of filelog based vs changeset base copy tracing) The benchmark have been configured to be killed after 6 minutes of runtime, which mean that any detect slower than 2 minutes will be marked as "killed". This drop some useful information about how much slower these case are? but also prevent 99% of the benchmark time to be spent on case that can be labelled "very slow" anyway. Repo Case Source-Rev Dest-Rev Old-Time New-Time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000044 s, +0.000000 s, ? 1.0000 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000138 s, +0.000000 s, ? 1.0000 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005067 s, 0.005052 s, -0.000015 s, ? 0.9970 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000218 s, 0.000219 s, +0.000001 s, ? 1.0046 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000053 s, 0.000055 s, +0.000002 s, ? 1.0377 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000125 s, 0.000128 s, +0.000003 s, ? 1.0240 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001098 s, 0.001089 s, -0.000009 s, ? 0.9918 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017546 s, 0.017407 s, -0.000139 s, ? 0.9921 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.096723 s, 0.094175 s, -0.002548 s, ? 0.9737 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.271796 s, 0.238009 s, -0.033787 s, ? 0.8757 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.128602 s, 0.125876 s, -0.002726 s, ? 0.9788 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 7.086742 s, 3.581556 s, -3.505186 s, ? 0.5054 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016634 s, 0.016721 s, +0.000087 s, ? 1.0052 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.254225 s, 0.242367 s, -0.011858 s, ? 0.9534 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000166 s, 0.000165 s, -0.000001 s, ? 0.9940 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000118 s, 0.000114 s, -0.000004 s, ? 0.9661 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000296 s, +0.000000 s, ? 1.0000 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001137 s, 0.001124 s, -0.000013 s, ? 0.9886 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.014133 s, 0.013060 s, -0.001073 s, ? 0.9241 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.016988 s, 0.017112 s, +0.000124 s, ? 1.0073 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.676361 s, 0.660350 s, -0.016011 s, ? 0.9763 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 12.515149 s, 10.032499 s, -2.482650 s, ? 0.8016 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000186 s, 0.000189 s, +0.000003 s, ? 1.0161 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000459 s, 0.000462 s, +0.000003 s, ? 1.0065 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000273 s, 0.000270 s, -0.000003 s, ? 0.9890 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001503 s, 0.001474 s, -0.000029 s, ? 0.9807 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004862 s, 0.004806 s, -0.000056 s, ? 0.9885 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088291 s, 0.085150 s, -0.003141 s, ? 0.9644 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007113 s, 0.007064 s, -0.000049 s, ? 0.9931 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004687 s, 0.004741 s, +0.000054 s, ? 1.0115 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.198710 s, 0.190133 s, -0.008577 s, ? 0.9568 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.036068 s, 0.035651 s, -0.000417 s, ? 0.9884 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.465362 s, 0.440694 s, -0.024668 s, ? 0.9470 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 24.519684 s, 18.454163 s, -6.065521 s, ? 0.7526 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 42.711897 s, 31.562719 s, -11.149178 s, ? 0.7390 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001201 s, 0.001189 s, -0.000012 s, ? 0.9900 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001216 s, 0.001204 s, -0.000012 s, ? 0.9901 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000595 s, 0.000586 s, -0.000009 s, ? 0.9849 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001856 s, 0.001845 s, -0.000011 s, ? 0.9941 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.064936 s, 0.063822 s, -0.001114 s, ? 0.9828 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.090601 s, 0.088038 s, -0.002563 s, ? 0.9717 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007510 s, 0.007389 s, -0.000121 s, ? 0.9839 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004911 s, 0.004868 s, -0.000043 s, ? 0.9912 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.233231 s, 0.222450 s, -0.010781 s, ? 0.9538 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.419989 s, 0.370675 s, -0.049314 s, ? 0.8826 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.401521 s, 0.358020 s, -0.043501 s, ? 0.8917 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.179555 s, 0.145235 s, -0.034320 s, ? 0.8089 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.038004 s, 0.037606 s, -0.000398 s, ? 0.9895 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 52.838482 s, 7.382439 s, -45.456043 s, ? 0.1397 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 8.705874 s, 7.273506 s, -1.432368 s, ? 0.8355 mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.126708 s, 1.074593 s, -0.052115 s, ? 0.9537 mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 83.854020 s, 27.746195 s, -56.107825 s, ? 0.3309 Below is a table comparing the runtime of the current "filelog centric" algorithm, with the "changeset centric" one, we just modified. The changeset centric algorithm is a significant win in many scenario, but they are still various cases where it is quite slower. When many revision has to be considered the cost of retrieving the copy information, creating new dictionaries, merging dictionaries and checking if revision are ancestors of each other can slow things down. The rest of this series, will introduce a rust version of the copy tracing code to deal with most of theses issues. Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000914 s, 0.000044 s, - 0.000870 s, ? 0.048140 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001812 s, 0.000138 s, - 0.001674 s, ? 0.076159 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.017954 s, 0.005052 s, - 0.012902 s, ? 0.281386 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001509 s, 0.000219 s, - 0.001290 s, ? 0.145129 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.206881 s, 0.000055 s, - 0.206826 s, ? 0.000266 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016951 s, 0.000128 s, - 0.016823 s, ? 0.007551 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019096 s, 0.001089 s, - 0.018007 s, ? 0.057028 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.762506 s, 0.017407 s, - 0.745099 s, ? 0.022829 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.179211 s, 0.094175 s, - 1.085036 s, ? 0.079863 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.249058 s, 0.238009 s, - 1.011049 s, ? 0.190551 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.614107 s, 0.125876 s, - 1.488231 s, ? 0.077985 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001064 s, 3.581556 s, + 3.580492 s, ? 3366.124060 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.061275 s, 0.016721 s, - 1.044554 s, ? 0.015756 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.341119 s, 0.242367 s, - 1.098752 s, ? 0.180720 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027803 s, 0.000165 s, - 0.027638 s, ? 0.005935 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.130014 s, 0.000114 s, - 0.129900 s, ? 0.000877 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.024990 s, 0.000296 s, - 0.024694 s, ? 0.011845 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052201 s, 0.001124 s, - 0.051077 s, ? 0.021532 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037642 s, 0.013060 s, - 0.024582 s, ? 0.346953 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.197086 s, 0.017112 s, - 0.179974 s, ? 0.086825 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.935148 s, 0.660350 s, - 0.274798 s, ? 0.706145 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.920674 s, 10.032499 s, + 6.111825 s, ? 2.558871 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024232 s, 0.000189 s, - 0.024043 s, ? 0.007800 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141483 s, 0.000462 s, - 0.141021 s, ? 0.003265 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025775 s, 0.000270 s, - 0.025505 s, ? 0.010475 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.084922 s, 0.001474 s, - 0.083448 s, ? 0.017357 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.194784 s, 0.004806 s, - 0.189978 s, ? 0.024673 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.161103 s, 0.085150 s, - 2.075953 s, ? 0.039401 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089347 s, 0.007064 s, - 0.082283 s, ? 0.079063 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.732171 s, 0.004741 s, - 0.727430 s, ? 0.006475 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.157287 s, 0.190133 s, - 0.967154 s, ? 0.164292 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.726568 s, 0.035651 s, - 6.690917 s, ? 0.005300 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.266229 s, 0.440694 s, - 2.825535 s, ? 0.134924 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 15.860534 s, 18.454163 s, + 2.593629 s, ? 1.163527 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.450475 s, 31.562719 s, +11.112244 s, ? 1.543373 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080442 s, 0.001189 s, - 0.079253 s, ? 0.014781 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.497672 s, 0.001204 s, - 0.496468 s, ? 0.002419 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021183 s, 0.000586 s, - 0.020597 s, ? 0.027664 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.230991 s, 0.001845 s, - 0.229146 s, ? 0.007987 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118461 s, 0.063822 s, - 1.054639 s, ? 0.057062 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.206083 s, 0.088038 s, - 2.118045 s, ? 0.039907 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089404 s, 0.007389 s, - 0.082015 s, ? 0.082647 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.733043 s, 0.004868 s, - 0.728175 s, ? 0.006641 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.163367 s, 0.222450 s, - 0.940917 s, ? 0.191212 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.085456 s, 0.370675 s, + 0.285219 s, ? 4.337612 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.083601 s, 0.358020 s, + 0.274419 s, ? 4.282485 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.366614 s, 0.145235 s, - 7.221379 s, ? 0.019715 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.664464 s, 0.037606 s, - 6.626858 s, ? 0.005643 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.467836 s, 7.382439 s, - 0.085397 s, ? 0.988565 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.801294 s, 7.273506 s, - 2.527788 s, ? 0.742097 mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.091886 s, killed mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.491140 s, 1.074593 s, -25.416547 s, ? 0.040564 mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.092863 s, killed mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.226823 s, killed mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 18.914630 s, 27.746195 s, + 8.831565 s, ? 1.466917 mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.198903 s, killed mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 24.952268 s, killed Differential Revision: https://phab.mercurial-scm.org/D9296
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 02 Nov 2020 11:03:56 +0100
parents 4b953cb17612
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
1 /*
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
2 * Copyright (c) Facebook, Inc. and its affiliates.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
3 *
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
4 * This software may be used and distributed according to the terms of the
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
5 * GNU General Public License version 2.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
6 */
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
7
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
8 //! Path-related utilities.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
9
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
10 use std::env;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
11 #[cfg(not(unix))]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
12 use std::fs::rename;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
13 use std::fs::{self, remove_file as fs_remove_file};
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
14 use std::io::{self, ErrorKind};
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
15 use std::path::{Component, Path, PathBuf};
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
16
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
17 use anyhow::Result;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
18 #[cfg(not(unix))]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
19 use tempfile::Builder;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
20
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
21 /// Normalize a canonicalized Path for display.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
22 ///
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
23 /// This removes the UNC prefix `\\?\` on Windows.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
24 pub fn normalize_for_display(path: &str) -> &str {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
25 if cfg!(windows) && path.starts_with(r"\\?\") {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
26 &path[4..]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
27 } else {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
28 path
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
29 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
30 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
31
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
32 /// Similar to [`normalize_for_display`]. But work on bytes.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
33 pub fn normalize_for_display_bytes(path: &[u8]) -> &[u8] {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
34 if cfg!(windows) && path.starts_with(br"\\?\") {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
35 &path[4..]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
36 } else {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
37 path
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
38 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
39 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
40
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
41 /// Return the absolute and normalized path without accessing the filesystem.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
42 ///
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
43 /// Unlike [`fs::canonicalize`], do not follow symlinks.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
44 ///
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
45 /// This function does not access the filesystem. Therefore it can behave
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
46 /// differently from the kernel or other library functions in corner cases.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
47 /// For example:
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
48 ///
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
49 /// - On some systems with symlink support, `foo/bar/..` and `foo` can be
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
50 /// different as seen by the kernel, if `foo/bar` is a symlink. This function
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
51 /// always returns `foo` in this case.
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
52 /// - On Windows, the official normalization rules are much more complicated.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
53 /// See https://github.com/rust-lang/rust/pull/47363#issuecomment-357069527.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
54 /// For example, this function cannot translate "drive relative" path like
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
55 /// "X:foo" to an absolute path.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
56 ///
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
57 /// Return an error if `std::env::current_dir()` fails or if this function
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
58 /// fails to produce an absolute path.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
59 pub fn absolute(path: impl AsRef<Path>) -> io::Result<PathBuf> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
60 let path = path.as_ref();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
61 let path = if path.is_absolute() {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
62 path.to_path_buf()
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
63 } else {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
64 std::env::current_dir()?.join(path)
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
65 };
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
66
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
67 if !path.is_absolute() {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
68 return Err(io::Error::new(
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
69 io::ErrorKind::Other,
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
70 format!("cannot get absoltue path from {:?}", path),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
71 ));
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
72 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
73
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
74 let mut result = PathBuf::new();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
75 for component in path.components() {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
76 match component {
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
77 Component::Normal(_)
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
78 | Component::RootDir
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
79 | Component::Prefix(_) => {
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
80 result.push(component);
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
81 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
82 Component::ParentDir => {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
83 result.pop();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
84 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
85 Component::CurDir => (),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
86 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
87 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
88 Ok(result)
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
89 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
90
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
91 /// Remove the file pointed by `path`.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
92 #[cfg(unix)]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
93 pub fn remove_file<P: AsRef<Path>>(path: P) -> Result<()> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
94 fs_remove_file(path)?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
95 Ok(())
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
96 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
97
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
98 /// Remove the file pointed by `path`.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
99 ///
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
100 /// On Windows, removing a file can fail for various reasons, including if the
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
101 /// file is memory mapped. This can happen when the repository is accessed
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
102 /// concurrently while a background task is trying to remove a packfile. To
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
103 /// solve this, we can rename the file before trying to remove it.
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
104 /// If the remove operation fails, a future repack will clean it up.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
105 #[cfg(not(unix))]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
106 pub fn remove_file<P: AsRef<Path>>(path: P) -> Result<()> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
107 let path = path.as_ref();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
108 let extension = path
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
109 .extension()
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
110 .and_then(|ext| ext.to_str())
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
111 .map_or(".to-delete".to_owned(), |ext| ".".to_owned() + ext + "-tmp");
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
112
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
113 let dest_path = Builder::new()
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
114 .prefix("")
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
115 .suffix(&extension)
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
116 .rand_bytes(8)
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
117 .tempfile_in(path.parent().unwrap())?
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
118 .into_temp_path();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
119
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
120 rename(path, &dest_path)?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
121
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
122 // Ignore errors when removing the file, it will be cleaned up at a later
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
123 // time.
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
124 let _ = fs_remove_file(dest_path);
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
125 Ok(())
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
126 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
127
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
128 /// Create the directory and ignore failures when a directory of the same name
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
129 /// already exists.
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
130 pub fn create_dir(path: impl AsRef<Path>) -> io::Result<()> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
131 match fs::create_dir(path.as_ref()) {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
132 Ok(()) => Ok(()),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
133 Err(e) => {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
134 if e.kind() == ErrorKind::AlreadyExists && path.as_ref().is_dir() {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
135 Ok(())
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
136 } else {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
137 Err(e)
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
138 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
139 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
140 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
141 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
142
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
143 /// Expand the user's home directory and any environment variables references
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
144 /// in the given path.
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
145 ///
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
146 /// This function is designed to emulate the behavior of Mercurial's
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
147 /// `util.expandpath` function, which in turn uses Python's
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
148 /// `os.path.expand{user,vars}` functions. This results in behavior that is
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
149 /// notably different from the default expansion behavior of the `shellexpand`
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
150 /// crate. In particular:
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
151 ///
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
152 /// - If a reference to an environment variable is missing or invalid, the
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
153 /// reference is left unchanged in the resulting path rather than emitting an
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
154 /// error.
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
155 ///
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
156 /// - Home directory expansion explicitly happens after environment variable
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
157 /// expansion, meaning that if an environment variable is expanded into a
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
158 /// string starting with a tilde (`~`), the tilde will be expanded into the
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
159 /// user's home directory.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
160 pub fn expand_path(path: impl AsRef<str>) -> PathBuf {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
161 expand_path_impl(path.as_ref(), |k| env::var(k).ok(), dirs::home_dir)
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
162 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
163
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
164 /// Same as `expand_path` but explicitly takes closures for environment
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
165 /// variable and home directory lookup for the sake of testability.
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
166 fn expand_path_impl<E, H>(path: &str, getenv: E, homedir: H) -> PathBuf
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
167 where
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
168 E: FnMut(&str) -> Option<String>,
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
169 H: FnOnce() -> Option<PathBuf>,
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
170 {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
171 // The shellexpand crate does not expand Windows environment variables
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
172 // like `%PROGRAMDATA%`. We'd like to expand them too. So let's do some
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
173 // pre-processing.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
174 //
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
175 // XXX: Doing this preprocessing has the unfortunate side-effect that
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
176 // if an environment variable fails to expand on Windows, the resulting
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
177 // string will contain a UNIX-style environment variable reference.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
178 //
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
179 // e.g., "/foo/%MISSING%/bar" will expand to "/foo/${MISSING}/bar"
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
180 //
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
181 // The current approach is good enough for now, but likely needs to
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
182 // be improved later for correctness.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
183 let path = {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
184 let mut new_path = String::new();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
185 let mut is_starting = true;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
186 for ch in path.chars() {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
187 if ch == '%' {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
188 if is_starting {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
189 new_path.push_str("${");
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
190 } else {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
191 new_path.push('}');
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
192 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
193 is_starting = !is_starting;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
194 } else if cfg!(windows) && ch == '/' {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
195 // Only on Windows, change "/" to "\" automatically.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
196 // This makes sure "%include /foo" works as expected.
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
197 new_path.push('\\')
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
198 } else {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
199 new_path.push(ch);
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
200 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
201 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
202 new_path
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
203 };
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
204
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
205 let path = shellexpand::env_with_context_no_errors(&path, getenv);
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
206 shellexpand::tilde_with_context(&path, homedir)
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
207 .as_ref()
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
208 .into()
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
209 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
210
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
211 #[cfg(test)]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
212 mod tests {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
213 use super::*;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
214
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
215 use std::fs::File;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
216
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
217 use tempfile::TempDir;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
218
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
219 #[cfg(windows)]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
220 mod windows {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
221 use super::*;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
222
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
223 #[test]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
224 fn test_absolute_fullpath() {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
225 assert_eq!(absolute("C:/foo").unwrap(), Path::new("C:\\foo"));
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
226 assert_eq!(
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
227 absolute("x:\\a/b\\./.\\c").unwrap(),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
228 Path::new("x:\\a\\b\\c")
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
229 );
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
230 assert_eq!(
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
231 absolute("y:/a/b\\../..\\c\\../d\\./.").unwrap(),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
232 Path::new("y:\\d")
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
233 );
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
234 assert_eq!(
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
235 absolute("z:/a/b\\../..\\../..\\..").unwrap(),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
236 Path::new("z:\\")
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
237 );
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
238 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
239 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
240
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
241 #[cfg(unix)]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
242 mod unix {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
243 use super::*;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
244
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
245 #[test]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
246 fn test_absolute_fullpath() {
44068
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
247 assert_eq!(
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
248 absolute("/a/./b\\c/../d/.").unwrap(),
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
249 Path::new("/a/d")
4b953cb17612 hg-core: rustfmt path.rs
Gregory Szorc <gregory.szorc@gmail.com>
parents: 44067
diff changeset
250 );
44067
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
251 assert_eq!(absolute("/a/../../../../b").unwrap(), Path::new("/b"));
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
252 assert_eq!(absolute("/../../..").unwrap(), Path::new("/"));
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
253 assert_eq!(absolute("/../../../").unwrap(), Path::new("/"));
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
254 assert_eq!(
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
255 absolute("//foo///bar//baz").unwrap(),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
256 Path::new("/foo/bar/baz")
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
257 );
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
258 assert_eq!(absolute("//").unwrap(), Path::new("/"));
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
259 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
260 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
261
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
262 #[test]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
263 fn test_create_dir_non_exist() -> Result<()> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
264 let tempdir = TempDir::new()?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
265 let mut path = tempdir.path().to_path_buf();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
266 path.push("dir");
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
267 create_dir(&path)?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
268 assert!(path.is_dir());
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
269 Ok(())
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
270 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
271
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
272 #[test]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
273 fn test_create_dir_exist() -> Result<()> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
274 let tempdir = TempDir::new()?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
275 let mut path = tempdir.path().to_path_buf();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
276 path.push("dir");
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
277 create_dir(&path)?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
278 assert!(&path.is_dir());
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
279 create_dir(&path)?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
280 assert!(&path.is_dir());
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
281 Ok(())
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
282 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
283
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
284 #[test]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
285 fn test_create_dir_file_exist() -> Result<()> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
286 let tempdir = TempDir::new()?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
287 let mut path = tempdir.path().to_path_buf();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
288 path.push("dir");
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
289 File::create(&path)?;
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
290 let err = create_dir(&path).unwrap_err();
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
291 assert_eq!(err.kind(), ErrorKind::AlreadyExists);
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
292 Ok(())
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
293 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
294
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
295 #[test]
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
296 fn test_path_expansion() {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
297 fn getenv(key: &str) -> Option<String> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
298 match key {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
299 "foo" => Some("~/a".into()),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
300 "bar" => Some("b".into()),
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
301 _ => None,
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
302 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
303 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
304
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
305 fn homedir() -> Option<PathBuf> {
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
306 Some(PathBuf::from("/home/user"))
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
307 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
308
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
309 let path = "$foo/${bar}/$baz";
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
310 let expected = PathBuf::from("/home/user/a/b/$baz");
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
311
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
312 assert_eq!(expand_path_impl(&path, getenv, homedir), expected);
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
313 }
6a1729ed223d hg-core: vendor Facebook's path utils module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
314 }