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

annotate mercurial/dispatch.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	7eb221b9af6c
children	ca39c45014fa

rev	line source
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # dispatch.py - command dispatching for mercurial
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8206 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9993 diff changeset	6 # GNU General Public License version 2 or any later version.
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	7
27615 4030d3b79953 dispatch: use print function Gregory Szorc <gregory.szorc@gmail.com> parents: 27516 diff changeset	8 from __future__ import absolute_import, print_function
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	9
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	10 import errno
30576 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30559 diff changeset	11 import getopt
44653 02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	12 import io
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	13 import os
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	14 import pdb
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	15 import re
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	16 import signal
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	17 import sys
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	18 import traceback
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	19
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	20
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	21 from .i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43080 diff changeset	22 from .pycompat import getattr
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	23
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	24 from hgdemandimport import tracing
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	25
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	26 from . import (
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	27 cmdutil,
30653 b2be4ccaff1d color: load 'colortable' from extension using an 'extraloader' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30586 diff changeset	28 color,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	29 commands,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	30 demandimport,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	31 encoding,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	32 error,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	33 extensions,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	34 fancyopts,
31060 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31027 diff changeset	35 help,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	36 hg,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	37 hook,
45782 fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	38 localrepo,
29781 2654a0aac80d profiling: move profiling code from dispatch.py (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 29761 diff changeset	39 profiling,
30468 7f2b18c34c02 py3: use pycompat.sysargv in dispatch.run() Pulkit Goyal <7895pulkit@gmail.com> parents: 30401 diff changeset	40 pycompat,
44244 ef11dfc56674 config: also respect HGRCSKIPREPO in `dispatch._getlocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44017 diff changeset	41 rcutil,
40414 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	42 registrar,
45782 fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	43 requirements as requirementsmod,
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	44 scmutil,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	45 ui as uimod,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	46 util,
45782 fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	47 vfs,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	48 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	49
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36729 diff changeset	50 from .utils import (
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	51 procutil,
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36729 diff changeset	52 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36729 diff changeset	53 )
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36729 diff changeset	54
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	55
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	56 class request(object):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	57 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	58 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	59 args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	60 ui=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	61 repo=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	62 fin=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	63 fout=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	64 ferr=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	65 fmsg=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	66 prereposetups=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	67 ):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	68 self.args = args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	69 self.ui = ui
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	70 self.repo = repo
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	71
14613 ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	72 # input/output/error streams
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	73 self.fin = fin
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	74 self.fout = fout
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	75 self.ferr = ferr
40587 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40414 diff changeset	76 # separate stream for status/error messages
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40414 diff changeset	77 self.fmsg = fmsg
14613 ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	78
35224 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35223 diff changeset	79 # remember options pre-parsed by _earlyparseopts()
35030 d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 35029 diff changeset	80 self.earlyoptions = {}
d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 35029 diff changeset	81
32379 71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32377 diff changeset	82 # reposetups which run before extensions, useful for chg to pre-fill
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32377 diff changeset	83 # low-level repo state (for example, changelog) before extensions.
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32377 diff changeset	84 self.prereposetups = prereposetups or []
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32377 diff changeset	85
40402 106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39818 diff changeset	86 # store the parsed and canonical command
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39818 diff changeset	87 self.canonical_command = None
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39818 diff changeset	88
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	89 def _runexithandlers(self):
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	90 exc = None
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	91 handlers = self.ui._exithandlers
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	92 try:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	93 while handlers:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	94 func, args, kwargs = handlers.pop()
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	95 try:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	96 func(args, *kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	97 except: # re-raises below
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	98 if exc is None:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	99 exc = sys.exc_info()[1]
43080 86e4daa2d54c cleanup: mark some ui.(status\|note\|warn\|write) calls as not needing i18n Augie Fackler <augie@google.com> parents: 43077 diff changeset	100 self.ui.warnnoi18n(b'error in exit handlers:\n')
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	101 self.ui.traceback(force=True)
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	102 finally:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	103 if exc is not None:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	104 raise exc
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31629 diff changeset	105
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	106
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	107 def run():
43787 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43706 diff changeset	108 """run the command in sys.argv"""
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	109 try:
45101 9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	110 initstdio()
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	111 with tracing.log('parse args into request'):
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	112 req = request(pycompat.sysargv[1:])
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	113 err = None
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	114 try:
45101 9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	115 status = dispatch(req)
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	116 except error.StdioError as e:
34532 b09b3eaf9c96 py3: work around the scope of exception variable in dispatch.run() Yuya Nishihara <yuya@tcha.org> parents: 34486 diff changeset	117 err = e
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	118 status = -1
37994 e9c588802529 dispatch: minor code refactor Gregory Szorc <gregory.szorc@gmail.com> parents: 37944 diff changeset	119
45101 9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	120 # In all cases we try to flush stdio streams.
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	121 if util.safehasattr(req.ui, b'fout'):
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	122 assert req.ui is not None # help pytype
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	123 assert req.ui.fout is not None # help pytype
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	124 try:
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	125 req.ui.fout.flush()
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	126 except IOError as e:
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	127 err = e
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	128 status = -1
36637 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	129
45101 9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	130 if util.safehasattr(req.ui, b'ferr'):
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	131 assert req.ui is not None # help pytype
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	132 assert req.ui.ferr is not None # help pytype
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	133 try:
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	134 if err is not None and err.errno != errno.EPIPE:
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	135 req.ui.ferr.write(
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	136 b'abort: %s\n' % encoding.strtolocal(err.strerror)
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	137 )
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	138 req.ui.ferr.flush()
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	139 # There's not much we can do about an I/O error here. So (possibly)
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	140 # change the status code and move on.
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	141 except IOError:
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	142 status = -1
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	143
9e6b86a8f438 dispatch: indent run() function Yuya Nishihara <yuya@tcha.org> parents: 44653 diff changeset	144 _silencestdio()
45102 efcc87d37f4d dispatch: handle late KeyboardInterrupt occurred in run() Yuya Nishihara <yuya@tcha.org> parents: 45101 diff changeset	145 except KeyboardInterrupt:
efcc87d37f4d dispatch: handle late KeyboardInterrupt occurred in run() Yuya Nishihara <yuya@tcha.org> parents: 45101 diff changeset	146 # Catch early/late KeyboardInterrupt as last ditch. Here nothing will
efcc87d37f4d dispatch: handle late KeyboardInterrupt occurred in run() Yuya Nishihara <yuya@tcha.org> parents: 45101 diff changeset	147 # be printed to console to avoid another IOError/KeyboardInterrupt.
efcc87d37f4d dispatch: handle late KeyboardInterrupt occurred in run() Yuya Nishihara <yuya@tcha.org> parents: 45101 diff changeset	148 status = -1
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	149 sys.exit(status & 255)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	150
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	151
36636 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36503 diff changeset	152 if pycompat.ispy3:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	153
37944 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	154 def initstdio():
44653 02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	155 # stdio streams on Python 3 are io.TextIOWrapper instances proxying another
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	156 # buffer. These streams will normalize \n to \r\n by default. Mercurial's
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	157 # preferred mechanism for writing output (ui.write()) uses io.BufferedWriter
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	158 # instances, which write to the underlying stdio file descriptor in binary
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	159 # mode. ui.write() uses \n for line endings and no line ending normalization
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	160 # is attempted through this interface. This "just works," even if the system
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	161 # preferred line ending is not \n.
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	162 #
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	163 # But some parts of Mercurial (e.g. hooks) can still send data to sys.stdout
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	164 # and sys.stderr. They will inherit the line ending normalization settings,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	165 # potentially causing e.g. \r\n to be emitted. Since emitting \n should
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	166 # "just work," here we change the sys.* streams to disable line ending
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	167 # normalization, ensuring compatibility with our ui type.
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	168
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	169 # write_through is new in Python 3.7.
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	170 kwargs = {
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	171 "newline": "\n",
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	172 "line_buffering": sys.stdout.line_buffering,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	173 }
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	174 if util.safehasattr(sys.stdout, "write_through"):
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	175 kwargs["write_through"] = sys.stdout.write_through
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	176 sys.stdout = io.TextIOWrapper(
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	177 sys.stdout.buffer, sys.stdout.encoding, sys.stdout.errors, **kwargs
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	178 )
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	179
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	180 kwargs = {
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	181 "newline": "\n",
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	182 "line_buffering": sys.stderr.line_buffering,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	183 }
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	184 if util.safehasattr(sys.stderr, "write_through"):
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	185 kwargs["write_through"] = sys.stderr.write_through
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	186 sys.stderr = io.TextIOWrapper(
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	187 sys.stderr.buffer, sys.stderr.encoding, sys.stderr.errors, **kwargs
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	188 )
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	189
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	190 # No write_through on read-only stream.
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	191 sys.stdin = io.TextIOWrapper(
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	192 sys.stdin.buffer,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	193 sys.stdin.encoding,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	194 sys.stdin.errors,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	195 # None is universal newlines mode.
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	196 newline=None,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	197 line_buffering=sys.stdin.line_buffering,
02fa5392bab6 dispatch: force \n for newlines on sys.std* streams (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	198 )
36637 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	199
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	200 def _silencestdio():
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	201 for fp in (sys.stdout, sys.stderr):
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	202 # Check if the file is okay
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	203 try:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	204 fp.flush()
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	205 continue
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	206 except IOError:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	207 pass
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	208 # Otherwise mark it as closed to silence "Exception ignored in"
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	209 # message emitted by the interpreter finalizer. Be careful to
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	210 # not close procutil.stdout, which may be a fdopen-ed file object
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	211 # and its close() actually closes the underlying file descriptor.
36637 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	212 try:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	213 fp.close()
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	214 except IOError:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	215 pass
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	216
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	217
36636 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36503 diff changeset	218 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	219
37944 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	220 def initstdio():
36636 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36503 diff changeset	221 for fp in (sys.stdin, sys.stdout, sys.stderr):
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	222 procutil.setbinary(fp)
34533 163fa0aea71e dispatch: move initialization of sys.std* files Yuya Nishihara <yuya@tcha.org> parents: 34532 diff changeset	223
36637 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	224 def _silencestdio():
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	225 pass
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36636 diff changeset	226
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	227
31492 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31491 diff changeset	228 def _formatargs(args):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	229 return b' '.join(procutil.shellquote(a) for a in args)
31492 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31491 diff changeset	230
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	231
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	232 def dispatch(req):
37995 6f9ac3cb0987 dispatch: unify handling of None returned by a command function Yuya Nishihara <yuya@tcha.org> parents: 37994 diff changeset	233 """run the command specified in req.args; returns an integer status code"""
43238 101ae8bbfa02 cleanup: hgdemandimport.tracing accepts strings, not bytes Augie Fackler <augie@google.com> parents: 43117 diff changeset	234 with tracing.log('dispatch.dispatch'):
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	235 if req.ferr:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	236 ferr = req.ferr
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	237 elif req.ui:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	238 ferr = req.ui.ferr
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	239 else:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	240 ferr = procutil.stderr
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	241
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	242 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	243 if not req.ui:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	244 req.ui = uimod.ui.load()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	245 req.earlyoptions.update(_earlyparseopts(req.ui, req.args))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	246 if req.earlyoptions[b'traceback']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	247 req.ui.setconfig(b'ui', b'traceback', b'on', b'--traceback')
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	248
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	249 # set ui streams from the request
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	250 if req.fin:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	251 req.ui.fin = req.fin
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	252 if req.fout:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	253 req.ui.fout = req.fout
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	254 if req.ferr:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	255 req.ui.ferr = req.ferr
40587 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40414 diff changeset	256 if req.fmsg:
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40414 diff changeset	257 req.ui.fmsg = req.fmsg
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	258 except error.Abort as inst:
45885 600aec73f309 errors: format "abort: " text in a new Abort.format() method Martin von Zweigbergk <martinvonz@google.com> parents: 45884 diff changeset	259 ferr.write(inst.format())
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	260 return -1
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	261
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	262 msg = _formatargs(req.args)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	263 starttime = util.timer()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	264 ret = 1 # default of Python exit code on unhandled exception
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	265 try:
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	266 ret = _runcatch(req) or 0
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	267 except error.ProgrammingError as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	268 req.ui.error(_(b'** ProgrammingError: %s\n') % inst)
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	269 if inst.hint:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	270 req.ui.error(_(b'** (%s)\n') % inst.hint)
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	271 raise
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	272 except KeyboardInterrupt as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	273 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	274 if isinstance(inst, error.SignalInterrupt):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	275 msg = _(b"killed!\n")
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	276 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	277 msg = _(b"interrupted!\n")
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	278 req.ui.error(msg)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	279 except error.SignalInterrupt:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	280 # maybe pager would quit without consuming all the output, and
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	281 # SIGPIPE was raised. we cannot print anything in this case.
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	282 pass
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	283 except IOError as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	284 if inst.errno != errno.EPIPE:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	285 raise
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	286 ret = -1
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	287 finally:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	288 duration = util.timer() - starttime
45253 9b5723784aac dispatch: adjust ui.flush() timing to stabilize test-blackbox.t Yuya Nishihara <yuya@tcha.org> parents: 45102 diff changeset	289 req.ui.flush() # record blocked times
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	290 if req.ui.logblockedtimes:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	291 req.ui._blockedtimes[b'command_duration'] = duration * 1000
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	292 req.ui.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	293 b'uiblocked',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	294 b'ui blocked ms\n',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	295 **pycompat.strkwargs(req.ui._blockedtimes)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	296 )
40651 1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	297 return_code = ret & 255
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	298 req.ui.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	299 b"commandfinish",
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	300 b"%s exited %d after %0.2f seconds\n",
40651 1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	301 msg,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	302 return_code,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	303 duration,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	304 return_code=return_code,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	305 duration=duration,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	306 canonical_command=req.canonical_command,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40587 diff changeset	307 )
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	308 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	309 req._runexithandlers()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	310 except: # exiting, so no re-raises
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	311 ret = ret or -1
45253 9b5723784aac dispatch: adjust ui.flush() timing to stabilize test-blackbox.t Yuya Nishihara <yuya@tcha.org> parents: 45102 diff changeset	312 # do flush again since ui.log() and exit handlers may write to ui
9b5723784aac dispatch: adjust ui.flush() timing to stabilize test-blackbox.t Yuya Nishihara <yuya@tcha.org> parents: 45102 diff changeset	313 req.ui.flush()
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	314 return ret
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	315
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	316
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	317 def _runcatch(req):
43238 101ae8bbfa02 cleanup: hgdemandimport.tracing accepts strings, not bytes Augie Fackler <augie@google.com> parents: 43117 diff changeset	318 with tracing.log('dispatch._runcatch'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	319
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	320 def catchterm(*args):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	321 raise error.SignalInterrupt
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	322
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	323 ui = req.ui
32050 77eaf9539499 dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Augie Fackler <augie@google.com> parents: 30678 diff changeset	324 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	325 for name in b'SIGBREAK', b'SIGHUP', b'SIGTERM':
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	326 num = getattr(signal, name, None)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	327 if num:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	328 signal.signal(num, catchterm)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	329 except ValueError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	330 pass # happens if called in a thread
32050 77eaf9539499 dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Augie Fackler <augie@google.com> parents: 30678 diff changeset	331
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	332 def _runcatchfunc():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	333 realcmd = None
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	334 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	335 cmdargs = fancyopts.fancyopts(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	336 req.args[:], commands.globalopts, {}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	337 )
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	338 cmd = cmdargs[0]
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	339 aliases, entry = cmdutil.findcmd(cmd, commands.table, False)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	340 realcmd = aliases[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	341 except (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	342 error.UnknownCommand,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	343 error.AmbiguousCommand,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	344 IndexError,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	345 getopt.GetoptError,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	346 ):
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	347 # Don't handle this here. We know the command is
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	348 # invalid, but all we're worried about for now is that
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	349 # it's not a command that server operators expect to
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	350 # be safe to offer to users in a sandbox.
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	351 pass
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	352 if realcmd == b'serve' and b'--stdio' in cmdargs:
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	353 # We want to constrain 'hg serve --stdio' instances pretty
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	354 # closely, as many shared-ssh access tools want to grant
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	355 # access to run only 'hg -R $repo serve --stdio'. We
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	356 # restrict to exactly that set of arguments, and prohibit
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	357 # any repo name that starts with '--' to prevent
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	358 # shenanigans wherein a user does something like pass
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	359 # --debugger or --config=ui.debugger=1 as a repo
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	360 # name. This used to actually run the debugger.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	361 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	362 len(req.args) != 4
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	363 or req.args[0] != b'-R'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	364 or req.args[1].startswith(b'--')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	365 or req.args[2] != b'serve'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	366 or req.args[3] != b'--stdio'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	367 ):
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	368 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	369 _(b'potentially unsafe serve --stdio invocation: %s')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	370 % (stringutil.pprint(req.args),)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	371 )
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	372
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	373 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	374 debugger = b'pdb'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	375 debugtrace = {b'pdb': pdb.set_trace}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	376 debugmortem = {b'pdb': pdb.post_mortem}
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	377
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	378 # read --config before doing anything else
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	379 # (e.g. to change trust settings for reading .hg/hgrc)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	380 cfgs = _parseconfig(req.ui, req.earlyoptions[b'config'])
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	381
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	382 if req.repo:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	383 # copy configs that were passed on the cmdline (--config) to
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	384 # the repo ui
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	385 for sec, name, val in cfgs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	386 req.repo.ui.setconfig(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	387 sec, name, val, source=b'--config'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	388 )
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	389
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	390 # developer config: ui.debugger
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	391 debugger = ui.config(b"ui", b"debugger")
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	392 debugmod = pdb
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	393 if not debugger or ui.plain():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	394 # if we are in HGPLAIN mode, then disable custom debugging
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	395 debugger = b'pdb'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	396 elif req.earlyoptions[b'debugger']:
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	397 # This import can be slow for fancy debuggers, so only
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	398 # do it when absolutely necessary, i.e. when actual
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	399 # debugging has been requested
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	400 with demandimport.deactivated():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	401 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	402 debugmod = __import__(debugger)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	403 except ImportError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	404 pass # Leave debugmod = pdb
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	405
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	406 debugtrace[debugger] = debugmod.set_trace
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	407 debugmortem[debugger] = debugmod.post_mortem
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	408
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	409 # enter the debugger before command execution
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	410 if req.earlyoptions[b'debugger']:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	411 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	412 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	413 b"entering debugger - "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	414 b"type c to continue starting hg or h for help\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	415 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	416 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	417
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	418 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	419 debugger != b'pdb'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	420 and debugtrace[debugger] == debugtrace[b'pdb']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	421 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	422 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	423 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	424 b"%s debugger specified "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	425 b"but its module was not found\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	426 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	427 % debugger
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	428 )
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	429 with demandimport.deactivated():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	430 debugtrace[debugger]()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	431 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	432 return _dispatch(req)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	433 finally:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	434 ui.flush()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	435 except: # re-raises
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	436 # enter the debugger when we hit an exception
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	437 if req.earlyoptions[b'debugger']:
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	438 traceback.print_exc()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	439 debugmortem[debugger](sys.exc_info()[2])
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	440 raise
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	441
39255 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38788 diff changeset	442 return _callcatch(ui, _runcatchfunc)
29761 39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	443
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	444
32040 0fb78cb90ca7 dispatch: mark callcatch() as a private function Yuya Nishihara <yuya@tcha.org> parents: 31960 diff changeset	445 def _callcatch(ui, func):
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	446 """like scmutil.callcatch but handles more high-level exceptions about
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	447 config parsing and commands. besides, use handlecommandexception to handle
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	448 uncaught exceptions.
29761 39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	449 """
39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	450 try:
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	451 return scmutil.callcatch(ui, func)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	452 except error.AmbiguousCommand as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	453 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	454 _(b"hg: command '%s' is ambiguous:\n %s\n")
45679 65e2b64670b5 errors: name arguments to AmbiguousCommand constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45678 diff changeset	455 % (inst.prefix, b" ".join(inst.matches))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	456 )
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	457 except error.CommandError as inst:
45678 bd2df58366b1 errors: name arguments to CommandError constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45253 diff changeset	458 if inst.command:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	459 ui.pager(b'help')
45678 bd2df58366b1 errors: name arguments to CommandError constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45253 diff changeset	460 msgbytes = pycompat.bytestr(inst.message)
bd2df58366b1 errors: name arguments to CommandError constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45253 diff changeset	461 ui.warn(_(b"hg %s: %s\n") % (inst.command, msgbytes))
bd2df58366b1 errors: name arguments to CommandError constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45253 diff changeset	462 commands.help_(ui, inst.command, full=False, command=True)
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	463 else:
45678 bd2df58366b1 errors: name arguments to CommandError constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45253 diff changeset	464 ui.warn(_(b"hg: %s\n") % inst.message)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	465 ui.warn(_(b"(use 'hg help -v' for a list of global options)\n"))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	466 except error.UnknownCommand as inst:
45680 bb1a988ef4a5 errors: name arguments to UnknownCommand constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45679 diff changeset	467 nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.command
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	468 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	469 # check if the command is in a disabled extension
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	470 # (but don't check for extensions themselves)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	471 formatted = help.formattedhelp(
45680 bb1a988ef4a5 errors: name arguments to UnknownCommand constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45679 diff changeset	472 ui, commands, inst.command, unknowncmd=True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	473 )
31060 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31027 diff changeset	474 ui.warn(nocmdmsg)
ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31027 diff changeset	475 ui.write(formatted)
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	476 except (error.UnknownCommand, error.Abort):
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	477 suggested = False
45680 bb1a988ef4a5 errors: name arguments to UnknownCommand constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45679 diff changeset	478 if inst.all_commands:
45882 8cc9e7f762d6 errors: move similarity_hint() to error module Martin von Zweigbergk <martinvonz@google.com> parents: 45881 diff changeset	479 sim = error.getsimilar(inst.all_commands, inst.command)
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	480 if sim:
31060 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31027 diff changeset	481 ui.warn(nocmdmsg)
45882 8cc9e7f762d6 errors: move similarity_hint() to error module Martin von Zweigbergk <martinvonz@google.com> parents: 45881 diff changeset	482 ui.warn(b"(%s)\n" % error.similarity_hint(sim))
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	483 suggested = True
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	484 if not suggested:
31060 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31027 diff changeset	485 ui.warn(nocmdmsg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	486 ui.warn(_(b"(use 'hg help' for a list of commands)\n"))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	487 except IOError:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	488 raise
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	489 except KeyboardInterrupt:
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	490 raise
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30519 diff changeset	491 except: # probably re-raises
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	492 if not handlecommandexception(ui):
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	493 raise
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	494
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	495 return -1
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	496
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	497
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	498 def aliasargs(fn, givenargs):
34087 5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34022 diff changeset	499 args = []
5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34022 diff changeset	500 # only care about alias 'args', ignore 'args' set by extensions.wrapfunction
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	501 if not util.safehasattr(fn, b'_origfunc'):
34087 5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34022 diff changeset	502 args = getattr(fn, 'args', args)
16294 795d591b6ef5 alias: abort on missing positional args (issue3331) Matt Mackall <mpm@selenic.com> parents: 16277 diff changeset	503 if args:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	504 cmd = b' '.join(map(procutil.shellquote, args))
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	505
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	506 nums = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	507
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	508 def replacer(m):
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	509 num = int(m.group(1)) - 1
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	510 nums.append(num)
16277 1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	511 if num < len(givenargs):
1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	512 return givenargs[num]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	513 raise error.Abort(_(b'too few arguments for command alias'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	514
31491 492c64afc54c py3: make the regular expression bytes to prevent TypeError Pulkit Goyal <7895pulkit@gmail.com> parents: 31305 diff changeset	515 cmd = re.sub(br'\$(\d+\|\$)', replacer, cmd)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	516 givenargs = [x for i, x in enumerate(givenargs) if i not in nums]
30678 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30653 diff changeset	517 args = pycompat.shlexsplit(cmd)
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	518 return args + givenargs
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	519
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	520
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	521 def aliasinterpolate(name, args, cmd):
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	522 '''interpolate args into cmd for shell aliases
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	523
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	524 This also handles $0, $@ and "$@".
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	525 '''
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	526 # util.interpolate can't deal with "$@" (with quotes) because it's only
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	527 # built to match prefix + patterns.
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44306 diff changeset	528 replacemap = {b'$%d' % (i + 1): arg for i, arg in enumerate(args)}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	529 replacemap[b'$0'] = name
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	530 replacemap[b'$$'] = b'$'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	531 replacemap[b'$@'] = b' '.join(args)
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	532 # Typical Unix shells interpolate "$@" (with quotes) as all the positional
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	533 # parameters, separated out into words. Emulate the same behavior here by
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	534 # quoting the arguments individually. POSIX shells will then typically
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	535 # tokenize each argument into exactly one word.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	536 replacemap[b'"$@"'] = b' '.join(procutil.shellquote(arg) for arg in args)
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	537 # escape '\$' for regex
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	538 regex = b'\|'.join(replacemap.keys()).replace(b'$', br'\$')
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	539 r = re.compile(regex)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	540 return r.sub(lambda x: replacemap[x.group()], cmd)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	541
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	542
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	543 class cmdalias(object):
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	544 def __init__(self, ui, name, definition, cmdtable, source):
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	545 self.name = self.cmd = name
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	546 self.cmdname = b''
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	547 self.definition = definition
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	548 self.fn = None
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	549 self.givenargs = []
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	550 self.opts = []
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	551 self.help = b''
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	552 self.badalias = None
22161 063628423fd1 alias: provide "unknowncmd" flag to tell help to look for disabled command Yuya Nishihara <yuya@tcha.org> parents: 22160 diff changeset	553 self.unknowncmd = False
28828 3640c1702c43 help: report source of aliases timeless <timeless@mozdev.org> parents: 28821 diff changeset	554 self.source = source
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	555
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	556 try:
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	557 aliases, entry = cmdutil.findcmd(self.name, cmdtable)
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	558 for alias, e in pycompat.iteritems(cmdtable):
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	559 if e is entry:
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	560 self.cmd = alias
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	561 break
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	562 self.shadows = True
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	563 except error.UnknownCommand:
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	564 self.shadows = False
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	565
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	566 if not self.definition:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	567 self.badalias = _(b"no definition for alias '%s'") % self.name
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	568 return
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	569
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	570 if self.definition.startswith(b'!'):
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	571 shdef = self.definition[1:]
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	572 self.shell = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	573
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	574 def fn(ui, *args):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	575 env = {b'HG_ARGS': b' '.join((self.name,) + args)}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	576
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	577 def _checkvar(m):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	578 if m.groups()[0] == b'$':
13392 777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	579 return m.group()
777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	580 elif int(m.groups()[0]) <= len(args):
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	581 return m.group()
f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	582 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	583 ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	584 b"No argument found for substitution "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	585 b"of %i variable in alias '%s' definition.\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	586 % (int(m.groups()[0]), self.name)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	587 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	588 return b''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	589
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	590 cmd = re.sub(br'\$(\d+\|\$)', _checkvar, shdef)
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	591 cmd = aliasinterpolate(self.name, args, cmd)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	592 return ui.system(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	593 cmd, environ=env, blockedtag=b'alias_%s' % self.name
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	594 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	595
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	596 self.fn = fn
40414 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	597 self.alias = True
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	598 self._populatehelp(ui, name, shdef, self.fn)
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	599 return
24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	600
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	601 try:
30678 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30653 diff changeset	602 args = pycompat.shlexsplit(self.definition)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	603 except ValueError as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	604 self.badalias = _(b"error in definition for alias '%s': %s") % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	605 self.name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	606 stringutil.forcebytestr(inst),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	607 )
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	608 return
35225 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35224 diff changeset	609 earlyopts, args = _earlysplitopts(args)
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35224 diff changeset	610 if earlyopts:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	611 self.badalias = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	612 b"error in definition for alias '%s': %s may "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	613 b"only be given on the command line"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	614 ) % (self.name, b'/'.join(pycompat.ziplist(*earlyopts)[0]))
35225 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35224 diff changeset	615 return
12092 4982fa38e544 alias: print what command is being shadowed in debug message Brodie Rao <brodie@bitheap.org> parents: 12070 diff changeset	616 self.cmdname = cmd = args.pop(0)
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	617 self.givenargs = args
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	618
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	619 try:
9993 8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	620 tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	621 if len(tableentry) > 2:
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	622 self.fn, self.opts, cmdhelp = tableentry
9993 8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	623 else:
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	624 self.fn, self.opts = tableentry
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	625 cmdhelp = None
9993 8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	626
40414 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	627 self.alias = True
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	628 self._populatehelp(ui, name, cmd, self.fn, cmdhelp)
9876 6e8a16dd3e30 alias: improve help text for command aliases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9875 diff changeset	629
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	630 except error.UnknownCommand:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	631 self.badalias = _(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	632 b"alias '%s' resolves to unknown command '%s'"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	633 ) % (self.name, cmd,)
22161 063628423fd1 alias: provide "unknowncmd" flag to tell help to look for disabled command Yuya Nishihara <yuya@tcha.org> parents: 22160 diff changeset	634 self.unknowncmd = True
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	635 except error.AmbiguousCommand:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	636 self.badalias = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	637 b"alias '%s' resolves to ambiguous command '%s'"
44306 a0ec05d93c8e cleanup: re-run black on the codebase Augie Fackler <augie@google.com> parents: 44244 diff changeset	638 ) % (self.name, cmd,)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	639
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	640 def _populatehelp(self, ui, name, cmd, fn, defaulthelp=None):
37139 aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	641 # confine strings to be passed to i18n.gettext()
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	642 cfg = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	643 for k in (b'doc', b'help', b'category'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	644 v = ui.config(b'alias', b'%s:%s' % (name, k), None)
37139 aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	645 if v is None:
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	646 continue
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	647 if not encoding.isasciistr(v):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	648 self.badalias = _(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	649 b"non-ASCII character in alias definition '%s:%s'"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	650 ) % (name, k)
37139 aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	651 return
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	652 cfg[k] = v
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37134 diff changeset	653
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	654 self.help = cfg.get(b'help', defaulthelp or b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	655 if self.help and self.help.startswith(b"hg " + cmd):
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	656 # drop prefix in old-style help lines so hg shows the alias
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	657 self.help = self.help[4 + len(cmd) :]
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	658
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	659 self.owndoc = b'doc' in cfg
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	660 doc = cfg.get(b'doc', pycompat.getdoc(fn))
37140 1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37139 diff changeset	661 if doc is not None:
1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37139 diff changeset	662 doc = pycompat.sysstr(doc)
1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37139 diff changeset	663 self.__doc__ = doc
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	664
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	665 self.helpcategory = cfg.get(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	666 b'category', registrar.command.CATEGORY_NONE
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	667 )
40414 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	668
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	669 @property
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	670 def args(self):
31629 2632df096fc0 dispatch: use pycompat.maplist() instead of map() to get a list Pulkit Goyal <7895pulkit@gmail.com> parents: 31502 diff changeset	671 args = pycompat.maplist(util.expandpath, self.givenargs)
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	672 return aliasargs(self.fn, args)
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	673
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	674 def __getattr__(self, name):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	675 adefaults = {
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43238 diff changeset	676 'norepo': True,
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43238 diff changeset	677 'intents': set(),
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43238 diff changeset	678 'optionalrepo': False,
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43238 diff changeset	679 'inferrepo': False,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	680 }
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	681 if name not in adefaults:
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	682 raise AttributeError(name)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	683 if self.badalias or util.safehasattr(self, b'shell'):
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	684 return adefaults[name]
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	685 return getattr(self.fn, name)
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	686
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	687 def __call__(self, ui, args, *opts):
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	688 if self.badalias:
22164 efd65e51bc0b alias: exit from bad definition by Abort Yuya Nishihara <yuya@tcha.org> parents: 22163 diff changeset	689 hint = None
22161 063628423fd1 alias: provide "unknowncmd" flag to tell help to look for disabled command Yuya Nishihara <yuya@tcha.org> parents: 22160 diff changeset	690 if self.unknowncmd:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	691 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	692 # check if the command is in a disabled extension
22163 01ef4347e4ab alias: show one-line hint for command provided by disabled extension Yuya Nishihara <yuya@tcha.org> parents: 22161 diff changeset	693 cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	694 hint = _(b"'%s' is provided by '%s' extension") % (cmd, ext)
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	695 except error.UnknownCommand:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	696 pass
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	697 raise error.Abort(self.badalias, hint=hint)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	698 if self.shadows:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	699 ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	700 b"alias '%s' shadows command '%s'\n" % (self.name, self.cmdname)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	701 )
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	702
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	703 ui.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	704 b'commandalias',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	705 b"alias '%s' expands to '%s'\n",
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	706 self.name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	707 self.definition,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	708 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	709 if util.safehasattr(self, b'shell'):
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	710 return self.fn(ui, args, *opts)
f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	711 else:
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	712 try:
21556 5e13507a3b4e alias: fix loss of non-zero return code in command aliases Yuya Nishihara <yuya@tcha.org> parents: 20829 diff changeset	713 return util.checksignature(self.fn)(ui, args, *opts)
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	714 except error.SignatureError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	715 args = b' '.join([self.cmdname] + self.args)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	716 ui.debug(b"alias '%s' expands to '%s'\n" % (self.name, args))
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	717 raise
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	718
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	719
34306 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	720 class lazyaliasentry(object):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	721 """like a typical command entry (func, opts, help), but is lazy"""
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	722
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	723 def __init__(self, ui, name, definition, cmdtable, source):
6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	724 self.ui = ui
34306 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	725 self.name = name
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	726 self.definition = definition
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	727 self.cmdtable = cmdtable.copy()
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	728 self.source = source
40414 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	729 self.alias = True
34306 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	730
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	731 @util.propertycache
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	732 def _aliasdef(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	733 return cmdalias(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	734 self.ui, self.name, self.definition, self.cmdtable, self.source
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	735 )
34306 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	736
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	737 def __getitem__(self, n):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	738 aliasdef = self._aliasdef
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	739 if n == 0:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	740 return aliasdef
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	741 elif n == 1:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	742 return aliasdef.opts
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	743 elif n == 2:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	744 return aliasdef.help
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	745 else:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	746 raise IndexError
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	747
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	748 def __iter__(self):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	749 for i in range(3):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	750 yield self[i]
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	751
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	752 def __len__(self):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	753 return 3
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	754
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	755
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	756 def addaliases(ui, cmdtable):
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	757 # aliases are processed after extensions have been loaded, so they
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	758 # may use extension commands. Aliases can also use other alias definitions,
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	759 # but only if they have been defined prior to the current definition.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	760 for alias, definition in ui.configitems(b'alias', ignoresub=True):
15019 f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	761 try:
34306 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	762 if cmdtable[alias].definition == definition:
15019 f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	763 continue
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	764 except (KeyError, AttributeError):
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	765 # definition might not exist or it might not be a cmdalias
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	766 pass
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	767
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	768 source = ui.configsource(b'alias', alias)
37134 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37120 diff changeset	769 entry = lazyaliasentry(ui, alias, definition, cmdtable, source)
34306 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34305 diff changeset	770 cmdtable[alias] = entry
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	771
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	772
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	773 def _parse(ui, args):
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	774 options = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	775 cmdoptions = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	776
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	777 try:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	778 args = fancyopts.fancyopts(args, commands.globalopts, options)
30576 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30559 diff changeset	779 except getopt.GetoptError as inst:
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36729 diff changeset	780 raise error.CommandError(None, stringutil.forcebytestr(inst))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	781
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	782 if args:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	783 cmd, args = args[0], args[1:]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	784 aliases, entry = cmdutil.findcmd(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	785 cmd, commands.table, ui.configbool(b"ui", b"strict")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	786 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	787 cmd = aliases[0]
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	788 args = aliasargs(entry[0], args)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	789 defaults = ui.config(b"defaults", cmd)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	790 if defaults:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	791 args = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	792 pycompat.maplist(util.expandpath, pycompat.shlexsplit(defaults))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	793 + args
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	794 )
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	795 c = list(entry[1])
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	796 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	797 cmd = None
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	798 c = []
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	799
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	800 # combine global options into local
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	801 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	802 c.append((o[0], o[1], options[o[1]], o[3]))
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	803
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	804 try:
29822 61a4cdc98307 dispatch: explicitly pass fancyopts optional arg as a keyword Augie Fackler <augie@google.com> parents: 29784 diff changeset	805 args = fancyopts.fancyopts(args, c, cmdoptions, gnu=True)
30576 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30559 diff changeset	806 except getopt.GetoptError as inst:
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36729 diff changeset	807 raise error.CommandError(cmd, stringutil.forcebytestr(inst))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	808
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	809 # separate global options back out
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	810 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	811 n = o[1]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	812 options[n] = cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	813 del cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	814
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	815 return (cmd, cmd and entry[0] or None, args, options, cmdoptions)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	816
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	817
8137 7fd0616b3d80 ui: kill updateopts Matt Mackall <mpm@selenic.com> parents: 8136 diff changeset	818 def _parseconfig(ui, config):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	819 """parse the --config options from the command line"""
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	820 configs = []
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	821
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	822 for cfg in config:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	823 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	824 name, value = [cfgelem.strip() for cfgelem in cfg.split(b'=', 1)]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	825 section, name = name.split(b'.', 1)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	826 if not section or not name:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	827 raise IndexError
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	828 ui.setconfig(section, name, value, b'--config')
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	829 configs.append((section, name, value))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	830 except (IndexError, ValueError):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	831 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	832 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	833 b'malformed --config option: %r '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	834 b'(use --config section.name=value)'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	835 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	836 % pycompat.bytestr(cfg)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	837 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	838
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	839 return configs
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	840
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	841
35224 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35223 diff changeset	842 def _earlyparseopts(ui, args):
35170 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 35034 diff changeset	843 options = {}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	844 fancyopts.fancyopts(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	845 args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	846 commands.globalopts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	847 options,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	848 gnu=not ui.plain(b'strictflags'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	849 early=True,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	850 optaliases={b'repository': [b'repo']},
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	851 )
35170 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 35034 diff changeset	852 return options
c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 35034 diff changeset	853
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	854
35225 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35224 diff changeset	855 def _earlysplitopts(args):
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35224 diff changeset	856 """Split args into a list of possible early options and remainder args"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	857 shortoptions = b'R:'
35225 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35224 diff changeset	858 # TODO: perhaps 'debugger' should be included
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	859 longoptions = [b'cwd=', b'repository=', b'repo=', b'config=']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	860 return fancyopts.earlygetopt(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	861 args, shortoptions, longoptions, gnu=True, keepsep=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	862 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	863
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	864
11330 713ae78bb583 provide pre- and post- hooks with parsed command line arguments. Chad Dombrova <chadrik@gmail.com> parents: 11305 diff changeset	865 def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions):
7819 14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	866 # run pre-hook, and abort if it fails
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	867 hook.hook(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	868 lui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	869 repo,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	870 b"pre-%s" % cmd,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	871 True,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	872 args=b" ".join(fullargs),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	873 pats=cmdpats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	874 opts=cmdoptions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	875 )
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	876 try:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	877 ret = _runcommand(ui, options, cmd, d)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	878 # run post-hook, passing command result
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	879 hook.hook(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	880 lui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	881 repo,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	882 b"post-%s" % cmd,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	883 False,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	884 args=b" ".join(fullargs),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	885 result=ret,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	886 pats=cmdpats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	887 opts=cmdoptions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	888 )
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	889 except Exception:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	890 # run failure hook and re-raise
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	891 hook.hook(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	892 lui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	893 repo,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	894 b"fail-%s" % cmd,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	895 False,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	896 args=b" ".join(fullargs),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	897 pats=cmdpats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	898 opts=cmdoptions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	899 )
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	900 raise
7819 14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	901 return ret
14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	902
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	903
45782 fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	904 def _readsharedsourceconfig(ui, path):
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	905 """if the current repository is shared one, this tries to read
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	906 .hg/hgrc of shared source if we are in share-safe mode
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	907
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	908 Config read is loaded into the ui object passed
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	909
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	910 This should be called before reading .hg/hgrc or the main repo
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	911 as that overrides config set in shared source"""
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	912 try:
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	913 with open(os.path.join(path, b".hg", b"requires"), "rb") as fp:
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	914 requirements = set(fp.read().splitlines())
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	915 if not (
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	916 requirementsmod.SHARESAFE_REQUIREMENT in requirements
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	917 and requirementsmod.SHARED_REQUIREMENT in requirements
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	918 ):
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	919 return
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	920 hgvfs = vfs.vfs(os.path.join(path, b".hg"))
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	921 sharedvfs = localrepo._getsharedvfs(hgvfs, requirements)
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	922 ui.readconfig(sharedvfs.join(b"hgrc"), path)
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	923 except IOError:
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	924 pass
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	925
fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	926
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	927 def _getlocal(ui, rpath, wd=None):
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	928 """Return (path, local ui object) for the given target path.
12770 614f0d8724ab check-code: find trailing whitespace Martin Geisler <mg@lazybytes.net> parents: 12748 diff changeset	929
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	930 Takes paths in [cwd]/.hg/hgrc into account."
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	931 """
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	932 if wd is None:
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	933 try:
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39512 diff changeset	934 wd = encoding.getcwd()
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	935 except OSError as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	936 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	937 _(b"error getting current working directory: %s")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	938 % encoding.strtolocal(e.strerror)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	939 )
44244 ef11dfc56674 config: also respect HGRCSKIPREPO in `dispatch._getlocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44017 diff changeset	940
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	941 path = cmdutil.findrepo(wd) or b""
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	942 if not path:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	943 lui = ui
9436 96379c93ba6f improve code readability Andrey Somov <py4fun@gmail.com> parents: 9411 diff changeset	944 else:
12636 c24215aa7e69 dispatch: remove superfluous try/except when reading local ui config Brodie Rao <brodie@bitheap.org> parents: 12633 diff changeset	945 lui = ui.copy()
44244 ef11dfc56674 config: also respect HGRCSKIPREPO in `dispatch._getlocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44017 diff changeset	946 if rcutil.use_repo_hgrc():
45782 fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	947 _readsharedsourceconfig(lui, path)
44244 ef11dfc56674 config: also respect HGRCSKIPREPO in `dispatch._getlocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44017 diff changeset	948 lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
45783 88a47cbf063c config: add a .hg/hgrc-not-shared which won't be shared in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45782 diff changeset	949 lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	950
35033 d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 35032 diff changeset	951 if rpath:
d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 35032 diff changeset	952 path = lui.expandpath(rpath)
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8144 diff changeset	953 lui = ui.copy()
44244 ef11dfc56674 config: also respect HGRCSKIPREPO in `dispatch._getlocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44017 diff changeset	954 if rcutil.use_repo_hgrc():
45782 fd1de908f2b4 dispatch: load shared source repository config in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45777 diff changeset	955 _readsharedsourceconfig(lui, path)
44244 ef11dfc56674 config: also respect HGRCSKIPREPO in `dispatch._getlocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44017 diff changeset	956 lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
45783 88a47cbf063c config: add a .hg/hgrc-not-shared which won't be shared in share-safe mode Pulkit Goyal <7895pulkit@gmail.com> parents: 45782 diff changeset	957 lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	958
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	959 return path, lui
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	960
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	961
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	962 def _checkshellalias(lui, ui, args):
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	963 """Return the function to run the shell alias, if it is required"""
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	964 options = {}
12748 d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	965
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	966 try:
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	967 args = fancyopts.fancyopts(args, commands.globalopts, options)
30576 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30559 diff changeset	968 except getopt.GetoptError:
12748 d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	969 return
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	970
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	971 if not args:
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	972 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	973
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	974 cmdtable = commands.table
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	975
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	976 cmd = args[0]
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	977 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	978 strict = ui.configbool(b"ui", b"strict")
22377 f98abe3146b2 dispatch: check shell alias again after loading extensions (issue4355) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22376 diff changeset	979 aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict)
12932 ab93029ab622 alias: fall back to normal error handling for ambigious commands (fixes issue2475) Steve Losh <steve@stevelosh.com> parents: 12831 diff changeset	980 except (error.AmbiguousCommand, error.UnknownCommand):
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	981 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	982
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	983 cmd = aliases[0]
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	984 fn = entry[0]
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	985
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	986 if cmd and util.safehasattr(fn, b'shell'):
35034 02845f7441af dispatch: verify result of early command parsing Yuya Nishihara <yuya@tcha.org> parents: 35033 diff changeset	987 # shell alias shouldn't receive early options which are consumed by hg
35225 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35224 diff changeset	988 _earlyopts, args = _earlysplitopts(args)
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	989 d = lambda: fn(ui, *args[1:])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	990 return lambda: runcommand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	991 lui, None, cmd, args[:1], ui, options, d, [], {}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	992 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	993
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	994
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	995 def _dispatch(req):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	996 args = req.args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	997 ui = req.ui
80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	998
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	999 # check for cwd
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1000 cwd = req.earlyoptions[b'cwd']
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	1001 if cwd:
35033 d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 35032 diff changeset	1002 os.chdir(cwd)
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	1003
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1004 rpath = req.earlyoptions[b'repository']
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	1005 path, lui = _getlocal(ui, rpath)
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	1006
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32158 diff changeset	1007 uis = {ui, lui}
30933 69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30917 diff changeset	1008
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30917 diff changeset	1009 if req.repo:
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30917 diff changeset	1010 uis.add(req.repo.ui)
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30917 diff changeset	1011
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1012 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1013 req.earlyoptions[b'verbose']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1014 or req.earlyoptions[b'debug']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1015 or req.earlyoptions[b'quiet']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1016 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1017 for opt in (b'verbose', b'debug', b'quiet'):
38534 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38110 diff changeset	1018 val = pycompat.bytestr(bool(req.earlyoptions[opt]))
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38110 diff changeset	1019 for ui_ in uis:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1020 ui_.setconfig(b'ui', opt, val, b'--' + opt)
38534 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38110 diff changeset	1021
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1022 if req.earlyoptions[b'profile']:
30933 69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30917 diff changeset	1023 for ui_ in uis:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1024 ui_.setconfig(b'profiling', b'enabled', b'true', b'--profile')
30933 69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30917 diff changeset	1025
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1026 profile = lui.configbool(b'profiling', b'enabled')
32788 eede022fc142 profile: drop maybeprofile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32787 diff changeset	1027 with profiling.profile(lui, enabled=profile) as profiler:
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1028 # Configure extensions in phases: uisetup, extsetup, cmdtable, and
33053 ef46d432e2e4 dispatch: remove unused _loaded FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33052 diff changeset	1029 # reposetup
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1030 extensions.loadall(lui)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1031 # Propagate any changes to lui.__class__ by extensions
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1032 ui.__class__ = lui.__class__
5828 863e237b58fb dispatch: allow extensions to provide setup code Kirill Smelkov <kirr@mns.spb.ru> parents: 5664 diff changeset	1033
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1034 # (uisetup and extsetup are handled in extensions.loadall)
5828 863e237b58fb dispatch: allow extensions to provide setup code Kirill Smelkov <kirr@mns.spb.ru> parents: 5664 diff changeset	1035
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1036 # (reposetup is handled in hg.repository)
9410 1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	1037
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1038 addaliases(lui, commands.table)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	1039
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1040 # All aliases and commands are completely defined, now.
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1041 # Check abbreviation/ambiguity of shell alias.
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1042 shellaliasfn = _checkshellalias(lui, ui, args)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1043 if shellaliasfn:
40729 c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40651 diff changeset	1044 # no additional configs will be set, set up the ui instances
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40651 diff changeset	1045 for ui_ in uis:
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40651 diff changeset	1046 extensions.populateui(ui_)
30006 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30005 diff changeset	1047 return shellaliasfn()
22377 f98abe3146b2 dispatch: check shell alias again after loading extensions (issue4355) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22376 diff changeset	1048
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1049 # check for fallback encoding
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1050 fallback = lui.config(b'ui', b'fallbackencoding')
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1051 if fallback:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1052 encoding.fallbackencoding = fallback
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1053
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1054 fullargs = args
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1055 cmd, func, args, options, cmdoptions = _parse(lui, args)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1056
40402 106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39818 diff changeset	1057 # store the canonical command name in request object for later access
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39818 diff changeset	1058 req.canonical_command = cmd
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39818 diff changeset	1059
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1060 if options[b"config"] != req.earlyoptions[b"config"]:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1061 raise error.Abort(_(b"option --config may not be abbreviated!"))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1062 if options[b"cwd"] != req.earlyoptions[b"cwd"]:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1063 raise error.Abort(_(b"option --cwd may not be abbreviated!"))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1064 if options[b"repository"] != req.earlyoptions[b"repository"]:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1065 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1066 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1067 b"option -R has to be separated from other options (e.g. not "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1068 b"-qR) and --repository may only be abbreviated as --repo!"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1069 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1070 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1071 if options[b"debugger"] != req.earlyoptions[b"debugger"]:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1072 raise error.Abort(_(b"option --debugger may not be abbreviated!"))
35030 d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 35029 diff changeset	1073 # don't validate --profile/--traceback, which can be enabled from now
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1074
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1075 if options[b"encoding"]:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1076 encoding.encoding = options[b"encoding"]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1077 if options[b"encodingmode"]:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1078 encoding.encodingmode = options[b"encodingmode"]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1079 if options[b"time"]:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1080
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1081 def get_times():
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1082 t = os.times()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1083 if t[4] == 0.0:
44017 6b90f5c89cb4 py3: replace `time.clock()` with `time.perf_counter()` Matt Harbison <matt_harbison@yahoo.com> parents: 43787 diff changeset	1084 # Windows leaves this as zero, so use time.perf_counter()
6b90f5c89cb4 py3: replace `time.clock()` with `time.perf_counter()` Matt Harbison <matt_harbison@yahoo.com> parents: 43787 diff changeset	1085 t = (t[0], t[1], t[2], t[3], util.timer())
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1086 return t
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1087
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1088 s = get_times()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1089
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1090 def print_time():
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1091 t = get_times()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1092 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1093 _(b"time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1094 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1095 t[4] - s[4],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1096 t[0] - s[0],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1097 t[2] - s[2],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1098 t[1] - s[1],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1099 t[3] - s[3],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1100 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1101 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1102
31958 de5c9d0e02ea atexit: switch to home-grown implementation Bryan O'Sullivan <bryano@fb.com> parents: 31956 diff changeset	1103 ui.atexit(print_time)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1104 if options[b"profile"]:
32787 545f69cd6042 profile: support --profile in alias and abbreviated version (--prof) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32687 diff changeset	1105 profiler.start()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1106
38534 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38110 diff changeset	1107 # if abbreviated version of this were used, take them in account, now
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1108 if options[b'verbose'] or options[b'debug'] or options[b'quiet']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1109 for opt in (b'verbose', b'debug', b'quiet'):
38534 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38110 diff changeset	1110 if options[opt] == req.earlyoptions[opt]:
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38110 diff changeset	1111 continue
35898 a2b3b5c5a25a py3: replace "if ispy3" by pycompat.bytestr() Yuya Nishihara <yuya@tcha.org> parents: 35653 diff changeset	1112 val = pycompat.bytestr(bool(options[opt]))
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1113 for ui_ in uis:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1114 ui_.setconfig(b'ui', opt, val, b'--' + opt)
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1115
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1116 if options[b'traceback']:
14752 99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	1117 for ui_ in uis:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1118 ui_.setconfig(b'ui', b'traceback', b'on', b'--traceback')
14992 188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	1119
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1120 if options[b'noninteractive']:
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1121 for ui_ in uis:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1122 ui_.setconfig(b'ui', b'interactive', b'off', b'-y')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1123
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1124 if cmdoptions.get(b'insecure', False):
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1125 for ui_ in uis:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1126 ui_.insecureconnections = True
13328 a939f08fae9c url: add --insecure option to bypass verification of ssl certificates Yuya Nishihara <yuya@tcha.org> parents: 12932 diff changeset	1127
32383 f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	1128 # setup color handling before pager, because setting up pager
f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	1129 # might cause incorrect console information
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1130 coloropt = options[b'color']
31105 45be7590301d color: move triggering of the initialisation logic in core Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31060 diff changeset	1131 for ui_ in uis:
31110 7fec37746417 color: add a 'ui.color' option to control color behavior Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31105 diff changeset	1132 if coloropt:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1133 ui_.setconfig(b'ui', b'color', coloropt, b'--color')
31110 7fec37746417 color: add a 'ui.color' option to control color behavior Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31105 diff changeset	1134 color.setup(ui_)
31105 45be7590301d color: move triggering of the initialisation logic in core Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31060 diff changeset	1135
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1136 if stringutil.parsebool(options[b'pager']):
33620 cc047a733f69 ui: enable pager always for explicit --pager=on (issue5580) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33499 diff changeset	1137 # ui.pager() expects 'internal-always-' prefix in this case
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1138 ui.pager(b'internal-always-' + cmd)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1139 elif options[b'pager'] != b'auto':
34638 021607b4ef49 dispatch: when --pager=no is passed, also disable pager on req.repo.ui Jun Wu <quark@fb.com> parents: 34533 diff changeset	1140 for ui_ in uis:
021607b4ef49 dispatch: when --pager=no is passed, also disable pager on req.repo.ui Jun Wu <quark@fb.com> parents: 34533 diff changeset	1141 ui_.disablepager()
32383 f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	1142
40729 c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40651 diff changeset	1143 # configs are fully loaded, set up the ui instances
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40651 diff changeset	1144 for ui_ in uis:
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40651 diff changeset	1145 extensions.populateui(ui_)
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40651 diff changeset	1146
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1147 if options[b'version']:
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1148 return commands.version_(ui)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1149 if options[b'help']:
30934 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1150 return commands.help_(ui, cmd, command=cmd is not None)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30933 diff changeset	1151 elif not cmd:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1152 return commands.help_(ui, b'shortlist')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1153
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1154 repo = None
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1155 cmdpats = args[:]
43706 ac8fd215a776 dispatch: add some assertions to give pytype a helping hand Augie Fackler <augie@google.com> parents: 43506 diff changeset	1156 assert func is not None # help out pytype
30485 acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30473 diff changeset	1157 if not func.norepo:
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1158 # use the repo from the request only if we don't have -R
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1159 if not rpath and not cwd:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1160 repo = req.repo
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	1161
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1162 if repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1163 # set the descriptors of the repo ui to those of ui
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1164 repo.ui.fin = ui.fin
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1165 repo.ui.fout = ui.fout
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1166 repo.ui.ferr = ui.ferr
40587 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40414 diff changeset	1167 repo.ui.fmsg = ui.fmsg
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1168 else:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1169 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1170 repo = hg.repository(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1171 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1172 path=path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1173 presetupfuncs=req.prereposetups,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1174 intents=func.intents,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1175 )
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1176 if not repo.local():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1177 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1178 _(b"repository '%s' is not local") % path
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1179 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1180 repo.ui.setconfig(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1181 b"bundle", b"mainreporoot", repo.root, b'repo'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1182 )
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1183 except error.RequirementError:
26142 7332bf4ae959 dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25932 diff changeset	1184 raise
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1185 except error.RepoError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1186 if rpath: # invalid -R path
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1187 raise
30485 acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30473 diff changeset	1188 if not func.optionalrepo:
acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30473 diff changeset	1189 if func.inferrepo and args and not path:
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1190 # try to infer -R from command args
35149 e6487522ef92 py3: use pycompat.maplist() instead of map() Pulkit Goyal <7895pulkit@gmail.com> parents: 35145 diff changeset	1191 repos = pycompat.maplist(cmdutil.findrepo, args)
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1192 guess = repos[0]
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1193 if guess and repos.count(guess) == len(repos):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1194 req.args = [b'--repository', guess] + fullargs
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1195 req.earlyoptions[b'repository'] = guess
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1196 return _dispatch(req)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1197 if not path:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1198 raise error.RepoError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1199 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1200 b"no repository found in"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1201 b" '%s' (.hg not found)"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1202 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1203 % encoding.getcwd()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1204 )
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1205 raise
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1206 if repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1207 ui = repo.ui
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1208 if options[b'hidden']:
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1209 repo = repo.unfiltered()
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1210 args.insert(0, repo)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1211 elif rpath:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1212 ui.warn(_(b"warning: --repository ignored\n"))
7388 5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7280 diff changeset	1213
31492 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31491 diff changeset	1214 msg = _formatargs(fullargs)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1215 ui.log(b"command", b'%s\n', msg)
30586 2d555d753f0e py3: make keys of keyword arguments strings Pulkit Goyal <7895pulkit@gmail.com> parents: 30576 diff changeset	1216 strcmdopt = pycompat.strkwargs(cmdoptions)
2d555d753f0e py3: make keys of keyword arguments strings Pulkit Goyal <7895pulkit@gmail.com> parents: 30576 diff changeset	1217 d = lambda: util.checksignature(func)(ui, args, *strcmdopt)
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1218 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1219 return runcommand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1220 lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1221 )
30005 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1222 finally:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1223 if repo and repo != req.repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29884 diff changeset	1224 repo.close()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1225
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1226
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1227 def _runcommand(ui, options, cmd, cmdfunc):
29784 e3501546f7e4 profiling: add a context manager that no-ops if profiling isn't enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 29783 diff changeset	1228 """Run a command function, possibly with profiling enabled."""
30006 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30005 diff changeset	1229 try:
43238 101ae8bbfa02 cleanup: hgdemandimport.tracing accepts strings, not bytes Augie Fackler <augie@google.com> parents: 43117 diff changeset	1230 with tracing.log("Running %s command" % cmd):
39512 ec0a2601bc76 tracing: trace command function execution Boris Feld <boris.feld@octobus.net> parents: 39255 diff changeset	1231 return cmdfunc()
30006 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30005 diff changeset	1232 except error.SignatureError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1233 raise error.CommandError(cmd, _(b'invalid arguments'))
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1234
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1235
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1236 def _exceptionwarning(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1237 """Produce a warning message for the current active exception"""
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1238
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1239 # For compatibility checking, we discard the portion of the hg
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1240 # version after the + on the assumption that if a "normal
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1241 # user" is running a build with a + in it the packager
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1242 # probably built from fairly close to a tag and anyone with a
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1243 # 'make local' copy of hg (where the version number can be out
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1244 # of date) will be clueful enough to notice the implausible
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1245 # version number and try updating.
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1246 ct = util.versiontuple(n=2)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1247 worst = None, ct, b''
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1248 if ui.config(b'ui', b'supportcontact') is None:
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1249 for name, mod in extensions.extensions():
35899 d5457d94e1c9 py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr() Yuya Nishihara <yuya@tcha.org> parents: 35898 diff changeset	1250 # 'testedwith' should be bytes, but not all extensions are ported
d5457d94e1c9 py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr() Yuya Nishihara <yuya@tcha.org> parents: 35898 diff changeset	1251 # to py3 and we don't want UnicodeException because of that.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1252 testedwith = stringutil.forcebytestr(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1253 getattr(mod, 'testedwith', b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1254 )
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1255 report = getattr(mod, 'buglink', _(b'the extension author.'))
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1256 if not testedwith.strip():
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1257 # We found an untested extension. It's likely the culprit.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1258 worst = name, b'unknown', report
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1259 break
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1260
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1261 # Never blame on extensions bundled with Mercurial.
29884 ed793f41e83f extensions: use ismoduleinternal() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 29846 diff changeset	1262 if extensions.ismoduleinternal(mod):
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1263 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1264
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1265 tested = [util.versiontuple(t, 2) for t in testedwith.split()]
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1266 if ct in tested:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1267 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1268
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1269 lower = [t for t in tested if t < ct]
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1270 nearest = max(lower or tested)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1271 if worst[0] is None or nearest < worst[1]:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1272 worst = name, nearest, report
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1273 if worst[0] is not None:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1274 name, testedwith, report = worst
31179 49ad6bf63107 dispatch: allow testedwith to be bytes or str Augie Fackler <raf@durin42.com> parents: 31110 diff changeset	1275 if not isinstance(testedwith, (bytes, str)):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1276 testedwith = b'.'.join(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1277 [stringutil.forcebytestr(c) for c in testedwith]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1278 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1279 warning = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1280 b'** Unknown exception encountered with '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1281 b'possibly-broken third-party extension %s\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1282 b'** which supports versions %s of Mercurial.\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1283 b'** Please disable %s and try your action again.\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1284 b'** If that fixes the bug please report it to %s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1285 ) % (name, testedwith, name, stringutil.forcebytestr(report))
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1286 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1287 bugtracker = ui.config(b'ui', b'supportcontact')
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1288 if bugtracker is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1289 bugtracker = _(b"https://mercurial-scm.org/wiki/BugTracker")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1290 warning = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1291 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1292 b"** unknown exception encountered, "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1293 b"please report by visiting\n** "
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1294 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1295 + bugtracker
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1296 + b'\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1297 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1298 sysversion = pycompat.sysbytes(sys.version).replace(b'\n', b'')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1299 warning += (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1300 (_(b"** Python %s\n") % sysversion)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1301 + (_(b"** Mercurial Distributed SCM (version %s)\n") % util.version())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1302 + (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1303 _(b"** Extensions loaded: %s\n")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1304 % b", ".join([x[0] for x in extensions.extensions()])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1305 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1306 )
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1307 return warning
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1308
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1309
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1310 def handlecommandexception(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1311 """Produce a warning message for broken commands
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1312
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1313 Called when handling an exception; the exception is reraised if
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1314 this function returns False, ignored otherwise.
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1315 """
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1316 warning = _exceptionwarning(ui)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1317 ui.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1318 b"commandexception",
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1319 b"%s\n%s\n",
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1320 warning,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1321 pycompat.sysbytes(traceback.format_exc()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1322 )
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1323 ui.warn(warning)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1324 return False # re-raise the exception

Mercurial > public > mercurial-scm > hg

annotate mercurial/dispatch.py @ 45892:06b64fabf91c