mercurial-scm/hg: tests/test-mq-qrefresh-replace-log-message.t annotate

annotate tests/test-mq-qrefresh-replace-log-message.t @ 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	c6d31e659a28
children	768056549737

rev	line source
17478 113d0a3d050b spelling: Environment timeless@mozdev.org parents: 12468 diff changeset	1 Environment setup for MQ
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: diff changeset	2
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	3 $ echo "[extensions]" >> $HGRCPATH
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	4 $ echo "mq=" >> $HGRCPATH
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	5 $ cat >> $HGRCPATH <<EOF
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	6 > [defaults]
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	7 > # explicit date to commit with fixed hashid
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	8 > qnew = -d "0 0"
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	9 > qrefresh = -d "0 0"
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	10 > qfold = -d "0 0"
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	11 > EOF
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	12 $ hg init
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	13 $ hg qinit
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: diff changeset	14
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	15 Should fail if no patches applied
21423 7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	16 (this tests also that editor is not invoked if '--edit' is not
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	17 specified)
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: diff changeset	18
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	19 $ hg qrefresh
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	20 no patches applied
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	21 [1]
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	22 $ hg qrefresh -e
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	23 no patches applied
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	24 [1]
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	25 $ hg qnew -m "First commit message" first-patch
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	26 $ echo aaaa > file
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	27 $ hg add file
21423 7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	28 $ HGEDITOR=cat hg qrefresh
5334 448eb46d4d84 mq: fix qrefresh -e with no patches applied Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4659 diff changeset	29
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	30 Should display 'First commit message'
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	31
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	32 $ hg log -l1 --template "{desc}\n"
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	33 First commit message
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	34
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	35 Testing changing message with -m
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	36 (this tests also that '--edit' can be used with '--message', and
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	37 that '[committemplate] changeset' definition and commit log specific
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	38 template keyword 'extramsg' work well)
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	39
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	40 $ cat >> .hg/hgrc <<EOF
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	41 > [committemplate]
22013 de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21930 diff changeset	42 > listupfiles = {file_adds %
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21930 diff changeset	43 > "HG: added {file}\n" }{file_mods %
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21930 diff changeset	44 > "HG: changed {file}\n" }{file_dels %
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21930 diff changeset	45 > "HG: removed {file}\n" }{if(files, "",
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21930 diff changeset	46 > "HG: no files changed\n")}
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21930 diff changeset	47 >
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	48 > changeset = HG: this is customized commit template
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	49 > {desc}\n\n
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	50 > HG: Enter commit message. Lines beginning with 'HG:' are removed.
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	51 > HG: {extramsg}
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	52 > HG: --
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	53 > HG: user: {author}
22013 de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21930 diff changeset	54 > HG: branch '{branch}'\n{listupfiles}
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	55 > EOF
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	56
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	57 $ echo bbbb > file
21713 7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	58 $ HGEDITOR=cat hg qrefresh -m "Second commit message" -e
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	59 HG: this is customized commit template
21713 7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	60 Second commit message
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	61
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	62
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	63 HG: Enter commit message. Lines beginning with 'HG:' are removed.
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	64 HG: Leave message empty to use default message.
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	65 HG: --
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	66 HG: user: test
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	67 HG: branch 'default'
7a51bced398b qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21423 diff changeset	68 HG: added file
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: diff changeset	69
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	70 $ cat >> .hg/hgrc <<EOF
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	71 > # disable customizing for subsequent tests
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	72 > [committemplate]
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	73 > changeset =
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	74 > EOF
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21713 diff changeset	75
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	76 Should display 'Second commit message'
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	77
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	78 $ hg log -l1 --template "{desc}\n"
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	79 Second commit message
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	80
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	81 Testing changing message with -l
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: diff changeset	82
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	83 $ echo "Third commit message" > logfile
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	84 $ echo " This is the 3rd log message" >> logfile
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	85 $ echo bbbb > file
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	86 $ hg qrefresh -l logfile
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	87
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	88 Should display 'Third commit message\\\n This is the 3rd log message'
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: diff changeset	89
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	90 $ hg log -l1 --template "{desc}\n"
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	91 Third commit message
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	92 This is the 3rd log message
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	93
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	94 Testing changing message with -l-
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: diff changeset	95
12468 d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	96 $ hg qnew -m "First commit message" second-patch
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	97 $ echo aaaa > file2
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	98 $ hg add file2
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	99 $ echo bbbb > file2
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	100 $ (echo "Fifth commit message"; echo " This is the 5th log message") \| hg qrefresh -l-
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	101
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	102 Should display 'Fifth commit message\\\n This is the 5th log message'
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	103
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	104 $ hg log -l1 --template "{desc}\n"
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	105 Fifth commit message
d8bf747d2e29 tests: unify test-mq-qrefresh-replace-log-message Matt Mackall <mpm@selenic.com> parents: 5334 diff changeset	106 This is the 5th log message
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	107
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	108 Test saving last-message.txt:
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	109
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	110 $ cat > $TESTTMP/editor.sh << EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	111 > echo "==== before editing"
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	112 > cat \$1
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	113 > echo "===="
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	114 > (echo; echo "test saving last-message.txt") >> \$1
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	115 > EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	116
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	117 $ cat > $TESTTMP/commitfailure.py <<EOF
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 22013 diff changeset	118 > from mercurial import error
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	119 > def reposetup(ui, repo):
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	120 > class commitfailure(repo.__class__):
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	121 > def commit(self, args, *kwargs):
36284 d157b5bfaef0 py3: add b'' prefix in test-mq-qrefresh-replace-log-message.t Pulkit Goyal <7895pulkit@gmail.com> parents: 30332 diff changeset	122 > raise error.Abort(b'emulating unexpected abort')
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	123 > repo.__class__ = commitfailure
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	124 > EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	125
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	126 $ cat >> .hg/hgrc <<EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	127 > [extensions]
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	128 > # this failure occurs before editor invocation
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	129 > commitfailure = $TESTTMP/commitfailure.py
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	130 > EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	131
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	132 $ hg qapplied
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	133 first-patch
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	134 second-patch
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	135 $ hg tip --template "{files}\n"
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	136 file2
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	137
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	138 (test that editor is not invoked before transaction starting)
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	139
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	140 $ rm -f .hg/last-message.txt
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	141 $ HGEDITOR="sh $TESTTMP/editor.sh" hg qrefresh -e
26780 bbf544b5f2e9 mq: consistently use qrefresh timeless@mozdev.org parents: 26751 diff changeset	142 qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	143 abort: emulating unexpected abort
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	144 [255]
21930 a5168eb9b2bc tests: cat error messages are different on Solaris Danek Duvall <danek.duvall@oracle.com> parents: 21924 diff changeset	145 $ test -f .hg/last-message.txt
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	146 [1]
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	147
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	148 (reset applied patches and directory status)
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	149
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	150 $ cat >> .hg/hgrc <<EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	151 > [extensions]
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	152 > commitfailure = !
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	153 > EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	154
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	155 $ hg qapplied
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	156 first-patch
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	157 $ hg status -A file2
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	158 ? file2
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	159 $ rm file2
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	160 $ hg qpush -q second-patch
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	161 now at: second-patch
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	162
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	163 (test that editor is invoked and commit message is saved into
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	164 "last-message.txt")
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	165
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	166 $ cat >> .hg/hgrc <<EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	167 > [hooks]
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	168 > # this failure occurs after editor invocation
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	169 > pretxncommit.unexpectedabort = false
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	170 > EOF
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	171
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	172 $ rm -f .hg/last-message.txt
21423 7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	173 $ hg status --rev "second-patch^1" -arm
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	174 A file2
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	175 $ HGEDITOR="sh $TESTTMP/editor.sh" hg qrefresh -e
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	176 ==== before editing
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	177 Fifth commit message
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	178 This is the 5th log message
21423 7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	179
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	180
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	181 HG: Enter commit message. Lines beginning with 'HG:' are removed.
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	182 HG: Leave message empty to use default message.
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	183 HG: --
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	184 HG: user: test
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	185 HG: branch 'default'
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	186 HG: added file2
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	187 ====
26998 4414d500604f localrepo: put bookmark move following commit in one transaction Laurent Charignon <lcharignon@fb.com> parents: 26780 diff changeset	188 note: commit message saved in .hg/last-message.txt
44733 c6d31e659a28 commit: tell user what to do with .hg/last-message.txt Martin von Zweigbergk <martinvonz@google.com> parents: 36284 diff changeset	189 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	190 transaction abort!
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	191 rollback completed
26780 bbf544b5f2e9 mq: consistently use qrefresh timeless@mozdev.org parents: 26751 diff changeset	192 qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	193 abort: pretxncommit.unexpectedabort hook exited with status 1
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	194 [255]
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	195 $ cat .hg/last-message.txt
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	196 Fifth commit message
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	197 This is the 5th log message
49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	198
21423 7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	199
7d408720453d mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21236 diff changeset	200
21236 49148d7868df qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17478 diff changeset	201 test saving last-message.txt
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	202
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 27055 diff changeset	203 Test visibility of in-memory dirstate changes outside transaction to
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	204 external process
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	205
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	206 $ cat > $TESTTMP/checkvisibility.sh <<EOF
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	207 > echo "===="
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	208 > hg parents --template "{rev}:{node\|short}\n"
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	209 > hg status -arm
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	210 > echo "===="
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	211 > EOF
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	212
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	213 == test visibility to external editor
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	214
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	215 $ hg update -C -q first-patch
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	216 $ rm -f file2
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	217 $ hg qpush -q second-patch --config hooks.pretxncommit.unexpectedabort=
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	218 now at: second-patch
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	219 $ echo bbbb >> file2
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	220
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	221 $ sh "$TESTTMP/checkvisibility.sh"
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	222 ====
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	223 1:e30108269082
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	224 M file2
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	225 ====
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	226
27055 5a0ffa245920 test-mq-qrefresh: drop single quoting of HGEDITOR value for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 26998 diff changeset	227 $ HGEDITOR="sh \"$TESTTMP/checkvisibility.sh\"" hg qrefresh -e
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	228 ====
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	229 0:25e397dabed2
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	230 A file2
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	231 ====
26998 4414d500604f localrepo: put bookmark move following commit in one transaction Laurent Charignon <lcharignon@fb.com> parents: 26780 diff changeset	232 note: commit message saved in .hg/last-message.txt
44733 c6d31e659a28 commit: tell user what to do with .hg/last-message.txt Martin von Zweigbergk <martinvonz@google.com> parents: 36284 diff changeset	233 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	234 transaction abort!
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	235 rollback completed
26780 bbf544b5f2e9 mq: consistently use qrefresh timeless@mozdev.org parents: 26751 diff changeset	236 qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	237 abort: pretxncommit.unexpectedabort hook exited with status 1
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	238 [255]
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	239
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	240 (rebuilding at failure of qrefresh bases on rev #0, and it causes
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	241 dropping status of "file2")
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	242
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	243 $ sh "$TESTTMP/checkvisibility.sh"
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	244 ====
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	245 0:25e397dabed2
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26587 diff changeset	246 ====
26751 520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	247
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	248 == test visibility to precommit external hook
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	249
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	250 $ hg update -C -q
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	251 $ rm -f file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	252 $ hg qpush -q second-patch --config hooks.pretxncommit.unexpectedabort=
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	253 now at: second-patch
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	254 $ echo bbbb >> file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	255
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	256 $ cat >> .hg/hgrc <<EOF
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	257 > [hooks]
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	258 > precommit.checkvisibility = sh "$TESTTMP/checkvisibility.sh"
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	259 > EOF
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	260
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	261 $ sh "$TESTTMP/checkvisibility.sh"
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	262 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	263 1:e30108269082
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	264 M file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	265 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	266
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	267 $ hg qrefresh
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	268 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	269 0:25e397dabed2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	270 A file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	271 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	272 transaction abort!
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	273 rollback completed
26780 bbf544b5f2e9 mq: consistently use qrefresh timeless@mozdev.org parents: 26751 diff changeset	274 qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
26751 520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	275 abort: pretxncommit.unexpectedabort hook exited with status 1
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	276 [255]
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	277
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	278 $ sh "$TESTTMP/checkvisibility.sh"
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	279 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	280 0:25e397dabed2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	281 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	282
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	283 $ cat >> .hg/hgrc <<EOF
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	284 > [hooks]
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	285 > precommit.checkvisibility =
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	286 > EOF
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	287
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	288 == test visibility to pretxncommit external hook
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	289
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	290 $ hg update -C -q
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	291 $ rm -f file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	292 $ hg qpush -q second-patch --config hooks.pretxncommit.unexpectedabort=
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	293 now at: second-patch
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	294 $ echo bbbb >> file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	295
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	296 $ cat >> .hg/hgrc <<EOF
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	297 > [hooks]
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	298 > pretxncommit.checkvisibility = sh "$TESTTMP/checkvisibility.sh"
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	299 > # make checkvisibility run before unexpectedabort
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	300 > priority.pretxncommit.checkvisibility = 10
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	301 > EOF
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	302
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	303 $ sh "$TESTTMP/checkvisibility.sh"
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	304 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	305 1:e30108269082
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	306 M file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	307 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	308
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	309 $ hg qrefresh
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	310 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	311 0:25e397dabed2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	312 A file2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	313 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	314 transaction abort!
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	315 rollback completed
26780 bbf544b5f2e9 mq: consistently use qrefresh timeless@mozdev.org parents: 26751 diff changeset	316 qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
26751 520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	317 abort: pretxncommit.unexpectedabort hook exited with status 1
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	318 [255]
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	319
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	320 $ sh "$TESTTMP/checkvisibility.sh"
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	321 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	322 0:25e397dabed2
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	323 ====
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	324
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	325 $ cat >> .hg/hgrc <<EOF
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	326 > [hooks]
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	327 > pretxncommit.checkvisibility =
520defbc0335 hook: centralize passing HG_PENDING to external hook process FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26750 diff changeset	328 > EOF

Mercurial > public > mercurial-scm > hg

annotate tests/test-mq-qrefresh-replace-log-message.t @ 45892:06b64fabf91c