mercurial-scm/hg: mercurial/repoview.py annotate

annotate mercurial/repoview.py @ 45892:06b64fabf91c

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

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 02 Nov 2020 11:03:56 +0100
parents	341e014fe0fb
children	89a2afe31e82

rev	line source
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1 # repoview.py - Filtered view of a localrepo object
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2 #
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	3 # Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	4 # Logilab SA <contact@logilab.fr>
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	5 #
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	6 # This software may be used and distributed according to the terms of the
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	7 # GNU General Public License version 2 or any later version.
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	8
25972 f279191124f3 repoview: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25149 diff changeset	9 from __future__ import absolute_import
f279191124f3 repoview: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25149 diff changeset	10
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	11 import copy
35248 c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	12 import weakref
25972 f279191124f3 repoview: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25149 diff changeset	13
43449 c45195f9af0a repoview: move changelog.rev() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43448 diff changeset	14 from .i18n import _
c45195f9af0a repoview: move changelog.rev() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43448 diff changeset	15 from .node import (
c45195f9af0a repoview: move changelog.rev() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43448 diff changeset	16 hex,
c45195f9af0a repoview: move changelog.rev() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43448 diff changeset	17 nullrev,
c45195f9af0a repoview: move changelog.rev() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43448 diff changeset	18 )
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	19 from .pycompat import (
43090 1f339b503a40 py3: manually import pycompat.delattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	20 delattr,
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	21 getattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	22 setattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	23 )
25972 f279191124f3 repoview: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25149 diff changeset	24 from . import (
43447 476754edac1f repoview: move changelog.headrevs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43446 diff changeset	25 error,
25972 f279191124f3 repoview: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25149 diff changeset	26 obsolete,
f279191124f3 repoview: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25149 diff changeset	27 phases,
35249 d4ad9d695a9e repoview: include filter name in repr for debugging Yuya Nishihara <yuya@tcha.org> parents: 35248 diff changeset	28 pycompat,
25972 f279191124f3 repoview: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25149 diff changeset	29 tags as tagsmod,
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	30 util,
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	31 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	32 from .utils import repoviewutil
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	33
18242 e4687edec014 clfilter: introduces a hidden filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18233 diff changeset	34
18293 1f35d6737ed8 repoview: extract hideable revision computation in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18274 diff changeset	35 def hideablerevs(repo):
28780 faff8c2b5ee3 hideablerevs: expand docstring to warn about possible traps Pierre-Yves David <pierre-yves.david@fb.com> parents: 28265 diff changeset	36 """Revision candidates to be hidden
faff8c2b5ee3 hideablerevs: expand docstring to warn about possible traps Pierre-Yves David <pierre-yves.david@fb.com> parents: 28265 diff changeset	37
faff8c2b5ee3 hideablerevs: expand docstring to warn about possible traps Pierre-Yves David <pierre-yves.david@fb.com> parents: 28265 diff changeset	38 This is a standalone function to allow extensions to wrap it.
18293 1f35d6737ed8 repoview: extract hideable revision computation in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18274 diff changeset	39
28780 faff8c2b5ee3 hideablerevs: expand docstring to warn about possible traps Pierre-Yves David <pierre-yves.david@fb.com> parents: 28265 diff changeset	40 Because we use the set of immutable changesets as a fallback subset in
42138 caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42126 diff changeset	41 branchmap (see mercurial.utils.repoviewutils.subsettable), you cannot set
caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42126 diff changeset	42 "public" changesets as "hideable". Doing so would break multiple code
caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42126 diff changeset	43 assertions and lead to crashes."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	44 obsoletes = obsolete.getrevs(repo, b'obsolete')
39297 06c976acc581 phases: add an internal phases Boris Feld <boris.feld@octobus.net> parents: 38851 diff changeset	45 internals = repo._phasecache.getrevset(repo, phases.localhiddenphases)
06c976acc581 phases: add an internal phases Boris Feld <boris.feld@octobus.net> parents: 38851 diff changeset	46 internals = frozenset(internals)
06c976acc581 phases: add an internal phases Boris Feld <boris.feld@octobus.net> parents: 38851 diff changeset	47 return obsoletes \| internals
18293 1f35d6737ed8 repoview: extract hideable revision computation in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18274 diff changeset	48
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	49
32586 47e4c6bb39f1 hidden: rename "revealedrevs" to "pinnedrevs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32585 diff changeset	50 def pinnedrevs(repo):
32585 bceb398e6d72 hidden: drop obsolete comment about cacheability Martin von Zweigbergk <martinvonz@google.com> parents: 32480 diff changeset	51 """revisions blocking hidden changesets from being filtered
32480 43ae9e6eaaba hidden: drop outdated comment about "dynamic" performance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32479 diff changeset	52 """
32426 06aa645e2372 repoview: move '_getdynamicblock' next to 'hideablerevs' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 31444 diff changeset	53
06aa645e2372 repoview: move '_getdynamicblock' next to 'hideablerevs' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 31444 diff changeset	54 cl = repo.changelog
32586 47e4c6bb39f1 hidden: rename "revealedrevs" to "pinnedrevs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32585 diff changeset	55 pinned = set()
47e4c6bb39f1 hidden: rename "revealedrevs" to "pinnedrevs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32585 diff changeset	56 pinned.update([par.rev() for par in repo[None].parents()])
47e4c6bb39f1 hidden: rename "revealedrevs" to "pinnedrevs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32585 diff changeset	57 pinned.update([cl.rev(bm) for bm in repo._bookmarks.values()])
32426 06aa645e2372 repoview: move '_getdynamicblock' next to 'hideablerevs' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 31444 diff changeset	58
06aa645e2372 repoview: move '_getdynamicblock' next to 'hideablerevs' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 31444 diff changeset	59 tags = {}
06aa645e2372 repoview: move '_getdynamicblock' next to 'hideablerevs' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 31444 diff changeset	60 tagsmod.readlocaltags(repo.ui, repo, tags, {})
06aa645e2372 repoview: move '_getdynamicblock' next to 'hideablerevs' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 31444 diff changeset	61 if tags:
43559 90de6bcdf226 index: use `index.get_rev` in `repoview.pinnedrevs` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43510 diff changeset	62 rev = cl.index.get_rev
90de6bcdf226 index: use `index.get_rev` in `repoview.pinnedrevs` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43510 diff changeset	63 pinned.update(rev(t[0]) for t in tags.values())
90de6bcdf226 index: use `index.get_rev` in `repoview.pinnedrevs` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43510 diff changeset	64 pinned.discard(None)
45412 aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	65
aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	66 # Avoid cycle: mercurial.filemerge -> mercurial.templater ->
aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	67 # mercurial.templatefuncs -> mercurial.revset -> mercurial.repoview ->
aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	68 # mercurial.mergestate -> mercurial.filemerge
aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	69 from . import mergestate
aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	70
aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	71 ms = mergestate.mergestate.read(repo)
45761 341e014fe0fb repoview: only pin obsolete wdir parents while there are unresolved conflicts Matt Harbison <matt_harbison@yahoo.com> parents: 45523 diff changeset	72 if ms.active() and ms.unresolvedcount():
45523 5ed6efedc457 repoview: don't crash if mergestate points to non-existent node Martin von Zweigbergk <martinvonz@google.com> parents: 45412 diff changeset	73 for node in (ms.local, ms.other):
5ed6efedc457 repoview: don't crash if mergestate points to non-existent node Martin von Zweigbergk <martinvonz@google.com> parents: 45412 diff changeset	74 rev = cl.index.get_rev(node)
5ed6efedc457 repoview: don't crash if mergestate points to non-existent node Martin von Zweigbergk <martinvonz@google.com> parents: 45412 diff changeset	75 if rev is not None:
5ed6efedc457 repoview: don't crash if mergestate points to non-existent node Martin von Zweigbergk <martinvonz@google.com> parents: 45412 diff changeset	76 pinned.add(rev)
45412 aaeccdb6e654 repoview: pin revisions for `local` and `other` when a merge is active Matt Harbison <matt_harbison@yahoo.com> parents: 45115 diff changeset	77
32586 47e4c6bb39f1 hidden: rename "revealedrevs" to "pinnedrevs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32585 diff changeset	78 return pinned
32426 06aa645e2372 repoview: move '_getdynamicblock' next to 'hideablerevs' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 31444 diff changeset	79
32477 20c1c2fb8106 hidden: simplify the computation of consistency blocker Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32476 diff changeset	80
32588 d964959cbf66 hidden: remove unnecessary 'domain' parameter from _revealancestors() Martin von Zweigbergk <martinvonz@google.com> parents: 32587 diff changeset	81 def _revealancestors(pfunc, hidden, revs):
d964959cbf66 hidden: remove unnecessary 'domain' parameter from _revealancestors() Martin von Zweigbergk <martinvonz@google.com> parents: 32587 diff changeset	82 """reveals contiguous chains of hidden ancestors of 'revs' by removing them
d964959cbf66 hidden: remove unnecessary 'domain' parameter from _revealancestors() Martin von Zweigbergk <martinvonz@google.com> parents: 32587 diff changeset	83 from 'hidden'
32475 1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	84
1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	85 - pfunc(r): a funtion returning parent of 'r',
32587 b9b41d8f4522 hidden: change _domainancestors() to _revealancestors() Martin von Zweigbergk <martinvonz@google.com> parents: 32586 diff changeset	86 - hidden: the (preliminary) hidden revisions, to be updated
32475 1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	87 - revs: iterable of revnum,
1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	88
32591 2af0b9a02bf9 hidden: make _revealancestors() reveal ancestors exclusively Martin von Zweigbergk <martinvonz@google.com> parents: 32590 diff changeset	89 (Ancestors are revealed exclusively, i.e. the elements in 'revs' are
2af0b9a02bf9 hidden: make _revealancestors() reveal ancestors exclusively Martin von Zweigbergk <martinvonz@google.com> parents: 32590 diff changeset	90 not revealed)
32475 1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	91 """
1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	92 stack = list(revs)
1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	93 while stack:
1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	94 for p in pfunc(stack.pop()):
32588 d964959cbf66 hidden: remove unnecessary 'domain' parameter from _revealancestors() Martin von Zweigbergk <martinvonz@google.com> parents: 32587 diff changeset	95 if p != nullrev and p in hidden:
32587 b9b41d8f4522 hidden: change _domainancestors() to _revealancestors() Martin von Zweigbergk <martinvonz@google.com> parents: 32586 diff changeset	96 hidden.remove(p)
32475 1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	97 stack.append(p)
1d70ec85ae00 hidden: add a function returning ancestors of revs within a domain Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32427 diff changeset	98
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	99
35493 3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	100 def computehidden(repo, visibilityexceptions=None):
18242 e4687edec014 clfilter: introduces a hidden filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18233 diff changeset	101 """compute the set of hidden revision to filter
e4687edec014 clfilter: introduces a hidden filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18233 diff changeset	102
e4687edec014 clfilter: introduces a hidden filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18233 diff changeset	103 During most operation hidden should be filtered."""
e4687edec014 clfilter: introduces a hidden filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18233 diff changeset	104 assert not repo.changelog.filteredrevs
22151 c0c369aec643 repoview: cache hidden changesets David Soria Parra <davidsp@fb.com> parents: 22150 diff changeset	105
32479 4c5bc7cbd989 hidden: unify the static and dynamic blocker logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32478 diff changeset	106 hidden = hideablerevs(repo)
4c5bc7cbd989 hidden: unify the static and dynamic blocker logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32478 diff changeset	107 if hidden:
32592 c37ca35b8450 hidden: subtract pinned revs from hidden earlier Martin von Zweigbergk <martinvonz@google.com> parents: 32591 diff changeset	108 hidden = set(hidden - pinnedrevs(repo))
35493 3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	109 if visibilityexceptions:
3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	110 hidden -= visibilityexceptions
32479 4c5bc7cbd989 hidden: unify the static and dynamic blocker logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32478 diff changeset	111 pfunc = repo.changelog.parentrevs
38157 02f992ac26e9 phases: define an official tuple of mutable phases Boris Feld <boris.feld@octobus.net> parents: 38156 diff changeset	112 mutable = repo._phasecache.getrevset(repo, phases.mutablephases)
32479 4c5bc7cbd989 hidden: unify the static and dynamic blocker logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32478 diff changeset	113
32593 e4d0b2efb8b5 hidden: remove unnecessary guard condition Martin von Zweigbergk <martinvonz@google.com> parents: 32592 diff changeset	114 visible = mutable - hidden
e4d0b2efb8b5 hidden: remove unnecessary guard condition Martin von Zweigbergk <martinvonz@google.com> parents: 32592 diff changeset	115 _revealancestors(pfunc, hidden, visible)
32479 4c5bc7cbd989 hidden: unify the static and dynamic blocker logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32478 diff changeset	116 return frozenset(hidden)
18242 e4687edec014 clfilter: introduces a hidden filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18233 diff changeset	117
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	118
42126 ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	119 def computesecret(repo, visibilityexceptions=None):
ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	120 """compute the set of revision that can never be exposed through hgweb
ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	121
ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	122 Changeset in the secret phase (or above) should stay unaccessible."""
ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	123 assert not repo.changelog.filteredrevs
ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	124 secrets = repo._phasecache.getrevset(repo, phases.remotehiddenphases)
ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	125 return frozenset(secrets)
ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	126
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	127
35493 3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	128 def computeunserved(repo, visibilityexceptions=None):
18102 3c7b67b76190 clfilter: introduce a "unserver" filtering mode Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18101 diff changeset	129 """compute the set of revision that should be filtered when used a server
3c7b67b76190 clfilter: introduce a "unserver" filtering mode Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18101 diff changeset	130
3c7b67b76190 clfilter: introduce a "unserver" filtering mode Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18101 diff changeset	131 Secret and hidden changeset should not pretend to be here."""
3c7b67b76190 clfilter: introduce a "unserver" filtering mode Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18101 diff changeset	132 assert not repo.changelog.filteredrevs
3c7b67b76190 clfilter: introduce a "unserver" filtering mode Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18101 diff changeset	133 # fast path in simple case to avoid impact of non optimised code
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	134 hiddens = filterrevs(repo, b'visible')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	135 secrets = filterrevs(repo, b'served.hidden')
42125 bc15e37ecc16 repoview: fix conditional around unserved changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 39297 diff changeset	136 if secrets:
42126 ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42125 diff changeset	137 return frozenset(hiddens \| secrets)
18273 a2d54f68e13c performance: speedup computation of unserved revisions Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18272 diff changeset	138 else:
a2d54f68e13c performance: speedup computation of unserved revisions Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18272 diff changeset	139 return hiddens
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	140
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	141
35493 3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	142 def computemutable(repo, visibilityexceptions=None):
18245 aff706b3a21c clfilter: add mutable filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18242 diff changeset	143 assert not repo.changelog.filteredrevs
aff706b3a21c clfilter: add mutable filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18242 diff changeset	144 # fast check to avoid revset call on huge repo
45114 e2d17974a869 phases: provide a test and accessor for non-public phase roots Joerg Sonnenberger <joerg@bec.de> parents: 43766 diff changeset	145 if repo._phasecache.hasnonpublicphases(repo):
45115 672ad1f6eeb8 repoview: use the phasecache directly to determine mutable revisions Joerg Sonnenberger <joerg@bec.de> parents: 45114 diff changeset	146 return frozenset(repo._phasecache.getrevset(repo, phases.mutablephases))
18245 aff706b3a21c clfilter: add mutable filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18242 diff changeset	147 return frozenset()
aff706b3a21c clfilter: add mutable filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18242 diff changeset	148
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	149
35493 3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	150 def computeimpactable(repo, visibilityexceptions=None):
18246 58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	151 """Everything impactable by mutable revision
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	152
18462 593eb3786165 documentation: update to new filter names Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18445 diff changeset	153 The immutable filter still have some chance to get invalidated. This will
18246 58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	154 happen when:
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	155
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	156 - you garbage collect hidden changeset,
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	157 - public phase is moved backward,
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	158 - something is changed in the filtering (this could be fixed)
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	159
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	160 This filter out any mutable changeset and any public changeset that may be
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	161 impacted by something happening to a mutable revision.
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	162
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	163 This is achieved by filtered everything with a revision number egal or
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	164 higher than the first mutable changeset is filtered."""
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	165 assert not repo.changelog.filteredrevs
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	166 cl = repo.changelog
58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	167 firstmutable = len(cl)
45114 e2d17974a869 phases: provide a test and accessor for non-public phase roots Joerg Sonnenberger <joerg@bec.de> parents: 43766 diff changeset	168 roots = repo._phasecache.nonpublicphaseroots(repo)
e2d17974a869 phases: provide a test and accessor for non-public phase roots Joerg Sonnenberger <joerg@bec.de> parents: 43766 diff changeset	169 if roots:
e2d17974a869 phases: provide a test and accessor for non-public phase roots Joerg Sonnenberger <joerg@bec.de> parents: 43766 diff changeset	170 firstmutable = min(firstmutable, min(cl.rev(r) for r in roots))
18443 64848f7fb764 repoview: protect `base` computation from weird phase root Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18382 diff changeset	171 # protect from nullrev root
64848f7fb764 repoview: protect `base` computation from weird phase root Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18382 diff changeset	172 firstmutable = max(0, firstmutable)
38783 e7aa113b14f7 global: use pycompat.xrange() Gregory Szorc <gregory.szorc@gmail.com> parents: 38158 diff changeset	173 return frozenset(pycompat.xrange(firstmutable, len(cl)))
18246 58ca19edc043 clfilter: add impactable filter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18245 diff changeset	174
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	175
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	176 # function to compute filtered set
20196 59198508b0bd filter: add a comment so that people do not forget to update subsettable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20032 diff changeset	177 #
20549 2025315cfb0c comments: fix minor spelling issues found with spell checker Mads Kiilerich <madski@unity3d.com> parents: 20405 diff changeset	178 # When adding a new filter you MUST update the table at:
42138 caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42126 diff changeset	179 # mercurial.utils.repoviewutil.subsettable
20196 59198508b0bd filter: add a comment so that people do not forget to update subsettable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20032 diff changeset	180 # Otherwise your filter will have to recompute all its branches cache
59198508b0bd filter: add a comment so that people do not forget to update subsettable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20032 diff changeset	181 # from scratch (very slow).
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	182 filtertable = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	183 b'visible': computehidden,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	184 b'visible-hidden': computehidden,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	185 b'served.hidden': computesecret,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	186 b'served': computeunserved,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	187 b'immutable': computemutable,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	188 b'base': computeimpactable,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	189 }
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	190
43766 d4c2221240a6 repoview: add an explicit set of all filter that show the wc parents Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43755 diff changeset	191 # set of filter level that will include the working copy parent no matter what.
d4c2221240a6 repoview: add an explicit set of all filter that show the wc parents Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43755 diff changeset	192 filter_has_wc = {b'visible', b'visible-hidden'}
d4c2221240a6 repoview: add an explicit set of all filter that show the wc parents Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43755 diff changeset	193
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	194 _basefiltername = list(filtertable)
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	195
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	196
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	197 def extrafilter(ui):
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	198 """initialize extra filter and return its id
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	199
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	200 If extra filtering is configured, we make sure the associated filtered view
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	201 are declared and return the associated id.
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	202 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	203 frevs = ui.config(b'experimental', b'extra-filter-revs')
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	204 if frevs is None:
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	205 return None
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	206
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	207 fid = pycompat.sysbytes(util.DIGESTS[b'sha1'](frevs).hexdigest())[:12]
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	208
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	209 combine = lambda fname: fname + b'%' + fid
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	210
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	211 subsettable = repoviewutil.subsettable
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	212
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	213 if combine(b'base') not in filtertable:
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	214 for name in _basefiltername:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	215
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	216 def extrafilteredrevs(repo, args, *kwargs):
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	217 baserevs = filtertable[name](repo, args, *kwargs)
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	218 extrarevs = frozenset(repo.revs(frevs))
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	219 return baserevs \| extrarevs
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	220
42231 d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	221 filtertable[combine(name)] = extrafilteredrevs
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	222 if name in subsettable:
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	223 subsettable[combine(name)] = combine(subsettable[name])
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	224 return fid
d345627d104b repoview: introduce a `experimental.extra-filter-revs` config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42138 diff changeset	225
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	226
35493 3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	227 def filterrevs(repo, filtername, visibilityexceptions=None):
3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	228 """returns set of filtered revision for this filter name
3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	229
3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	230 visibilityexceptions is a set of revs which must are exceptions for
3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	231 hidden-state and must be visible. They are dynamic and hence we should not
3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	232 cache it's result"""
18101 a464deecc9dd clfilter: add a cache on repo for set of revision to filter for a given set. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18100 diff changeset	233 if filtername not in repo.filteredrevcache:
43753 2276a9a1c037 repoview: add a 'devel.debug.repo-filter' option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43559 diff changeset	234 if repo.ui.configbool(b'devel', b'debug.repo-filters'):
43755 d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	235 msg = b'computing revision filter for "%s"'
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	236 msg %= filtername
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	237 if repo.ui.tracebackflag and repo.ui.debugflag:
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	238 # XXX use ui.write_err
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	239 util.debugstacktrace(
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	240 msg,
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	241 f=repo.ui._fout,
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	242 otherf=repo.ui._ferr,
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	243 prefix=b'debug.filters: ',
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	244 )
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	245 else:
d2a7f0aab540 repoview: display stack trace along side the debug message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43753 diff changeset	246 repo.ui.debug(b'debug.filters: %s\n' % msg)
18101 a464deecc9dd clfilter: add a cache on repo for set of revision to filter for a given set. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18100 diff changeset	247 func = filtertable[filtername]
35493 3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	248 if visibilityexceptions:
3c9c05a38d78 repoview: add visibilityexception argument to filterrevs() and related fns Pulkit Goyal <7895pulkit@gmail.com> parents: 35492 diff changeset	249 return func(repo.unfiltered, visibilityexceptions)
18101 a464deecc9dd clfilter: add a cache on repo for set of revision to filter for a given set. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18100 diff changeset	250 repo.filteredrevcache[filtername] = func(repo.unfiltered())
a464deecc9dd clfilter: add a cache on repo for set of revision to filter for a given set. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18100 diff changeset	251 return repo.filteredrevcache[filtername]
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	252
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	253
43441 d630c5710801 repoview: extract a function for wrapping changelog Martin von Zweigbergk <martinvonz@google.com> parents: 43240 diff changeset	254 def wrapchangelog(unfichangelog, filteredrevs):
d630c5710801 repoview: extract a function for wrapping changelog Martin von Zweigbergk <martinvonz@google.com> parents: 43240 diff changeset	255 cl = copy.copy(unfichangelog)
d630c5710801 repoview: extract a function for wrapping changelog Martin von Zweigbergk <martinvonz@google.com> parents: 43240 diff changeset	256 cl.filteredrevs = filteredrevs
43442 625e7d1ffd1c repoview: wrap changelog class when filtering Martin von Zweigbergk <martinvonz@google.com> parents: 43441 diff changeset	257
43510 85628a595c37 repoview: use class literal for creating filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43506 diff changeset	258 class filteredchangelog(filteredchangelogmixin, cl.__class__):
85628a595c37 repoview: use class literal for creating filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43506 diff changeset	259 pass
85628a595c37 repoview: use class literal for creating filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43506 diff changeset	260
85628a595c37 repoview: use class literal for creating filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43506 diff changeset	261 cl.__class__ = filteredchangelog
43442 625e7d1ffd1c repoview: wrap changelog class when filtering Martin von Zweigbergk <martinvonz@google.com> parents: 43441 diff changeset	262
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	263 return cl
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	264
43444 c470e699cd00 repoview: move changelog.__contains__() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43443 diff changeset	265
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	266 class filteredchangelogmixin(object):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	267 def tiprev(self):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	268 """filtered version of revlog.tiprev"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	269 for i in pycompat.xrange(len(self) - 1, -2, -1):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	270 if i not in self.filteredrevs:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	271 return i
43445 c093fb81404f repoview: move changelog.__iter__() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43444 diff changeset	272
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	273 def __contains__(self, rev):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	274 """filtered version of revlog.__contains__"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	275 return 0 <= rev < len(self) and rev not in self.filteredrevs
43445 c093fb81404f repoview: move changelog.__iter__() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43444 diff changeset	276
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	277 def __iter__(self):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	278 """filtered version of revlog.__iter__"""
43445 c093fb81404f repoview: move changelog.__iter__() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43444 diff changeset	279
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	280 def filterediter():
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	281 for i in pycompat.xrange(len(self)):
43446 5ade47284dda repoview: move changelog.revs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43445 diff changeset	282 if i not in self.filteredrevs:
5ade47284dda repoview: move changelog.revs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43445 diff changeset	283 yield i
5ade47284dda repoview: move changelog.revs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43445 diff changeset	284
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	285 return filterediter()
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	286
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	287 def revs(self, start=0, stop=None):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	288 """filtered version of revlog.revs"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	289 for i in super(filteredchangelogmixin, self).revs(start, stop):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	290 if i not in self.filteredrevs:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	291 yield i
43447 476754edac1f repoview: move changelog.headrevs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43446 diff changeset	292
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	293 def _checknofilteredinrevs(self, revs):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	294 """raise the appropriate error if 'revs' contains a filtered revision
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	295
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	296 This returns a version of 'revs' to be used thereafter by the caller.
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	297 In particular, if revs is an iterator, it is converted into a set.
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	298 """
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	299 safehasattr = util.safehasattr
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	300 if safehasattr(revs, '__next__'):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	301 # Note that inspect.isgenerator() is not true for iterators,
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	302 revs = set(revs)
43447 476754edac1f repoview: move changelog.headrevs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43446 diff changeset	303
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	304 filteredrevs = self.filteredrevs
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	305 if safehasattr(revs, 'first'): # smartset
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	306 offenders = revs & filteredrevs
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	307 else:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	308 offenders = filteredrevs.intersection(revs)
43447 476754edac1f repoview: move changelog.headrevs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43446 diff changeset	309
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	310 for rev in offenders:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	311 raise error.FilteredIndexError(rev)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	312 return revs
43447 476754edac1f repoview: move changelog.headrevs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43446 diff changeset	313
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	314 def headrevs(self, revs=None):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	315 if revs is None:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	316 try:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	317 return self.index.headrevsfiltered(self.filteredrevs)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	318 # AttributeError covers non-c-extension environments and
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	319 # old c extensions without filter handling.
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	320 except AttributeError:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	321 return self._headrevs()
43447 476754edac1f repoview: move changelog.headrevs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43446 diff changeset	322
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	323 revs = self._checknofilteredinrevs(revs)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	324 return super(filteredchangelogmixin, self).headrevs(revs)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	325
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	326 def strip(self, args, *kwargs):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	327 # XXX make something better than assert
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	328 # We can't expect proper strip behavior if we are filtered.
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	329 assert not self.filteredrevs
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	330 super(filteredchangelogmixin, self).strip(args, *kwargs)
43448 c31fa28d1843 repoview: move changelog.strip() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43447 diff changeset	331
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	332 def rev(self, node):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	333 """filtered version of revlog.rev"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	334 r = super(filteredchangelogmixin, self).rev(node)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	335 if r in self.filteredrevs:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	336 raise error.FilteredLookupError(
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	337 hex(node), self.indexfile, _(b'filtered node')
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	338 )
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	339 return r
43450 6f3222bbfce0 repoview: move changelog.node() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43449 diff changeset	340
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	341 def node(self, rev):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	342 """filtered version of revlog.node"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	343 if rev in self.filteredrevs:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	344 raise error.FilteredIndexError(rev)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	345 return super(filteredchangelogmixin, self).node(rev)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	346
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	347 def linkrev(self, rev):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	348 """filtered version of revlog.linkrev"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	349 if rev in self.filteredrevs:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	350 raise error.FilteredIndexError(rev)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	351 return super(filteredchangelogmixin, self).linkrev(rev)
43451 983cda0e110c repoview: move changelog.linkrev() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43450 diff changeset	352
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	353 def parentrevs(self, rev):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	354 """filtered version of revlog.parentrevs"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	355 if rev in self.filteredrevs:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	356 raise error.FilteredIndexError(rev)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	357 return super(filteredchangelogmixin, self).parentrevs(rev)
43452 e1dae2ef5588 repoview: move changelog.parentrevs() override to filteredchangelog Martin von Zweigbergk <martinvonz@google.com> parents: 43451 diff changeset	358
43492 bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	359 def flags(self, rev):
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	360 """filtered version of revlog.flags"""
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	361 if rev in self.filteredrevs:
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	362 raise error.FilteredIndexError(rev)
bad4a26b4607 repoview: define filteredchangelog as a top-level (non-local) class Martin von Zweigbergk <martinvonz@google.com> parents: 43454 diff changeset	363 return super(filteredchangelogmixin, self).flags(rev)
43441 d630c5710801 repoview: extract a function for wrapping changelog Martin von Zweigbergk <martinvonz@google.com> parents: 43240 diff changeset	364
d630c5710801 repoview: extract a function for wrapping changelog Martin von Zweigbergk <martinvonz@google.com> parents: 43240 diff changeset	365
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	366 class repoview(object):
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	367 """Provide a read/write view of a repo through a filtered changelog
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	368
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	369 This object is used to access a filtered version of a repository without
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	370 altering the original repository object itself. We can not alter the
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	371 original object for two main reasons:
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	372 - It prevents the use of a repo with multiple filters at the same time. In
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	373 particular when multiple threads are involved.
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	374 - It makes scope of the filtering harder to control.
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	375
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	376 This object behaves very closely to the original repository. All attribute
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	377 operations are done on the original repository:
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	378 - An access to `repoview.someattr` actually returns `repo.someattr`,
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	379 - A write to `repoview.someattr` actually sets value of `repo.someattr`,
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	380 - A deletion of `repoview.someattr` actually drops `someattr`
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	381 from `repo.__dict__`.
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	382
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	383 The only exception is the `changelog` property. It is overridden to return
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	384 a (surface) copy of `repo.changelog` with some revisions filtered. The
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	385 `filtername` attribute of the view control the revisions that need to be
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	386 filtered. (the fact the changelog is copied is an implementation detail).
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	387
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	388 Unlike attributes, this object intercepts all method calls. This means that
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	389 all methods are run on the `repoview` object with the filtered `changelog`
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	390 property. For this purpose the simple `repoview` class must be mixed with
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	391 the actual class of the repository. This ensures that the resulting
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	392 `repoview` object have the very same methods than the repo object. This
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	393 leads to the property below.
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	394
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	395 repoview.method() --> repo.__class__.method(repoview)
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	396
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	397 The inheritance has to be done dynamically because `repo` can be of any
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18495 diff changeset	398 subclasses of `localrepo`. Eg: `bundlerepo` or `statichttprepo`.
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	399 """
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	400
35492 3ad582b2895c repoview: add visibilityexceptions as an optional argument to repo.filtered() Pulkit Goyal <7895pulkit@gmail.com> parents: 35249 diff changeset	401 def __init__(self, repo, filtername, visibilityexceptions=None):
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	402 object.__setattr__(self, '_unfilteredrepo', repo)
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	403 object.__setattr__(self, 'filtername', filtername)
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	404 object.__setattr__(self, '_clcachekey', None)
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	405 object.__setattr__(self, '_clcache', None)
35492 3ad582b2895c repoview: add visibilityexceptions as an optional argument to repo.filtered() Pulkit Goyal <7895pulkit@gmail.com> parents: 35249 diff changeset	406 # revs which are exceptions and must not be hidden
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	407 object.__setattr__(self, '_visibilityexceptions', visibilityexceptions)
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	408
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18495 diff changeset	409 # not a propertycache on purpose we shall implement a proper cache later
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	410 @property
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	411 def changelog(self):
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	412 """return a filtered version of the changeset
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	413
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	414 this changelog must not be used for writing"""
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	415 # some cache may be implemented later
18445 4d92e2d75cff repoview: cache filtered changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18443 diff changeset	416 unfi = self._unfilteredrepo
4d92e2d75cff repoview: cache filtered changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18443 diff changeset	417 unfichangelog = unfi.changelog
27258 beda2c9dbbff repoview: bypass changelog method to computed cache key Pierre-Yves David <pierre-yves.david@fb.com> parents: 27257 diff changeset	418 # bypass call to changelog.method
beda2c9dbbff repoview: bypass changelog method to computed cache key Pierre-Yves David <pierre-yves.david@fb.com> parents: 27257 diff changeset	419 unfiindex = unfichangelog.index
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38783 diff changeset	420 unfilen = len(unfiindex)
27258 beda2c9dbbff repoview: bypass changelog method to computed cache key Pierre-Yves David <pierre-yves.david@fb.com> parents: 27257 diff changeset	421 unfinode = unfiindex[unfilen - 1][7]
43240 4353942be294 tracing: add a couple of trace points on obsolete and repoview Augie Fackler <augie@google.com> parents: 43090 diff changeset	422 with util.timedcm('repo filter for %s', self.filtername):
4353942be294 tracing: add a couple of trace points on obsolete and repoview Augie Fackler <augie@google.com> parents: 43090 diff changeset	423 revs = filterrevs(unfi, self.filtername, self._visibilityexceptions)
18445 4d92e2d75cff repoview: cache filtered changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18443 diff changeset	424 cl = self._clcache
27258 beda2c9dbbff repoview: bypass changelog method to computed cache key Pierre-Yves David <pierre-yves.david@fb.com> parents: 27257 diff changeset	425 newkey = (unfilen, unfinode, hash(revs), unfichangelog._delayed)
28265 332926212ef8 repoview: discard filtered changelog if index isn't shared with unfiltered FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27917 diff changeset	426 # if cl.index is not unfiindex, unfi.changelog would be
332926212ef8 repoview: discard filtered changelog if index isn't shared with unfiltered FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27917 diff changeset	427 # recreated, and our clcache refers to garbage object
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	428 if cl is not None and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	429 cl.index is not unfiindex or newkey != self._clcachekey
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	430 ):
27258 beda2c9dbbff repoview: bypass changelog method to computed cache key Pierre-Yves David <pierre-yves.david@fb.com> parents: 27257 diff changeset	431 cl = None
18445 4d92e2d75cff repoview: cache filtered changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18443 diff changeset	432 # could have been made None by the previous if
4d92e2d75cff repoview: cache filtered changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18443 diff changeset	433 if cl is None:
43454 c8e5b3094a1d repoview: avoid wrapping changelog if there's nothing to filter Martin von Zweigbergk <martinvonz@google.com> parents: 43453 diff changeset	434 # Only filter if there's something to filter
c8e5b3094a1d repoview: avoid wrapping changelog if there's nothing to filter Martin von Zweigbergk <martinvonz@google.com> parents: 43453 diff changeset	435 cl = wrapchangelog(unfichangelog, revs) if revs else unfichangelog
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	436 object.__setattr__(self, '_clcache', cl)
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	437 object.__setattr__(self, '_clcachekey', newkey)
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	438 return cl
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	439
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	440 def unfiltered(self):
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	441 """Return an unfiltered version of a repo"""
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	442 return self._unfilteredrepo
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	443
35492 3ad582b2895c repoview: add visibilityexceptions as an optional argument to repo.filtered() Pulkit Goyal <7895pulkit@gmail.com> parents: 35249 diff changeset	444 def filtered(self, name, visibilityexceptions=None):
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	445 """Return a filtered version of a repository"""
35492 3ad582b2895c repoview: add visibilityexceptions as an optional argument to repo.filtered() Pulkit Goyal <7895pulkit@gmail.com> parents: 35249 diff changeset	446 if name == self.filtername and not visibilityexceptions:
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	447 return self
35492 3ad582b2895c repoview: add visibilityexceptions as an optional argument to repo.filtered() Pulkit Goyal <7895pulkit@gmail.com> parents: 35249 diff changeset	448 return self.unfiltered().filtered(name, visibilityexceptions)
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	449
35249 d4ad9d695a9e repoview: include filter name in repr for debugging Yuya Nishihara <yuya@tcha.org> parents: 35248 diff changeset	450 def __repr__(self):
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43492 diff changeset	451 return '<%s:%s %r>' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	452 self.__class__.__name__,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	453 pycompat.sysstr(self.filtername),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	454 self.unfiltered(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	455 )
35249 d4ad9d695a9e repoview: include filter name in repr for debugging Yuya Nishihara <yuya@tcha.org> parents: 35248 diff changeset	456
18100 3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	457 # everything access are forwarded to the proxied repo
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	458 def __getattr__(self, attr):
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	459 return getattr(self._unfilteredrepo, attr)
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	460
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	461 def __setattr__(self, attr, value):
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	462 return setattr(self._unfilteredrepo, attr, value)
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	463
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	464 def __delattr__(self, attr):
3a6ddacb7198 clfilter: add actual repo filtering mechanism Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	465 return delattr(self._unfilteredrepo, attr)
35248 c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	466
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	467
35248 c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	468 # Python <3.4 easily leaks types via __mro__. See
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	469 # https://bugs.python.org/issue17950. We cache dynamically created types
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	470 # so they won't be leaked on every invocation of repo.filtered().
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	471 _filteredrepotypes = weakref.WeakKeyDictionary()
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	472
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	473
35248 c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	474 def newtype(base):
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	475 """Create a new type with the repoview mixin and the given base class"""
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	476 if base not in _filteredrepotypes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	477
35248 c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	478 class filteredrepo(repoview, base):
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	479 pass
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42231 diff changeset	480
35248 c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	481 _filteredrepotypes[base] = filteredrepo
c752fbe228fb repoview: extract a factory function of proxy class Yuya Nishihara <yuya@tcha.org> parents: 34649 diff changeset	482 return _filteredrepotypes[base]

Mercurial > public > mercurial-scm > hg

annotate mercurial/repoview.py @ 45892:06b64fabf91c