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

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

copies: cache the ancestor checking call when tracing copy A good share of the time spent in this function is spent doing ancestors checking. To avoid spending time in duplicated call, we cache the result of calls. In the slower case, this provide a quite significant performance boost. Below are the result for a set of selected pairs (many of them pathological): (And further down is another table that summarize the current state of filelog based vs changeset base copy tracing) The benchmark have been configured to be killed after 6 minutes of runtime, which mean that any detect slower than 2 minutes will be marked as "killed". This drop some useful information about how much slower these case are? but also prevent 99% of the benchmark time to be spent on case that can be labelled "very slow" anyway. Repo Case Source-Rev Dest-Rev Old-Time New-Time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000044 s, +0.000000 s, ? 1.0000 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000138 s, +0.000000 s, ? 1.0000 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005067 s, 0.005052 s, -0.000015 s, ? 0.9970 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000218 s, 0.000219 s, +0.000001 s, ? 1.0046 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000053 s, 0.000055 s, +0.000002 s, ? 1.0377 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000125 s, 0.000128 s, +0.000003 s, ? 1.0240 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001098 s, 0.001089 s, -0.000009 s, ? 0.9918 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017546 s, 0.017407 s, -0.000139 s, ? 0.9921 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.096723 s, 0.094175 s, -0.002548 s, ? 0.9737 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.271796 s, 0.238009 s, -0.033787 s, ? 0.8757 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.128602 s, 0.125876 s, -0.002726 s, ? 0.9788 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 7.086742 s, 3.581556 s, -3.505186 s, ? 0.5054 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016634 s, 0.016721 s, +0.000087 s, ? 1.0052 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.254225 s, 0.242367 s, -0.011858 s, ? 0.9534 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000166 s, 0.000165 s, -0.000001 s, ? 0.9940 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000118 s, 0.000114 s, -0.000004 s, ? 0.9661 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000296 s, +0.000000 s, ? 1.0000 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001137 s, 0.001124 s, -0.000013 s, ? 0.9886 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.014133 s, 0.013060 s, -0.001073 s, ? 0.9241 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.016988 s, 0.017112 s, +0.000124 s, ? 1.0073 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.676361 s, 0.660350 s, -0.016011 s, ? 0.9763 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 12.515149 s, 10.032499 s, -2.482650 s, ? 0.8016 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000186 s, 0.000189 s, +0.000003 s, ? 1.0161 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000459 s, 0.000462 s, +0.000003 s, ? 1.0065 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000273 s, 0.000270 s, -0.000003 s, ? 0.9890 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001503 s, 0.001474 s, -0.000029 s, ? 0.9807 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004862 s, 0.004806 s, -0.000056 s, ? 0.9885 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088291 s, 0.085150 s, -0.003141 s, ? 0.9644 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007113 s, 0.007064 s, -0.000049 s, ? 0.9931 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004687 s, 0.004741 s, +0.000054 s, ? 1.0115 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.198710 s, 0.190133 s, -0.008577 s, ? 0.9568 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.036068 s, 0.035651 s, -0.000417 s, ? 0.9884 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.465362 s, 0.440694 s, -0.024668 s, ? 0.9470 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 24.519684 s, 18.454163 s, -6.065521 s, ? 0.7526 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 42.711897 s, 31.562719 s, -11.149178 s, ? 0.7390 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001201 s, 0.001189 s, -0.000012 s, ? 0.9900 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001216 s, 0.001204 s, -0.000012 s, ? 0.9901 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000595 s, 0.000586 s, -0.000009 s, ? 0.9849 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001856 s, 0.001845 s, -0.000011 s, ? 0.9941 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.064936 s, 0.063822 s, -0.001114 s, ? 0.9828 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.090601 s, 0.088038 s, -0.002563 s, ? 0.9717 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007510 s, 0.007389 s, -0.000121 s, ? 0.9839 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004911 s, 0.004868 s, -0.000043 s, ? 0.9912 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.233231 s, 0.222450 s, -0.010781 s, ? 0.9538 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.419989 s, 0.370675 s, -0.049314 s, ? 0.8826 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.401521 s, 0.358020 s, -0.043501 s, ? 0.8917 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.179555 s, 0.145235 s, -0.034320 s, ? 0.8089 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.038004 s, 0.037606 s, -0.000398 s, ? 0.9895 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 52.838482 s, 7.382439 s, -45.456043 s, ? 0.1397 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 8.705874 s, 7.273506 s, -1.432368 s, ? 0.8355 mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.126708 s, 1.074593 s, -0.052115 s, ? 0.9537 mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 83.854020 s, 27.746195 s, -56.107825 s, ? 0.3309 Below is a table comparing the runtime of the current "filelog centric" algorithm, with the "changeset centric" one, we just modified. The changeset centric algorithm is a significant win in many scenario, but they are still various cases where it is quite slower. When many revision has to be considered the cost of retrieving the copy information, creating new dictionaries, merging dictionaries and checking if revision are ancestors of each other can slow things down. The rest of this series, will introduce a rust version of the copy tracing code to deal with most of theses issues. Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000914 s, 0.000044 s, - 0.000870 s, ? 0.048140 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001812 s, 0.000138 s, - 0.001674 s, ? 0.076159 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.017954 s, 0.005052 s, - 0.012902 s, ? 0.281386 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001509 s, 0.000219 s, - 0.001290 s, ? 0.145129 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.206881 s, 0.000055 s, - 0.206826 s, ? 0.000266 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016951 s, 0.000128 s, - 0.016823 s, ? 0.007551 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019096 s, 0.001089 s, - 0.018007 s, ? 0.057028 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.762506 s, 0.017407 s, - 0.745099 s, ? 0.022829 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.179211 s, 0.094175 s, - 1.085036 s, ? 0.079863 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.249058 s, 0.238009 s, - 1.011049 s, ? 0.190551 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.614107 s, 0.125876 s, - 1.488231 s, ? 0.077985 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001064 s, 3.581556 s, + 3.580492 s, ? 3366.124060 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.061275 s, 0.016721 s, - 1.044554 s, ? 0.015756 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.341119 s, 0.242367 s, - 1.098752 s, ? 0.180720 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027803 s, 0.000165 s, - 0.027638 s, ? 0.005935 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.130014 s, 0.000114 s, - 0.129900 s, ? 0.000877 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.024990 s, 0.000296 s, - 0.024694 s, ? 0.011845 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052201 s, 0.001124 s, - 0.051077 s, ? 0.021532 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037642 s, 0.013060 s, - 0.024582 s, ? 0.346953 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.197086 s, 0.017112 s, - 0.179974 s, ? 0.086825 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.935148 s, 0.660350 s, - 0.274798 s, ? 0.706145 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.920674 s, 10.032499 s, + 6.111825 s, ? 2.558871 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024232 s, 0.000189 s, - 0.024043 s, ? 0.007800 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141483 s, 0.000462 s, - 0.141021 s, ? 0.003265 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025775 s, 0.000270 s, - 0.025505 s, ? 0.010475 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.084922 s, 0.001474 s, - 0.083448 s, ? 0.017357 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.194784 s, 0.004806 s, - 0.189978 s, ? 0.024673 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.161103 s, 0.085150 s, - 2.075953 s, ? 0.039401 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089347 s, 0.007064 s, - 0.082283 s, ? 0.079063 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.732171 s, 0.004741 s, - 0.727430 s, ? 0.006475 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.157287 s, 0.190133 s, - 0.967154 s, ? 0.164292 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.726568 s, 0.035651 s, - 6.690917 s, ? 0.005300 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.266229 s, 0.440694 s, - 2.825535 s, ? 0.134924 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 15.860534 s, 18.454163 s, + 2.593629 s, ? 1.163527 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.450475 s, 31.562719 s, +11.112244 s, ? 1.543373 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080442 s, 0.001189 s, - 0.079253 s, ? 0.014781 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.497672 s, 0.001204 s, - 0.496468 s, ? 0.002419 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021183 s, 0.000586 s, - 0.020597 s, ? 0.027664 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.230991 s, 0.001845 s, - 0.229146 s, ? 0.007987 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118461 s, 0.063822 s, - 1.054639 s, ? 0.057062 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.206083 s, 0.088038 s, - 2.118045 s, ? 0.039907 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089404 s, 0.007389 s, - 0.082015 s, ? 0.082647 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.733043 s, 0.004868 s, - 0.728175 s, ? 0.006641 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.163367 s, 0.222450 s, - 0.940917 s, ? 0.191212 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.085456 s, 0.370675 s, + 0.285219 s, ? 4.337612 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.083601 s, 0.358020 s, + 0.274419 s, ? 4.282485 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.366614 s, 0.145235 s, - 7.221379 s, ? 0.019715 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.664464 s, 0.037606 s, - 6.626858 s, ? 0.005643 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.467836 s, 7.382439 s, - 0.085397 s, ? 0.988565 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.801294 s, 7.273506 s, - 2.527788 s, ? 0.742097 mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.091886 s, killed mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.491140 s, 1.074593 s, -25.416547 s, ? 0.040564 mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.092863 s, killed mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.226823 s, killed mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 18.914630 s, 27.746195 s, + 8.831565 s, ? 1.466917 mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.198903 s, killed mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 24.952268 s, killed Differential Revision: https://phab.mercurial-scm.org/D9296

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 02 Nov 2020 11:03:56 +0100
parents	26114bd6ec60
children	777c3d231913

rev	line source
42767 4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	1 // filepatterns.rs
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	2 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	4 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	5 // 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: 42636 diff changeset	6 // 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: 42636 diff changeset	7
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	8 //! Handling of Mercurial-specific patterns.
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	9
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	10 use crate::{
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	11 utils::{
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	12 files::{canonical_path, get_bytes_from_path, get_path_from_bytes},
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	13 hg_path::{path_to_hg_path_buf, HgPathBuf, HgPathError},
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	14 SliceExt,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	15 },
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	16 FastHashMap, PatternError,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	17 };
42609 326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42498 diff changeset	18 use lazy_static::lazy_static;
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	19 use regex::bytes::{NoExpand, Regex};
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	20 use std::fs::File;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	21 use std::io::Read;
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	22 use std::ops::Deref;
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	23 use std::path::{Path, PathBuf};
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	24 use std::vec::Vec;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	25
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	26 lazy_static! {
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	27 static ref RE_ESCAPE: Vec<Vec<u8>> = {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 let mut v: Vec<Vec<u8>> = (0..=255).map(\|byte\| vec![byte]).collect();
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	29 let to_escape = b"()[]{}?*+-\|^$\\.&~# \t\n\r\x0b\x0c";
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	30 for byte in to_escape {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	31 v[*byte as usize].insert(0, b'\\');
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	32 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	33 v
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	34 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	35 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	36
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	37 /// These are matched in order
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	38 const GLOB_REPLACEMENTS: &[(&[u8], &[u8])] =
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	39 &[(b"/", b"(?:./)?"), (b"", b"."), (b"", b"[^/]*")];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	40
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	41 /// Appended to the regexp of globs
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	42 const GLOB_SUFFIX: &[u8; 7] = b"(?:/\|$)";
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	43
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	44 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	45 pub enum PatternSyntax {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	46 /// A regular expression
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	47 Regexp,
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	48 /// Glob that matches at the front of the path
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	49 RootGlob,
42851 ce6797ef6eab rust: apply more formatting fixes Yuya Nishihara <yuya@tcha.org> parents: 42767 diff changeset	50 /// Glob that matches at any suffix of the path (still anchored at
ce6797ef6eab rust: apply more formatting fixes Yuya Nishihara <yuya@tcha.org> parents: 42767 diff changeset	51 /// slashes)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	52 Glob,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	53 /// a path relative to repository root, which is matched recursively
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	54 Path,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	55 /// A path relative to cwd
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	56 RelPath,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	57 /// an unrooted glob (*.rs matches Rust files in all dirs)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	58 RelGlob,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	59 /// A regexp that needn't match the start of a name
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	60 RelRegexp,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	61 /// A path relative to repository root, which is matched non-recursively
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	62 /// (will not match subdirectories)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	63 RootFiles,
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	64 /// A file of patterns to read and include
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	65 Include,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	66 /// A file of patterns to match against files under the same directory
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	67 SubInclude,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	68 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70 /// Transforms a glob pattern into a regex
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	71 fn glob_to_re(pat: &[u8]) -> Vec<u8> {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	72 let mut input = pat;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	73 let mut res: Vec<u8> = vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	74 let mut group_depth = 0;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	75
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	76 while let Some((c, rest)) = input.split_first() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	77 input = rest;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	78
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	79 match c {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	80 b'*' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	81 for (source, repl) in GLOB_REPLACEMENTS {
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	82 if let Some(rest) = input.drop_prefix(source) {
62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	83 input = rest;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	84 res.extend(*repl);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	85 break;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	86 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	87 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	88 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	89 b'?' => res.extend(b"."),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	90 b'[' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	91 match input.iter().skip(1).position(\|b\| *b == b']') {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	92 None => res.extend(b"\\["),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	93 Some(end) => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	94 // Account for the one we skipped
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	95 let end = end + 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	96
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	97 res.extend(b"[");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	98
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	99 for (i, b) in input[..end].iter().enumerate() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	100 if *b == b'!' && i == 0 {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	101 res.extend(b"^")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	102 } else if *b == b'^' && i == 0 {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	103 res.extend(b"\\^")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	104 } else if *b == b'\\' {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	105 res.extend(b"\\\\")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	106 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	107 res.push(*b)
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	108 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	109 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	110 res.extend(b"]");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	111 input = &input[end + 1..];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	112 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	113 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	115 b'{' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	116 group_depth += 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117 res.extend(b"(?:")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	118 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	119 b'}' if group_depth > 0 => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	120 group_depth -= 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	121 res.extend(b")");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	122 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	123 b',' if group_depth > 0 => res.extend(b"\|"),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	124 b'\\' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	125 let c = {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	126 if let Some((c, rest)) = input.split_first() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	127 input = rest;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 c
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	130 c
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	131 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	132 };
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	133 res.extend(&RE_ESCAPE[*c as usize])
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	134 }
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	135 _ => res.extend(&RE_ESCAPE[*c as usize]),
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	136 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	137 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	138 res
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	139 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	140
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	141 fn escape_pattern(pattern: &[u8]) -> Vec<u8> {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	142 pattern
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	143 .iter()
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	144 .flat_map(\|c\| RE_ESCAPE[*c as usize].clone())
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	145 .collect()
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	146 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	147
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	148 pub fn parse_pattern_syntax(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	149 kind: &[u8],
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	150 ) -> Result<PatternSyntax, PatternError> {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	151 match kind {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	152 b"re:" => Ok(PatternSyntax::Regexp),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	153 b"path:" => Ok(PatternSyntax::Path),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	154 b"relpath:" => Ok(PatternSyntax::RelPath),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	155 b"rootfilesin:" => Ok(PatternSyntax::RootFiles),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	156 b"relglob:" => Ok(PatternSyntax::RelGlob),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	157 b"relre:" => Ok(PatternSyntax::RelRegexp),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	158 b"glob:" => Ok(PatternSyntax::Glob),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	159 b"rootglob:" => Ok(PatternSyntax::RootGlob),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	160 b"include:" => Ok(PatternSyntax::Include),
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	161 b"subinclude:" => Ok(PatternSyntax::SubInclude),
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	162 _ => Err(PatternError::UnsupportedSyntax(
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	163 String::from_utf8_lossy(kind).to_string(),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	164 )),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	165 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	166 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	167
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	168 /// Builds the regex that corresponds to the given pattern.
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	169 /// If within a `syntax: regexp` context, returns the pattern,
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	170 /// otherwise, returns the corresponding regex.
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	171 fn _build_single_regex(entry: &IgnorePattern) -> Vec<u8> {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	172 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	173 syntax, pattern, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	174 } = entry;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	175 if pattern.is_empty() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	176 return vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	177 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	178 match syntax {
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	179 PatternSyntax::Regexp => pattern.to_owned(),
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	180 PatternSyntax::RelRegexp => {
44601 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	181 // The `regex` crate accepts `**` while `re2` and Python's `re`
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	182 // do not. Checking for `*` correctly triggers the same error all
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	183 // engines.
44892 1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	184 if pattern[0] == b'^'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	185 \|\| pattern[0] == b'*'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	186 \|\| pattern.starts_with(b".*")
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	187 {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	188 return pattern.to_owned();
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	189 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	190 [&b".*"[..], pattern].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	191 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	192 PatternSyntax::Path \| PatternSyntax::RelPath => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	193 if pattern == b"." {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	194 return vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	195 }
42871 69195b6f8f97 rustfilepatterns: shorter code for concatenating slices Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42870 diff changeset	196 [escape_pattern(pattern).as_slice(), b"(?:/\|$)"].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	197 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	198 PatternSyntax::RootFiles => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	199 let mut res = if pattern == b"." {
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	200 vec![]
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	201 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	202 // Pattern is a directory name.
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	203 [escape_pattern(pattern).as_slice(), b"/"].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	204 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	205
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	206 // Anything after the pattern must be a non-directory.
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	207 res.extend(b"[^/]+$");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	208 res
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	209 }
42870 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	210 PatternSyntax::RelGlob => {
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	211 let glob_re = glob_to_re(pattern);
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	212 if let Some(rest) = glob_re.drop_prefix(b"[^/]*") {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	213 [b".*", rest, GLOB_SUFFIX].concat()
42870 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	214 } else {
44601 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	215 [b"(?:.*/)?", glob_re.as_slice(), GLOB_SUFFIX].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	216 }
42870 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	217 }
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	218 PatternSyntax::Glob \| PatternSyntax::RootGlob => {
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	219 [glob_to_re(pattern).as_slice(), GLOB_SUFFIX].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	220 }
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	221 PatternSyntax::Include \| PatternSyntax::SubInclude => unreachable!(),
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	222 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	223 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	224
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	225 const GLOB_SPECIAL_CHARACTERS: [u8; 7] =
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	226 [b'*', b'?', b'[', b']', b'{', b'}', b'\\'];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	227
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	228 /// TODO support other platforms
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	229 #[cfg(unix)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	230 pub fn normalize_path_bytes(bytes: &[u8]) -> Vec<u8> {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	231 if bytes.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	232 return b".".to_vec();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	233 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	234 let sep = b'/';
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	235
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	236 let mut initial_slashes = bytes.iter().take_while(\|b\| **b == sep).count();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	237 if initial_slashes > 2 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	238 // POSIX allows one or two initial slashes, but treats three or more
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	239 // as single slash.
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	240 initial_slashes = 1;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	241 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	242 let components = bytes
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	243 .split(\|b\| *b == sep)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	244 .filter(\|c\| !(c.is_empty() \|\| c == b"."))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	245 .fold(vec![], \|mut acc, component\| {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	246 if component != b".."
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	247 \|\| (initial_slashes == 0 && acc.is_empty())
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	248 \|\| (!acc.is_empty() && acc[acc.len() - 1] == b"..")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	249 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	250 acc.push(component)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	251 } else if !acc.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	252 acc.pop();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	253 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	254 acc
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	255 });
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	256 let mut new_bytes = components.join(&sep);
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	257
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	258 if initial_slashes > 0 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	259 let mut buf: Vec<_> = (0..initial_slashes).map(\|_\| sep).collect();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	260 buf.extend(new_bytes);
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	261 new_bytes = buf;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	262 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	263 if new_bytes.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	264 b".".to_vec()
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	265 } else {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	266 new_bytes
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	267 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	268 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	269
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	270 /// Wrapper function to `_build_single_regex` that short-circuits 'exact' globs
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	271 /// that don't need to be transformed into a regex.
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	272 pub fn build_single_regex(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	273 entry: &IgnorePattern,
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	274 ) -> Result<Option<Vec<u8>>, PatternError> {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	275 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	276 pattern, syntax, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	277 } = entry;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	278 let pattern = match syntax {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	279 PatternSyntax::RootGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	280 \| PatternSyntax::Path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	281 \| PatternSyntax::RelGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	282 \| PatternSyntax::RootFiles => normalize_path_bytes(&pattern),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	283 PatternSyntax::Include \| PatternSyntax::SubInclude => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	284 return Err(PatternError::NonRegexPattern(entry.clone()))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	285 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	286 _ => pattern.to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	287 };
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	288 if *syntax == PatternSyntax::RootGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	289 && !pattern.iter().any(\|b\| GLOB_SPECIAL_CHARACTERS.contains(b))
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	290 {
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	291 Ok(None)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	292 } else {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	293 let mut entry = entry.clone();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	294 entry.pattern = pattern;
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	295 Ok(Some(_build_single_regex(&entry)))
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	296 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	297 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	298
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	299 lazy_static! {
43844 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	300 static ref SYNTAXES: FastHashMap<&'static [u8], &'static [u8]> = {
5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	301 let mut m = FastHashMap::default();
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	302
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	303 m.insert(b"re".as_ref(), b"relre:".as_ref());
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	304 m.insert(b"regexp".as_ref(), b"relre:".as_ref());
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	305 m.insert(b"glob".as_ref(), b"relglob:".as_ref());
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	306 m.insert(b"rootglob".as_ref(), b"rootglob:".as_ref());
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	307 m.insert(b"include".as_ref(), b"include:".as_ref());
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	308 m.insert(b"subinclude".as_ref(), b"subinclude:".as_ref());
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	309 m
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	310 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	311 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	312
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	313 #[derive(Debug)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	314 pub enum PatternFileWarning {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	315 /// (file path, syntax bytes)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	316 InvalidSyntax(PathBuf, Vec<u8>),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	317 /// File path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	318 NoSuchFile(PathBuf),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	319 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	320
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	321 pub fn parse_pattern_file_contents<P: AsRef<Path>>(
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	322 lines: &[u8],
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	323 file_path: P,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	324 warn: bool,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	325 ) -> Result<(Vec<IgnorePattern>, Vec<PatternFileWarning>), PatternError> {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	326 let comment_regex = Regex::new(r"((?:^\|[^\\])(?:\\\\))#.").unwrap();
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	327
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	328 #[allow(clippy::trivial_regex)]
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	329 let comment_escape_regex = Regex::new(r"\\#").unwrap();
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	330 let mut inputs: Vec<IgnorePattern> = vec![];
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	331 let mut warnings: Vec<PatternFileWarning> = vec![];
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	332
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	333 let mut current_syntax = b"relre:".as_ref();
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	334
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	335 for (line_number, mut line) in lines.split(\|c\| *c == b'\n').enumerate() {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	336 let line_number = line_number + 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	337
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	338 let line_buf;
42635 30f8e786868c rust-filepatterns: use literal b'#' instead of cast Yuya Nishihara <yuya@tcha.org> parents: 42634 diff changeset	339 if line.contains(&b'#') {
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	340 if let Some(cap) = comment_regex.captures(line) {
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	341 line = &line[..cap.get(1).unwrap().end()]
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	342 }
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	343 line_buf = comment_escape_regex.replace_all(line, NoExpand(b"#"));
12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	344 line = &line_buf;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	345 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	346
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	347 let mut line = line.trim_end();
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	348
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	349 if line.is_empty() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	350 continue;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	351 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	352
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	353 if let Some(syntax) = line.drop_prefix(b"syntax:") {
62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	354 let syntax = syntax.trim();
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	355
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	356 if let Some(rel_syntax) = SYNTAXES.get(syntax) {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	357 current_syntax = rel_syntax;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	358 } else if warn {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	359 warnings.push(PatternFileWarning::InvalidSyntax(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	360 file_path.as_ref().to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	361 syntax.to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	362 ));
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	363 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	364 continue;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	365 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	366
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	367 let mut line_syntax: &[u8] = &current_syntax;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	368
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	369 for (s, rels) in SYNTAXES.iter() {
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	370 if let Some(rest) = line.drop_prefix(rels) {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	371 line_syntax = rels;
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	372 line = rest;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	373 break;
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	374 }
62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	375 if let Some(rest) = line.drop_prefix(&[s, &b":"[..]].concat()) {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	376 line_syntax = rels;
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	377 line = rest;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	378 break;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	379 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	380 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	381
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	382 inputs.push(IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	383 parse_pattern_syntax(&line_syntax).map_err(\|e\| match e {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	384 PatternError::UnsupportedSyntax(syntax) => {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	385 PatternError::UnsupportedSyntaxInFile(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	386 syntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	387 file_path.as_ref().to_string_lossy().into(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	388 line_number,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	389 )
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	390 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	391 _ => e,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	392 })?,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	393 &line,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	394 &file_path,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	395 ));
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	396 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	397 Ok((inputs, warnings))
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	398 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	399
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	400 pub fn read_pattern_file<P: AsRef<Path>>(
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	401 file_path: P,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	402 warn: bool,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	403 ) -> Result<(Vec<IgnorePattern>, Vec<PatternFileWarning>), PatternError> {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	404 let mut f = match File::open(file_path.as_ref()) {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	405 Ok(f) => Ok(f),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	406 Err(e) => match e.kind() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	407 std::io::ErrorKind::NotFound => {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	408 return Ok((
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	409 vec![],
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	410 vec![PatternFileWarning::NoSuchFile(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	411 file_path.as_ref().to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	412 )],
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	413 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	414 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	415 _ => Err(e),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	416 },
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	417 }?;
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	418 let mut contents = Vec::new();
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	419
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	420 f.read_to_end(&mut contents)?;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	421
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	422 Ok(parse_pattern_file_contents(&contents, file_path, warn)?)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	423 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	424
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	425 /// Represents an entry in an "ignore" file.
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	426 #[derive(Debug, Eq, PartialEq, Clone)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	427 pub struct IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	428 pub syntax: PatternSyntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	429 pub pattern: Vec<u8>,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	430 pub source: PathBuf,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	431 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	432
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	433 impl IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	434 pub fn new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	435 syntax: PatternSyntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	436 pattern: &[u8],
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	437 source: impl AsRef<Path>,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	438 ) -> Self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	439 Self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	440 syntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	441 pattern: pattern.to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	442 source: source.as_ref().to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	443 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	444 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	445 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	446
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	447 pub type PatternResult<T> = Result<T, PatternError>;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	448
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	449 /// Wrapper for `read_pattern_file` that also recursively expands `include:`
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	450 /// patterns.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	451 ///
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	452 /// `subinclude:` is not treated as a special pattern here: unraveling them
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	453 /// needs to occur in the "ignore" phase.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	454 pub fn get_patterns_from_file(
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	455 pattern_file: impl AsRef<Path>,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	456 root_dir: impl AsRef<Path>,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	457 ) -> PatternResult<(Vec<IgnorePattern>, Vec<PatternFileWarning>)> {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	458 let (patterns, mut warnings) = read_pattern_file(&pattern_file, true)?;
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	459 let patterns = patterns
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	460 .into_iter()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	461 .flat_map(\|entry\| -> PatternResult<_> {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	462 let IgnorePattern {
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	463 syntax, pattern, ..
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	464 } = &entry;
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	465 Ok(match syntax {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	466 PatternSyntax::Include => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	467 let inner_include =
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	468 root_dir.as_ref().join(get_path_from_bytes(&pattern));
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	469 let (inner_pats, inner_warnings) = get_patterns_from_file(
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	470 &inner_include,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	471 root_dir.as_ref(),
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	472 )?;
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	473 warnings.extend(inner_warnings);
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	474 inner_pats
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	475 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	476 _ => vec![entry],
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	477 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	478 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	479 .flatten()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	480 .collect();
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	481
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	482 Ok((patterns, warnings))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	483 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	484
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	485 /// Holds all the information needed to handle a `subinclude:` pattern.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	486 pub struct SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	487 /// Will be used for repository (hg) paths that start with this prefix.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	488 /// It is relative to the current working directory, so comparing against
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	489 /// repository paths is painless.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	490 pub prefix: HgPathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	491 /// The file itself, containing the patterns
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	492 pub path: PathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	493 /// Folder in the filesystem where this it applies
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	494 pub root: PathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	495 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	496
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	497 impl SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	498 pub fn new(
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	499 root_dir: impl AsRef<Path>,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	500 pattern: &[u8],
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	501 source: impl AsRef<Path>,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	502 ) -> Result<SubInclude, HgPathError> {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	503 let normalized_source =
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	504 normalize_path_bytes(&get_bytes_from_path(source));
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	505
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	506 let source_root = get_path_from_bytes(&normalized_source);
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	507 let source_root =
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	508 source_root.parent().unwrap_or_else(\|\| source_root.deref());
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	509
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	510 let path = source_root.join(get_path_from_bytes(pattern));
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	511 let new_root = path.parent().unwrap_or_else(\|\| path.deref());
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	512
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	513 let prefix = canonical_path(&root_dir, &root_dir, new_root)?;
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	514
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	515 Ok(Self {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	516 prefix: path_to_hg_path_buf(prefix).and_then(\|mut p\| {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	517 if !p.is_empty() {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	518 p.push(b'/');
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	519 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	520 Ok(p)
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	521 })?,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	522 path: path.to_owned(),
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	523 root: new_root.to_owned(),
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	524 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	525 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	526 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	527
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	528 /// Separate and pre-process subincludes from other patterns for the "ignore"
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	529 /// phase.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	530 pub fn filter_subincludes(
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	531 ignore_patterns: &[IgnorePattern],
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	532 root_dir: impl AsRef<Path>,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	533 ) -> Result<(Vec<SubInclude>, Vec<&IgnorePattern>), HgPathError> {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	534 let mut subincludes = vec![];
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	535 let mut others = vec![];
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	536
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	537 for ignore_pattern in ignore_patterns.iter() {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	538 let IgnorePattern {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	539 syntax,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	540 pattern,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	541 source,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	542 } = ignore_pattern;
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	543 if *syntax == PatternSyntax::SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	544 subincludes.push(SubInclude::new(&root_dir, pattern, &source)?);
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	545 } else {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	546 others.push(ignore_pattern)
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	547 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	548 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	549 Ok((subincludes, others))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	550 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	551
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	552 #[cfg(test)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	553 mod tests {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	554 use super::*;
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	555 use pretty_assertions::assert_eq;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	556
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	557 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	558 fn escape_pattern_test() {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	559 let untouched =
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	560 br#"!"%',/0123456789:;<=>@ABCDEFGHIJKLMNOPQRSTUVWXYZ_`abcdefghijklmnopqrstuvwxyz"#;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	561 assert_eq!(escape_pattern(untouched), untouched.to_vec());
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	562 // All escape codes
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	563 assert_eq!(
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	564 escape_pattern(br#"()[]{}?*+-\|^$\\.&~# \t\n\r\v\f"#),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	565 br#"\[\]\{\}\?\*\+\-\\|\^\$\\\\\.\&\~\#\ \\t\\n\\r\\v\\f"#
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	566 .to_vec()
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	567 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	568 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	569
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	570 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	571 fn glob_test() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	572 assert_eq!(glob_to_re(br#"?"#), br#"."#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	573 assert_eq!(glob_to_re(br#""#), br#"[^/]"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	574 assert_eq!(glob_to_re(br#"*"#), br#"."#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	575 assert_eq!(glob_to_re(br#"*/a"#), br#"(?:./)?a"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	576 assert_eq!(glob_to_re(br#"a/*/b"#), br#"a/(?:./)?b"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	577 assert_eq!(glob_to_re(br#"[a?!^][^b][!c]"#), br#"[a?!^][\^b][^c]"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	578 assert_eq!(glob_to_re(br#"{a,b}"#), br#"(?:a\|b)"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	579 assert_eq!(glob_to_re(br#".\\?"#), br#"\.\\?"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	580 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	581
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	582 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	583 fn test_parse_pattern_file_contents() {
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	584 let lines = b"syntax: glob\n*.elc";
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	585
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	586 assert_eq!(
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	587 parse_pattern_file_contents(lines, Path::new("file_path"), false)
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	588 .unwrap()
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	589 .0,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	590 vec![IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	591 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	592 b"*.elc",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	593 Path::new("file_path")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	594 )],
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	595 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	596
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	597 let lines = b"syntax: include\nsyntax: glob";
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	598
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	599 assert_eq!(
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	600 parse_pattern_file_contents(lines, Path::new("file_path"), false)
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	601 .unwrap()
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	602 .0,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	603 vec![]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	604 );
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	605 let lines = b"glob:**.o";
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	606 assert_eq!(
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	607 parse_pattern_file_contents(lines, Path::new("file_path"), false)
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	608 .unwrap()
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	609 .0,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	610 vec![IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	611 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	612 b"**.o",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	613 Path::new("file_path")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	614 )]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	615 );
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	616 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	617
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	618 #[test]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	619 fn test_build_single_regex() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	620 assert_eq!(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	621 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	622 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	623 b"rust/target/",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	624 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	625 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	626 .unwrap(),
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	627 Some(br"(?:.*/)?rust/target(?:/\|$)".to_vec()),
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	628 );
44893 be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	629 assert_eq!(
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	630 build_single_regex(&IgnorePattern::new(
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	631 PatternSyntax::Regexp,
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	632 br"rust/target/\d+",
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	633 Path::new("")
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	634 ))
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	635 .unwrap(),
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	636 Some(br"rust/target/\d+".to_vec()),
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	637 );
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	638 }
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	639
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	640 #[test]
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	641 fn test_build_single_regex_shortcut() {
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	642 assert_eq!(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	643 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	644 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	645 b"",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	646 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	647 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	648 .unwrap(),
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	649 None,
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	650 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	651 assert_eq!(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	652 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	653 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	654 b"whatever",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	655 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	656 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	657 .unwrap(),
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	658 None,
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	659 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	660 assert_eq!(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	661 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	662 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	663 b"*.o",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	664 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	665 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	666 .unwrap(),
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	667 Some(br"[^/]*\.o(?:/\|$)".to_vec()),
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	668 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	669 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	670 }

Mercurial > public > mercurial-scm > hg-stable

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