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

annotate mercurial/server.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	eef9a2d67051
children	d4ba4d51f85f

rev	line source
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	1 # server.py - utility and factory of server
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	2 #
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	4 #
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	7
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	8 from __future__ import absolute_import
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	9
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	10 import os
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	11
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	12 from .i18n import _
43085 eef9a2d67051 py3: manually import pycompat.open into files that need it Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	13 from .pycompat import open
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	14
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	15 from . import (
30513 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30510 diff changeset	16 chgserver,
32005 2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	17 cmdutil,
30507 dd539e2d89aa server: move service table and factory from commandserver Yuya Nishihara <yuya@tcha.org> parents: 30506 diff changeset	18 commandserver,
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	19 error,
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	20 hgweb,
32530 3f0936b2cea9 server: use pycompat to get argv Augie Fackler <raf@durin42.com> parents: 32291 diff changeset	21 pycompat,
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	22 util,
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	23 )
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	24
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	25 from .utils import procutil
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	26
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 34924 diff changeset	27
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	28 def runservice(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	29 opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	30 parentfn=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	31 initfn=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	32 runfn=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	33 logfile=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	34 runargs=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	35 appendpid=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	36 ):
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	37 '''Run a command as a service.'''
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	38
37215 73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	39 postexecargs = {}
73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	40
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	41 if opts[b'daemon_postexec']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	42 for inst in opts[b'daemon_postexec']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	43 if inst.startswith(b'unlink:'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	44 postexecargs[b'unlink'] = inst[7:]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	45 elif inst.startswith(b'chdir:'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	46 postexecargs[b'chdir'] = inst[6:]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	47 elif inst != b'none':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	48 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	49 _(b'invalid value for --daemon-postexec: %s') % inst
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	50 )
37215 73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	51
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	52 # When daemonized on Windows, redirect stdout/stderr to the lockfile (which
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	53 # gets cleaned up after the child is up and running), so that the parent can
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	54 # read and print the error if this child dies early. See 594dd384803c. On
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	55 # other platforms, the child can write to the parent's stdio directly, until
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	56 # it is redirected prior to runfn().
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	57 if pycompat.iswindows and opts[b'daemon_postexec']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	58 if b'unlink' in postexecargs and os.path.exists(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	59 postexecargs[b'unlink']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	60 ):
37215 73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	61 procutil.stdout.flush()
73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	62 procutil.stderr.flush()
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	63
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	64 fd = os.open(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	65 postexecargs[b'unlink'], os.O_WRONLY \| os.O_APPEND \| os.O_BINARY
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	66 )
37215 73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	67 try:
37216 d2bd29dffc6c server: minor code cleanup Matt Harbison <matt_harbison@yahoo.com> parents: 37215 diff changeset	68 os.dup2(fd, procutil.stdout.fileno())
d2bd29dffc6c server: minor code cleanup Matt Harbison <matt_harbison@yahoo.com> parents: 37215 diff changeset	69 os.dup2(fd, procutil.stderr.fileno())
37215 73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	70 finally:
73a60281a861 server: refactor 'daemon_postexec' instructions into a dictionary Matt Harbison <matt_harbison@yahoo.com> parents: 37212 diff changeset	71 os.close(fd)
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	72
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	73 def writepid(pid):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	74 if opts[b'pid_file']:
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	75 if appendpid:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	76 mode = b'ab'
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	77 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	78 mode = b'wb'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	79 fp = open(opts[b'pid_file'], mode)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	80 fp.write(b'%d\n' % pid)
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	81 fp.close()
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	82
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	83 if opts[b'daemon'] and not opts[b'daemon_postexec']:
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	84 # Signal child process startup with file removal
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	85 lockfd, lockpath = pycompat.mkstemp(prefix=b'hg-service-')
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	86 os.close(lockfd)
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	87 try:
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	88 if not runargs:
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	89 runargs = procutil.hgcmd() + pycompat.sysargv[1:]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	90 runargs.append(b'--daemon-postexec=unlink:%s' % lockpath)
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	91 # Don't pass --cwd to the child process, because we've already
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	92 # changed directory.
38783 e7aa113b14f7 global: use pycompat.xrange() Gregory Szorc <gregory.szorc@gmail.com> parents: 38164 diff changeset	93 for i in pycompat.xrange(1, len(runargs)):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	94 if runargs[i].startswith(b'--cwd='):
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	95 del runargs[i]
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	96 break
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	97 elif runargs[i].startswith(b'--cwd'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	98 del runargs[i : i + 2]
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	99 break
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	100
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	101 def condfn():
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	102 return not os.path.exists(lockpath)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	103
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	104 pid = procutil.rundetached(runargs, condfn)
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	105 if pid < 0:
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	106 # If the daemonized process managed to write out an error msg,
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	107 # report it.
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	108 if pycompat.iswindows and os.path.exists(lockpath):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	109 with open(lockpath, b'rb') as log:
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	110 for line in log:
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	111 procutil.stderr.write(line)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	112 raise error.Abort(_(b'child process failed to start'))
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	113 writepid(pid)
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	114 finally:
31548 ce4ddcda868b server: use tryunlink Ryan McElroy <rmcelroy@fb.com> parents: 30513 diff changeset	115 util.tryunlink(lockpath)
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	116 if parentfn:
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	117 return parentfn(pid)
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	118 else:
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	119 return
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	120
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	121 if initfn:
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	122 initfn()
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	123
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	124 if not opts[b'daemon']:
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	125 writepid(procutil.getpid())
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	126
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	127 if opts[b'daemon_postexec']:
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	128 try:
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	129 os.setsid()
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	130 except AttributeError:
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	131 pass
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	132
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	133 if b'chdir' in postexecargs:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	134 os.chdir(postexecargs[b'chdir'])
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	135 procutil.hidewindow()
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 34924 diff changeset	136 procutil.stdout.flush()
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 34924 diff changeset	137 procutil.stderr.flush()
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	138
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	139 nullfd = os.open(os.devnull, os.O_RDWR)
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	140 logfilefd = nullfd
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	141 if logfile:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	142 logfilefd = os.open(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	143 logfile, os.O_RDWR \| os.O_CREAT \| os.O_APPEND, 0o666
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	144 )
37216 d2bd29dffc6c server: minor code cleanup Matt Harbison <matt_harbison@yahoo.com> parents: 37215 diff changeset	145 os.dup2(nullfd, procutil.stdin.fileno())
d2bd29dffc6c server: minor code cleanup Matt Harbison <matt_harbison@yahoo.com> parents: 37215 diff changeset	146 os.dup2(logfilefd, procutil.stdout.fileno())
d2bd29dffc6c server: minor code cleanup Matt Harbison <matt_harbison@yahoo.com> parents: 37215 diff changeset	147 os.dup2(logfilefd, procutil.stderr.fileno())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	148 stdio = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	149 procutil.stdin.fileno(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	150 procutil.stdout.fileno(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	151 procutil.stderr.fileno(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	152 )
37216 d2bd29dffc6c server: minor code cleanup Matt Harbison <matt_harbison@yahoo.com> parents: 37215 diff changeset	153 if nullfd not in stdio:
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	154 os.close(nullfd)
37216 d2bd29dffc6c server: minor code cleanup Matt Harbison <matt_harbison@yahoo.com> parents: 37215 diff changeset	155 if logfile and logfilefd not in stdio:
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	156 os.close(logfilefd)
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	157
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	158 # Only unlink after redirecting stdout/stderr, so Windows doesn't
f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	159 # complain about a sharing violation.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	160 if b'unlink' in postexecargs:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	161 os.unlink(postexecargs[b'unlink'])
37212 f09a2eab11cf server: add an error feedback mechanism for when the daemon fails to launch Matt Harbison <matt_harbison@yahoo.com> parents: 37120 diff changeset	162
30506 d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	163 if runfn:
d9d8d78e6bc9 server: move cmdutil.service() to new module (API) Yuya Nishihara <yuya@tcha.org> parents: diff changeset	164 return runfn()
30507 dd539e2d89aa server: move service table and factory from commandserver Yuya Nishihara <yuya@tcha.org> parents: 30506 diff changeset	165
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	166
30507 dd539e2d89aa server: move service table and factory from commandserver Yuya Nishihara <yuya@tcha.org> parents: 30506 diff changeset	167 _cmdservicemap = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	168 b'chgunix': chgserver.chgunixservice,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	169 b'pipe': commandserver.pipeservice,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	170 b'unix': commandserver.unixforkingservice,
30507 dd539e2d89aa server: move service table and factory from commandserver Yuya Nishihara <yuya@tcha.org> parents: 30506 diff changeset	171 }
dd539e2d89aa server: move service table and factory from commandserver Yuya Nishihara <yuya@tcha.org> parents: 30506 diff changeset	172
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	173
30510 a0878bc87379 server: add public function to select either cmdserver or hgweb Yuya Nishihara <yuya@tcha.org> parents: 30509 diff changeset	174 def _createcmdservice(ui, repo, opts):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	175 mode = opts[b'cmdserver']
30507 dd539e2d89aa server: move service table and factory from commandserver Yuya Nishihara <yuya@tcha.org> parents: 30506 diff changeset	176 try:
40823 368ecbf734af commandserver: enable logging when server process started Yuya Nishihara <yuya@tcha.org> parents: 38783 diff changeset	177 servicefn = _cmdservicemap[mode]
30507 dd539e2d89aa server: move service table and factory from commandserver Yuya Nishihara <yuya@tcha.org> parents: 30506 diff changeset	178 except KeyError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	179 raise error.Abort(_(b'unknown mode %s') % mode)
40824 82210d88d814 commandserver: install logger to record server events through canonical API Yuya Nishihara <yuya@tcha.org> parents: 40823 diff changeset	180 commandserver.setuplogging(ui, repo)
40823 368ecbf734af commandserver: enable logging when server process started Yuya Nishihara <yuya@tcha.org> parents: 38783 diff changeset	181 return servicefn(ui, repo, opts)
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	182
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	183
30510 a0878bc87379 server: add public function to select either cmdserver or hgweb Yuya Nishihara <yuya@tcha.org> parents: 30509 diff changeset	184 def _createhgwebservice(ui, repo, opts):
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	185 # this way we can check if something was given in the command-line
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	186 if opts.get(b'port'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	187 opts[b'port'] = util.getport(opts.get(b'port'))
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	188
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32005 diff changeset	189 alluis = {ui}
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	190 if repo:
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	191 baseui = repo.baseui
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	192 alluis.update([repo.baseui, repo.ui])
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	193 else:
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	194 baseui = ui
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	195 webconf = opts.get(b'web_conf') or opts.get(b'webdir_conf')
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	196 if webconf:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	197 if opts.get(b'subrepos'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	198 raise error.Abort(_(b'--web-conf cannot be used with --subrepos'))
32005 2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	199
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	200 # load server settings (e.g. web.port) to "copied" ui, which allows
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	201 # hgwebdir to reload webconf cleanly
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	202 servui = ui.copy()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	203 servui.readconfig(webconf, sections=[b'web'])
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	204 alluis.add(servui)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	205 elif opts.get(b'subrepos'):
32005 2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	206 servui = ui
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	207
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	208 # If repo is None, hgweb.createapp() already raises a proper abort
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	209 # message as long as webconf is None.
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	210 if repo:
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31548 diff changeset	211 webconf = dict()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	212 cmdutil.addwebdirpath(repo, b"", webconf)
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	213 else:
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	214 servui = ui
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	215
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	216 optlist = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	217 b"name templates style address port prefix ipv6"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	218 b" accesslog errorlog certificate encoding"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	219 )
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	220 for o in optlist.split():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	221 val = opts.get(o, b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 if val in (None, b''): # should check against default options instead
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	223 continue
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	224 for u in alluis:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	225 u.setconfig(b"web", o, val, b'serve')
30509 add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	226
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	227 app = hgweb.createapp(baseui, repo, webconf)
add7bcad1d9c server: move service factory from hgweb Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	228 return hgweb.httpservice(servui, app, opts)
30510 a0878bc87379 server: add public function to select either cmdserver or hgweb Yuya Nishihara <yuya@tcha.org> parents: 30509 diff changeset	229
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 40824 diff changeset	230
30510 a0878bc87379 server: add public function to select either cmdserver or hgweb Yuya Nishihara <yuya@tcha.org> parents: 30509 diff changeset	231 def createservice(ui, repo, opts):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	232 if opts[b"cmdserver"]:
30510 a0878bc87379 server: add public function to select either cmdserver or hgweb Yuya Nishihara <yuya@tcha.org> parents: 30509 diff changeset	233 return _createcmdservice(ui, repo, opts)
a0878bc87379 server: add public function to select either cmdserver or hgweb Yuya Nishihara <yuya@tcha.org> parents: 30509 diff changeset	234 else:
a0878bc87379 server: add public function to select either cmdserver or hgweb Yuya Nishihara <yuya@tcha.org> parents: 30509 diff changeset	235 return _createhgwebservice(ui, repo, opts)

Mercurial > public > mercurial-scm > hg

annotate mercurial/server.py @ 45892:06b64fabf91c