mercurial-scm/hg: tests/test-commit-interactive.t annotate

annotate tests/test-commit-interactive.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	ac362d5a7893
children	00ae1fb6c459

rev	line source
12328 b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12316 diff changeset	1 Set up a repo
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2
23172 e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 23054 diff changeset	3 $ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 23054 diff changeset	4 > [ui]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 23054 diff changeset	5 > interactive = true
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 23054 diff changeset	6 > [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 23054 diff changeset	7 > record =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 23054 diff changeset	8 > EOF
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	9
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	10 $ hg init a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	11 $ cd a
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	12
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	13 Select no files
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	14
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	15 $ touch empty-rw
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	16 $ hg add empty-rw
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	17
25796 4eb8d8a44bf1 record: omit meaningless 'commit' suggestion at 'hg commit -i' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25759 diff changeset	18 $ hg record --config ui.interactive=false
4eb8d8a44bf1 record: omit meaningless 'commit' suggestion at 'hg commit -i' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25759 diff changeset	19 abort: running non-interactively, use commit instead
4eb8d8a44bf1 record: omit meaningless 'commit' suggestion at 'hg commit -i' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25759 diff changeset	20 [255]
4eb8d8a44bf1 record: omit meaningless 'commit' suggestion at 'hg commit -i' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25759 diff changeset	21 $ hg commit -i --config ui.interactive=false
4eb8d8a44bf1 record: omit meaningless 'commit' suggestion at 'hg commit -i' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25759 diff changeset	22 abort: running non-interactively
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42585 diff changeset	23 [10]
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	24 $ hg commit -i empty-rw<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	25 > n
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	26 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	27 diff --git a/empty-rw b/empty-rw
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	28 new file mode 100644
42071 db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	29 abort: empty commit message
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42585 diff changeset	30 [10]
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	31
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	32 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	33 changeset: -1:000000000000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	34 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	35 user:
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	36 date: Thu Jan 01 00:00:00 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	37
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	38
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	39
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	40 Select files but no hunks
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	41
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	42 $ hg commit -i empty-rw<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	43 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	44 > n
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	45 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	46 diff --git a/empty-rw b/empty-rw
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	47 new file mode 100644
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	48 abort: empty commit message
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42585 diff changeset	49 [10]
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	50
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	51 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	52 changeset: -1:000000000000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	53 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	54 user:
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	55 date: Thu Jan 01 00:00:00 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	56
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	57
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	58
28815 44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 27478 diff changeset	59 Abort for untracked
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 27478 diff changeset	60
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 27478 diff changeset	61 $ touch untracked
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 27478 diff changeset	62 $ hg commit -i -m should-fail empty-rw untracked
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 27478 diff changeset	63 abort: untracked: file not tracked!
45846 96ca817ec192 errors: raise InputError when given non-existent paths etc Martin von Zweigbergk <martinvonz@google.com> parents: 45827 diff changeset	64 [10]
28815 44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 27478 diff changeset	65 $ rm untracked
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 27478 diff changeset	66
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	67 Record empty file
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	68
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	69 $ hg commit -i -d '0 0' -m empty empty-rw<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	70 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	71 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	72 diff --git a/empty-rw b/empty-rw
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	73 new file mode 100644
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	74
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	75 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	76 changeset: 0:c0708cf4e46e
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	77 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	78 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	79 date: Thu Jan 01 00:00:00 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	80 summary: empty
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	81
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	82
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	83
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	84 Summary shows we updated to the new cset
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	85
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	86 $ hg summary
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	87 parent: 0:c0708cf4e46e tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	88 empty
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	89 branch: default
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	90 commit: (clean)
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	91 update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	92 phases: 1 draft
10964 aa0426c79664 test-record: add hg summary to verify we update dirstate Augie Fackler <durin42@gmail.com> parents: 8811 diff changeset	93
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	94 Rename empty file
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	95
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	96 $ hg mv empty-rw empty-rename
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	97 $ hg commit -i -d '1 0' -m rename<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	98 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	99 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	100 diff --git a/empty-rw b/empty-rename
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	101 rename from empty-rw
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	102 rename to empty-rename
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	103 examine changes to 'empty-rw' and 'empty-rename'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	104 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	105
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	106
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	107 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	108 changeset: 1:d695e8dcb197
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	109 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	110 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	111 date: Thu Jan 01 00:00:01 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	112 summary: rename
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	113
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	114
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	115
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	116 Copy empty file
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	117
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	118 $ hg cp empty-rename empty-copy
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	119 $ hg commit -i -d '2 0' -m copy<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	120 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	121 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	122 diff --git a/empty-rename b/empty-copy
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	123 copy from empty-rename
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	124 copy to empty-copy
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	125 examine changes to 'empty-rename' and 'empty-copy'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	126 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	127
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	128
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	129 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	130 changeset: 2:1d4b90bea524
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	131 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	132 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	133 date: Thu Jan 01 00:00:02 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	134 summary: copy
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	135
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	136
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	137
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	138 Delete empty file
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	139
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	140 $ hg rm empty-copy
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	141 $ hg commit -i -d '3 0' -m delete<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	142 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	143 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	144 diff --git a/empty-copy b/empty-copy
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	145 deleted file mode 100644
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	146 examine changes to 'empty-copy'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	147 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	148
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	149
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	150 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	151 changeset: 3:b39a238f01a1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	152 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	153 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	154 date: Thu Jan 01 00:00:03 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	155 summary: delete
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	156
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	157
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	158
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	159 Add binary file
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	160
26863 0879bf38ec84 test: enforce bundle1 in "test-commit-interactive.t" Pierre-Yves David <pierre-yves.david@fb.com> parents: 25796 diff changeset	161 $ hg bundle --type v1 --base -2 tip.bundle
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	162 1 changesets found
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	163 $ hg add tip.bundle
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	164 $ hg commit -i -d '4 0' -m binary<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	165 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	166 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	167 diff --git a/tip.bundle b/tip.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	168 new file mode 100644
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	169 this is a binary file
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	170 examine changes to 'tip.bundle'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	171 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	172
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	173
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	174 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	175 changeset: 4:ad816da3711e
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	176 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	177 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	178 date: Thu Jan 01 00:00:04 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	179 summary: binary
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	180
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	181 diff -r b39a238f01a1 -r ad816da3711e tip.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	182 Binary file tip.bundle has changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	183
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	184
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	185 Change binary file
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	186
26863 0879bf38ec84 test: enforce bundle1 in "test-commit-interactive.t" Pierre-Yves David <pierre-yves.david@fb.com> parents: 25796 diff changeset	187 $ hg bundle --base -2 --type v1 tip.bundle
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	188 1 changesets found
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	189 $ hg commit -i -d '5 0' -m binary-change<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	190 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	191 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	192 diff --git a/tip.bundle b/tip.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	193 this modifies a binary file (all or nothing)
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	194 examine changes to 'tip.bundle'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	195 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	196
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	197
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	198 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	199 changeset: 5:dccd6f3eb485
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	200 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	201 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	202 date: Thu Jan 01 00:00:05 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	203 summary: binary-change
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	204
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	205 diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	206 Binary file tip.bundle has changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	207
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	208
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	209 Rename and change binary file
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	210
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	211 $ hg mv tip.bundle top.bundle
26863 0879bf38ec84 test: enforce bundle1 in "test-commit-interactive.t" Pierre-Yves David <pierre-yves.david@fb.com> parents: 25796 diff changeset	212 $ hg bundle --base -2 --type v1 top.bundle
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	213 1 changesets found
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	214 $ hg commit -i -d '6 0' -m binary-change-rename<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	215 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	216 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	217 diff --git a/tip.bundle b/top.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	218 rename from tip.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	219 rename to top.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	220 this modifies a binary file (all or nothing)
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	221 examine changes to 'tip.bundle' and 'top.bundle'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	222 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	223
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	224
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	225 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	226 changeset: 6:7fa44105f5b3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	227 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	228 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	229 date: Thu Jan 01 00:00:06 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	230 summary: binary-change-rename
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	231
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	232 diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	233 Binary file tip.bundle has changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	234 diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	235 Binary file top.bundle has changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	236
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	237
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	238 Add plain file
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	239
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	240 $ for i in 1 2 3 4 5 6 7 8 9 10; do
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	241 > echo $i >> plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	242 > done
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	243
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	244 $ hg add plain
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	245 $ hg commit -i -d '7 0' -m plain plain<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	246 > y
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	247 > y
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	248 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	249 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	250 new file mode 100644
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	251 @@ -0,0 +1,10 @@
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	252 +1
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	253 +2
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	254 +3
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	255 +4
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	256 +5
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	257 +6
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	258 +7
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	259 +8
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	260 +9
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	261 +10
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	262 record this change to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	263 (enter ? for help) [Ynesfdaq?] y
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	264
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	265 $ hg tip -p
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	266 changeset: 7:11fb457c1be4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	267 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	268 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	269 date: Thu Jan 01 00:00:07 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	270 summary: plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	271
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	272 diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	273 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	274 +++ b/plain Thu Jan 01 00:00:07 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	275 @@ -0,0 +1,10 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	276 +1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	277 +2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	278 +3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	279 +4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	280 +5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	281 +6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	282 +7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	283 +8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	284 +9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	285 +10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	286
17446 3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	287 Modify end of plain file with username unset
3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	288
3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	289 $ echo 11 >> plain
3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	290 $ unset HGUSER
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	291 $ hg commit -i --config ui.username= -d '8 0' -m end plain
20579 625533523c9e tests: fix up config --edit breakage Matt Mackall <mpm@selenic.com> parents: 20266 diff changeset	292 abort: no username supplied
28962 ad2cd2ef25d9 config: use single quotes around command hint timeless <timeless@mozdev.org> parents: 28815 diff changeset	293 (use 'hg config --edit' to set your username)
17446 3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	294 [255]
3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	295
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	296
18266 09a2b6741695 record: use patch.diffopts to account for user diffopts Denis Laxalde <denis@laxalde.org> parents: 17446 diff changeset	297 Modify end of plain file, also test that diffopts are accounted for
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	298
17446 3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	299 $ HGUSER="test"
3de04c07966a record: checks for valid username before starting recording process (issue3456) Sumeet <sumeet@fb.com> parents: 16913 diff changeset	300 $ export HGUSER
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	301 $ hg commit -i --config diff.showfunc=true -d '8 0' -m end plain <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	302 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	303 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	304 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	305 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	306 1 hunks, 1 lines changed
18266 09a2b6741695 record: use patch.diffopts to account for user diffopts Denis Laxalde <denis@laxalde.org> parents: 17446 diff changeset	307 @@ -8,3 +8,4 @@ 7
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	308 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	309 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	310 10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	311 +11
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	312 record this change to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	313 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	314
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	315
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	316 Modify end of plain file, no EOL
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	317
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	318 $ hg tip --template '{node}' >> plain
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	319 $ hg commit -i -d '9 0' -m noeol plain <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	320 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	321 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	322 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	323 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	324 1 hunks, 1 lines changed
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	325 @@ -9,3 +9,4 @@ 8
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	326 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	327 10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	328 11
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	329 +7264f99c5f5ff3261504828afa4fb4d406c3af54
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	330 \ No newline at end of file
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	331 record this change to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	332 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	333
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	334
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	335 Record showfunc should preserve function across sections
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	336
40205 89ba51c3e4f1 tests: use NO_CHECK_EOF for fragments having intentional error FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39707 diff changeset	337 $ cat > f1.py <<NO_CHECK_EOF
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	338 > def annotate(ui, repo, pats, *opts):
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	339 > """show changeset information by line for each file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	340 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	341 > List changes in files, showing the revision id responsible for
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	342 > each line.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	343 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	344 > This command is useful for discovering when a change was made and
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	345 > by whom.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	346 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	347 > If you include -f/-u/-d, the revision number is suppressed unless
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	348 > you also include -the revision number is suppressed unless
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	349 > you also include -n.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	350 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	351 > Without the -a/--text option, annotate will avoid processing files
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	352 > it detects as binary. With -a, annotate will annotate the file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	353 > anyway, although the results will probably be neither useful
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	354 > nor desirable.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	355 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	356 > Returns 0 on success.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	357 > """
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	358 > return 0
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	359 > def archive(ui, repo, dest, **opts):
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	360 > '''create an unversioned archive of a repository revision
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	361 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	362 > By default, the revision used is the parent of the working
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	363 > directory; use -r/--rev to specify a different revision.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	364 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	365 > The archive type is automatically detected based on file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	366 > extension (to override, use -t/--type).
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	367 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	368 > .. container:: verbose
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	369 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	370 > Valid types are:
40205 89ba51c3e4f1 tests: use NO_CHECK_EOF for fragments having intentional error FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39707 diff changeset	371 > NO_CHECK_EOF
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	372 $ hg add f1.py
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	373 $ hg commit -m funcs
40205 89ba51c3e4f1 tests: use NO_CHECK_EOF for fragments having intentional error FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39707 diff changeset	374 $ cat > f1.py <<NO_CHECK_EOF
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	375 > def annotate(ui, repo, pats, *opts):
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	376 > """show changeset information by line for each file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	377 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	378 > List changes in files, showing the revision id responsible for
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	379 > each line
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	380 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	381 > This command is useful for discovering when a change was made and
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	382 > by whom.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	383 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	384 > Without the -a/--text option, annotate will avoid processing files
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	385 > it detects as binary. With -a, annotate will annotate the file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	386 > anyway, although the results will probably be neither useful
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	387 > nor desirable.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	388 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	389 > Returns 0 on success.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	390 > """
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	391 > return 0
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	392 > def archive(ui, repo, dest, **opts):
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	393 > '''create an unversioned archive of a repository revision
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	394 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	395 > By default, the revision used is the parent of the working
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	396 > directory; use -r/--rev to specify a different revision.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	397 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	398 > The archive type is automatically detected based on file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	399 > extension (or override using -t/--type).
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	400 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	401 > .. container:: verbose
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	402 >
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	403 > Valid types are:
40205 89ba51c3e4f1 tests: use NO_CHECK_EOF for fragments having intentional error FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39707 diff changeset	404 > NO_CHECK_EOF
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	405 $ hg commit -i -m interactive <<EOF
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	406 > y
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	407 > y
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	408 > y
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	409 > y
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	410 > EOF
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	411 diff --git a/f1.py b/f1.py
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	412 3 hunks, 6 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	413 examine changes to 'f1.py'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	414 (enter ? for help) [Ynesfdaq?] y
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	415
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	416 @@ -2,8 +2,8 @@ def annotate(ui, repo, pats, *opts):
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	417 """show changeset information by line for each file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	418
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	419 List changes in files, showing the revision id responsible for
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	420 - each line.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	421 + each line
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	422
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	423 This command is useful for discovering when a change was made and
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	424 by whom.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	425
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	426 record change 1/3 to 'f1.py'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	427 (enter ? for help) [Ynesfdaq?] y
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	428
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	429 @@ -6,11 +6,7 @@ def annotate(ui, repo, pats, *opts):
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	430
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	431 This command is useful for discovering when a change was made and
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	432 by whom.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	433
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	434 - If you include -f/-u/-d, the revision number is suppressed unless
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	435 - you also include -the revision number is suppressed unless
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	436 - you also include -n.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	437 -
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	438 Without the -a/--text option, annotate will avoid processing files
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	439 it detects as binary. With -a, annotate will annotate the file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	440 anyway, although the results will probably be neither useful
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	441 record change 2/3 to 'f1.py'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	442 (enter ? for help) [Ynesfdaq?] y
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	443
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	444 @@ -26,7 +22,7 @@ def archive(ui, repo, dest, **opts):
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	445 directory; use -r/--rev to specify a different revision.
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	446
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	447 The archive type is automatically detected based on file
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	448 - extension (to override, use -t/--type).
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	449 + extension (or override using -t/--type).
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	450
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	451 .. container:: verbose
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	452
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	453 record change 3/3 to 'f1.py'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	454 (enter ? for help) [Ynesfdaq?] y
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	455
14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	456
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	457 Modify end of plain file, add EOL
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	458
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	459 $ echo >> plain
13292 d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	460 $ echo 1 > plain2
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	461 $ hg add plain2
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	462 $ hg commit -i -d '10 0' -m eol plain plain2 <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	463 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	464 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	465 > y
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	466 > y
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	467 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	468 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	469 1 hunks, 1 lines changed
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	470 @@ -9,4 +9,4 @@ 8
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	471 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	472 10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	473 11
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	474 -7264f99c5f5ff3261504828afa4fb4d406c3af54
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	475 \ No newline at end of file
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	476 +7264f99c5f5ff3261504828afa4fb4d406c3af54
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	477 record change 1/2 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	478 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	479
13292 d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	480 diff --git a/plain2 b/plain2
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	481 new file mode 100644
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	482 @@ -0,0 +1,1 @@
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	483 +1
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	484 record change 2/2 to 'plain2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	485 (enter ? for help) [Ynesfdaq?] y
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	486
13292 d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	487 Modify beginning, trim end, record both, add another file to test
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	488 changes numbering
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	489
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	490 $ rm plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	491 $ for i in 2 2 3 4 5 6 7 8 9 10; do
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	492 > echo $i >> plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	493 > done
13292 d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	494 $ echo 2 >> plain2
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	495
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	496 $ hg commit -i -d '10 0' -m begin-and-end plain plain2 <<EOF
13292 d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	497 > y
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	498 > y
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	499 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	500 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	501 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	502 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	503 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	504 2 hunks, 3 lines changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	505 @@ -1,4 +1,4 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	506 -1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	507 +2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	508 2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	509 3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	510 4
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	511 record change 1/3 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	512 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	513
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	514 @@ -8,5 +8,3 @@ 7
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	515 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	516 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	517 10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	518 -11
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	519 -7264f99c5f5ff3261504828afa4fb4d406c3af54
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	520 record change 2/3 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	521 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	522
13292 d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	523 diff --git a/plain2 b/plain2
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	524 1 hunks, 1 lines changed
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	525 @@ -1,1 +1,2 @@
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	526 1
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	527 +2
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	528 record change 3/3 to 'plain2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	529 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	530
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	531
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	532 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	533 changeset: 13:f941910cff62
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	534 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	535 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	536 date: Thu Jan 01 00:00:10 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	537 summary: begin-and-end
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	538
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	539 diff -r 33abe24d946c -r f941910cff62 plain
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	540 --- a/plain Thu Jan 01 00:00:10 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	541 +++ b/plain Thu Jan 01 00:00:10 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	542 @@ -1,4 +1,4 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	543 -1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	544 +2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	545 2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	546 3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	547 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	548 @@ -8,5 +8,3 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	549 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	550 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	551 10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	552 -11
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	553 -7264f99c5f5ff3261504828afa4fb4d406c3af54
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	554 diff -r 33abe24d946c -r f941910cff62 plain2
13292 d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	555 --- a/plain2 Thu Jan 01 00:00:10 1970 +0000
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	556 +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	557 @@ -1,1 +1,2 @@
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	558 1
d32e09769048 test-record: test peculiar changes numbering Patrick Mezard <pmezard@gmail.com> parents: 13023 diff changeset	559 +2
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	560
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	561
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	562 Trim beginning, modify end
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	563
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	564 $ rm plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	565 > for i in 4 5 6 7 8 9 10.new; do
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	566 > echo $i >> plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	567 > done
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	568
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	569 Record end
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	570
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	571 $ hg commit -i -d '11 0' -m end-only plain <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	572 > n
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	573 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	574 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	575 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	576 2 hunks, 4 lines changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	577 @@ -1,9 +1,6 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	578 -2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	579 -2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	580 -3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	581 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	582 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	583 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	584 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	585 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	586 9
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	587 record change 1/2 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	588 (enter ? for help) [Ynesfdaq?] n
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	589
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	590 @@ -4,7 +1,7 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	591 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	592 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	593 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	594 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	595 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	596 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	597 -10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	598 +10.new
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	599 record change 2/2 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	600 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	601
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	602
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	603 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	604 changeset: 14:4915f538659b
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	605 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	606 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	607 date: Thu Jan 01 00:00:11 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	608 summary: end-only
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	609
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	610 diff -r f941910cff62 -r 4915f538659b plain
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	611 --- a/plain Thu Jan 01 00:00:10 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	612 +++ b/plain Thu Jan 01 00:00:11 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	613 @@ -7,4 +7,4 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	614 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	615 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	616 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	617 -10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	618 +10.new
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	619
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	620
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	621 Record beginning
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	622
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	623 $ hg commit -i -d '12 0' -m begin-only plain <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	624 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	625 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	626 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	627 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	628 1 hunks, 3 lines changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	629 @@ -1,6 +1,3 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	630 -2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	631 -2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	632 -3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	633 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	634 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	635 6
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	636 record this change to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	637 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	638
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	639
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	640 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	641 changeset: 15:1b1f93d4b94b
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	642 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	643 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	644 date: Thu Jan 01 00:00:12 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	645 summary: begin-only
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	646
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	647 diff -r 4915f538659b -r 1b1f93d4b94b plain
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	648 --- a/plain Thu Jan 01 00:00:11 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	649 +++ b/plain Thu Jan 01 00:00:12 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	650 @@ -1,6 +1,3 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	651 -2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	652 -2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	653 -3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	654 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	655 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	656 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	657
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	658
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	659 Add to beginning, trim from end
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	660
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	661 $ rm plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	662 $ for i in 1 2 3 4 5 6 7 8 9; do
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	663 > echo $i >> plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	664 > done
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	665
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	666 Record end
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	667
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	668 $ hg commit -i --traceback -d '13 0' -m end-again plain<<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	669 > n
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	670 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	671 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	672 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	673 2 hunks, 4 lines changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	674 @@ -1,6 +1,9 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	675 +1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	676 +2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	677 +3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	678 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	679 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	680 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	681 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	682 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	683 9
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	684 record change 1/2 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	685 (enter ? for help) [Ynesfdaq?] n
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	686
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	687 @@ -1,7 +4,6 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	688 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	689 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	690 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	691 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	692 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	693 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	694 -10.new
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	695 record change 2/2 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	696 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	697
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	698
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	699 Add to beginning, middle, end
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	700
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	701 $ rm plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	702 $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	703 > echo $i >> plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	704 > done
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	705
23435 486a1fe09422 record: don't honor format-changing diffopts (issue4459) Siddharth Agarwal <sid0@fb.com> parents: 23172 diff changeset	706 Record beginning, middle, and test that format-breaking diffopts are ignored
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	707
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	708 $ hg commit -i --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	709 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	710 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	711 > n
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	712 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	713 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	714 3 hunks, 7 lines changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	715 @@ -1,2 +1,5 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	716 +1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	717 +2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	718 +3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	719 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	720 5
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	721 record change 1/3 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	722 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	723
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	724 @@ -1,6 +4,8 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	725 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	726 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	727 +5.new
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	728 +5.reallynew
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	729 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	730 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	731 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	732 9
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	733 record change 2/3 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	734 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	735
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	736 @@ -3,4 +8,6 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	737 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	738 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	739 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	740 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	741 +10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	742 +11
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	743 record change 3/3 to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	744 (enter ? for help) [Ynesfdaq?] n
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	745
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	746
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	747 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	748 changeset: 17:41cf3f5c55ae
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	749 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	750 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	751 date: Thu Jan 01 00:00:14 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	752 summary: middle-only
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	753
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	754 diff -r a69d252246e1 -r 41cf3f5c55ae plain
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	755 --- a/plain Thu Jan 01 00:00:13 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	756 +++ b/plain Thu Jan 01 00:00:14 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	757 @@ -1,5 +1,10 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	758 +1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	759 +2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	760 +3
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	761 4
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	762 5
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	763 +5.new
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	764 +5.reallynew
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	765 6
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	766 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	767 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	768
5037 b2607267236d Add record extension, giving darcs-like interactive hunk picking Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	769
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	770 Record end
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	771
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	772 $ hg commit -i -d '15 0' -m end-only plain <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	773 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	774 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	775 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	776 diff --git a/plain b/plain
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	777 1 hunks, 2 lines changed
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	778 @@ -9,3 +9,5 @@ 6
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	779 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	780 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	781 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	782 +10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	783 +11
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	784 record this change to 'plain'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	785 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	786
5128 c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5037 diff changeset	787
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	788 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	789 changeset: 18:58a72f46bc24
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	790 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	791 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	792 date: Thu Jan 01 00:00:15 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	793 summary: end-only
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	794
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	795 diff -r 41cf3f5c55ae -r 58a72f46bc24 plain
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	796 --- a/plain Thu Jan 01 00:00:14 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	797 +++ b/plain Thu Jan 01 00:00:15 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	798 @@ -9,3 +9,5 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	799 7
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	800 8
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	801 9
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	802 +10
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	803 +11
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	804
42253 e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	805 Interactive commit can name a directory instead of files (issue6131)
5128 c9126c24e098 record: work properly if invoked in a subdirectory Bryan O'Sullivan <bos@serpentine.com> parents: 5037 diff changeset	806
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	807 $ mkdir subdir
42253 e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	808 $ echo a > subdir/a
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	809 $ hg ci -d '16 0' -i subdir -Amsubdir <<EOF
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	810 > y
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	811 > y
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	812 > EOF
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	813 adding subdir/a
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	814 diff --git a/subdir/a b/subdir/a
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	815 new file mode 100644
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	816 examine changes to 'subdir/a'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	817 (enter ? for help) [Ynesfdaq?] y
42253 e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	818
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	819 @@ -0,0 +1,1 @@
e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	820 +a
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	821 record this change to 'subdir/a'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	822 (enter ? for help) [Ynesfdaq?] y
42253 e45c6b153e51 commit: allow --interactive to work again when naming a directory (issue6131) Matt Harbison <matt_harbison@yahoo.com> parents: 42071 diff changeset	823
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	824 $ cd subdir
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	825
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	826 $ echo a >> a
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	827 $ hg commit -i -d '16 0' -m subdir-change a <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	828 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	829 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	830 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	831 diff --git a/subdir/a b/subdir/a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	832 1 hunks, 1 lines changed
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	833 @@ -1,1 +1,2 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	834 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	835 +a
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	836 record this change to 'subdir/a'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	837 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	838
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	839
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	840 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	841 changeset: 20:e0f6b99f6c49
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	842 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	843 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	844 date: Thu Jan 01 00:00:16 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	845 summary: subdir-change
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	846
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	847 diff -r abd26b51de37 -r e0f6b99f6c49 subdir/a
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	848 --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	849 +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	850 @@ -1,1 +1,2 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	851 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	852 +a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	853
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	854
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	855 $ echo a > f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	856 $ echo b > f2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	857 $ hg add f1 f2
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	858
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	859 $ hg ci -mz -d '17 0'
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	860
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	861 $ echo a >> f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	862 $ echo b >> f2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	863
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	864 Help, quit
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	865
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	866 $ hg commit -i <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	867 > ?
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	868 > q
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	869 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	870 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	871 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	872 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	873 (enter ? for help) [Ynesfdaq?] ?
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	874
20266 061766323061 record: use "ui.extractchoices()" to get the list of available responses FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20171 diff changeset	875 y - yes, record this change
061766323061 record: use "ui.extractchoices()" to get the list of available responses FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20171 diff changeset	876 n - no, skip this change
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	877 e - edit this change manually
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	878 s - skip remaining changes to this file
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	879 f - record remaining changes to this file
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	880 d - done, skip remaining changes and files
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	881 a - record all changes to all remaining files
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	882 q - quit, recording no changes
20266 061766323061 record: use "ui.extractchoices()" to get the list of available responses FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20171 diff changeset	883 ? - ? (display help)
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	884 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	885 (enter ? for help) [Ynesfdaq?] q
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	886
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	887 abort: user quit
45877 ac362d5a7893 errors: introduce CanceledError and use it in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 45846 diff changeset	888 [250]
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	889
42071 db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	890 Patterns
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	891
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	892 $ hg commit -i 'glob:f*' << EOF
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	893 > y
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	894 > n
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	895 > y
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	896 > n
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	897 > EOF
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	898 diff --git a/subdir/f1 b/subdir/f1
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	899 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	900 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	901 (enter ? for help) [Ynesfdaq?] y
42071 db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	902
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	903 @@ -1,1 +1,2 @@
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	904 a
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	905 +a
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	906 record change 1/2 to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	907 (enter ? for help) [Ynesfdaq?] n
42071 db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	908
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	909 diff --git a/subdir/f2 b/subdir/f2
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	910 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	911 examine changes to 'subdir/f2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	912 (enter ? for help) [Ynesfdaq?] y
42071 db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	913
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	914 @@ -1,1 +1,2 @@
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	915 b
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	916 +b
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	917 record change 2/2 to 'subdir/f2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	918 (enter ? for help) [Ynesfdaq?] n
42071 db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	919
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	920 no changes to record
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	921 [1]
db72f9f6580e interactive: do not prompt about files given in command line Denis Laxalde <denis.laxalde@logilab.fr> parents: 41560 diff changeset	922
29154 9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	923 #if gettext
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	924
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	925 Test translated help message
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	926
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	927 str.lower() instead of encoding.lower(str) on translated message might
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	928 make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z)
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	929 as the second or later byte of multi-byte character.
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	930
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	931 For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932)
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	932 contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	933 replacement makes message meaningless.
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	934
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	935 This tests that translated help message is lower()-ed correctly.
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	936
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	937 $ LANGUAGE=ja
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	938 $ export LANGUAGE
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	939
29180 8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	940 $ cat > $TESTTMP/escape.py <<EOF
8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	941 > from __future__ import absolute_import
36839 5b9ae9eca94a py3: make test-commit-interactive.t byte-safe Yuya Nishihara <yuya@tcha.org> parents: 32940 diff changeset	942 > from mercurial import (
5b9ae9eca94a py3: make test-commit-interactive.t byte-safe Yuya Nishihara <yuya@tcha.org> parents: 32940 diff changeset	943 > pycompat,
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36839 diff changeset	944 > )
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36839 diff changeset	945 > from mercurial.utils import (
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36839 diff changeset	946 > procutil,
36839 5b9ae9eca94a py3: make test-commit-interactive.t byte-safe Yuya Nishihara <yuya@tcha.org> parents: 32940 diff changeset	947 > )
29180 8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	948 > def escape(c):
8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	949 > o = ord(c)
8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	950 > if o < 0x80:
8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	951 > return c
8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	952 > else:
36839 5b9ae9eca94a py3: make test-commit-interactive.t byte-safe Yuya Nishihara <yuya@tcha.org> parents: 32940 diff changeset	953 > return br'\x%02x' % o # escape char setting MSB
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36839 diff changeset	954 > for l in procutil.stdin:
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36839 diff changeset	955 > procutil.stdout.write(
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36839 diff changeset	956 > b''.join(escape(c) for c in pycompat.iterbytestr(l)))
29180 8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	957 > EOF
8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	958
39707 5abc47d4ca6b tests: quote PYTHON usage Matt Harbison <matt_harbison@yahoo.com> parents: 37119 diff changeset	959 $ hg commit -i --encoding cp932 2>&1 <<EOF \| "$PYTHON" $TESTTMP/escape.py \| grep '^y - '
29154 9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	960 > ?
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	961 > q
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	962 > EOF
29180 8c5e880c7e25 tests: escape bytes setting MSB in input of grep for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29154 diff changeset	963 y - \x82\xb1\x82\xcc\x95\xcf\x8dX\x82\xf0\x8bL\x98^(yes)
29154 9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	964
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	965 $ LANGUAGE=
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	966 #endif
9d38a2061fd8 patch: show lower-ed translated message correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28962 diff changeset	967
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	968 Skip
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	969
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	970 $ hg commit -i <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	971 > s
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	972 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	973 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	974 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	975 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	976 (enter ? for help) [Ynesfdaq?] s
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	977
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	978 diff --git a/subdir/f2 b/subdir/f2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	979 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	980 examine changes to 'subdir/f2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	981 (enter ? for help) [Ynesfdaq?] abort: response expected
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12074 diff changeset	982 [255]
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	983
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	984 No
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	985
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	986 $ hg commit -i <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	987 > n
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	988 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	989 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	990 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	991 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	992 (enter ? for help) [Ynesfdaq?] n
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	993
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	994 diff --git a/subdir/f2 b/subdir/f2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	995 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	996 examine changes to 'subdir/f2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	997 (enter ? for help) [Ynesfdaq?] abort: response expected
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12074 diff changeset	998 [255]
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	999
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1000 f, quit
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	1001
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1002 $ hg commit -i <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1003 > f
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1004 > q
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1005 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1006 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1007 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1008 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1009 (enter ? for help) [Ynesfdaq?] f
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1010
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1011 diff --git a/subdir/f2 b/subdir/f2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1012 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1013 examine changes to 'subdir/f2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1014 (enter ? for help) [Ynesfdaq?] q
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1015
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1016 abort: user quit
45877 ac362d5a7893 errors: introduce CanceledError and use it in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 45846 diff changeset	1017 [250]
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1018
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1019 s, all
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	1020
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1021 $ hg commit -i -d '18 0' -mx <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1022 > s
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1023 > a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1024 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1025 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1026 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1027 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1028 (enter ? for help) [Ynesfdaq?] s
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1029
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1030 diff --git a/subdir/f2 b/subdir/f2
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1031 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1032 examine changes to 'subdir/f2'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1033 (enter ? for help) [Ynesfdaq?] a
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1034
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	1035
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1036 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1037 changeset: 22:6afbbefacf35
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1038 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1039 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1040 date: Thu Jan 01 00:00:18 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1041 summary: x
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1042
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1043 diff -r b73c401c693c -r 6afbbefacf35 subdir/f2
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1044 --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1045 +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1046 @@ -1,1 +1,2 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1047 b
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1048 +b
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1049
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1050
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	1051 f
67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	1052
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1053 $ hg commit -i -d '19 0' -my <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1054 > f
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1055 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1056 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1057 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1058 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1059 (enter ? for help) [Ynesfdaq?] f
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1060
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	1061
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1062 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1063 changeset: 23:715028a33949
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1064 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1065 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1066 date: Thu Jan 01 00:00:19 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1067 summary: y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1068
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1069 diff -r 6afbbefacf35 -r 715028a33949 subdir/f1
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1070 --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1071 +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1072 @@ -1,1 +1,2 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1073 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1074 +a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1075
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1076
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1077 #if execbit
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1078
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1079 Preserve chmod +x
5154 67afecb8d6cc record: improve docs, improve prompts Bryan O'Sullivan <bos@serpentine.com> parents: 5128 diff changeset	1080
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1081 $ chmod +x f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1082 $ echo a >> f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1083 $ hg commit -i -d '20 0' -mz <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1084 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1085 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1086 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1087 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1088 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1089 old mode 100644
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1090 new mode 100755
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1091 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1092 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1093 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1094
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1095 @@ -1,2 +1,3 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1096 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1097 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1098 +a
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1099 record this change to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1100 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1101
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 5154 diff changeset	1102
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1103 $ hg tip --config diff.git=True -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1104 changeset: 24:db967c1e5884
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1105 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1106 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1107 date: Thu Jan 01 00:00:20 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1108 summary: z
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1109
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1110 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1111 old mode 100644
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1112 new mode 100755
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1113 --- a/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1114 +++ b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1115 @@ -1,2 +1,3 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1116 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1117 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1118 +a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1119
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 5154 diff changeset	1120
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1121 Preserve execute permission on original
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1122
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1123 $ echo b >> f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1124 $ hg commit -i -d '21 0' -maa <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1125 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1126 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1127 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1128 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1129 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1130 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1131 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1132 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1133
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1134 @@ -1,3 +1,4 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1135 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1136 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1137 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1138 +b
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1139 record this change to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1140 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1141
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 5154 diff changeset	1142
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1143 $ hg tip --config diff.git=True -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1144 changeset: 25:88903aef81c3
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1145 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1146 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1147 date: Thu Jan 01 00:00:21 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1148 summary: aa
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1149
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1150 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1151 --- a/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1152 +++ b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1153 @@ -1,3 +1,4 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1154 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1155 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1156 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1157 +b
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1158
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 5154 diff changeset	1159
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1160 Preserve chmod -x
7718 6fa7b6fb90a9 record: do not lose permission changes on commit Steve Borho <steve@borho.org> parents: 5154 diff changeset	1161
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1162 $ chmod -x f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1163 $ echo c >> f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1164 $ hg commit -i -d '22 0' -mab <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1165 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1166 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1167 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1168 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1169 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1170 old mode 100755
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1171 new mode 100644
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1172 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1173 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1174 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1175
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	1176 @@ -2,3 +2,4 @@ a
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1177 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1178 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1179 b
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1180 +c
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1181 record this change to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1182 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1183
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 7718 diff changeset	1184
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1185 $ hg tip --config diff.git=True -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1186 changeset: 26:7af84b6cf560
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1187 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1188 user: test
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1189 date: Thu Jan 01 00:00:22 1970 +0000
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1190 summary: ab
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1191
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1192 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1193 old mode 100755
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1194 new mode 100644
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1195 --- a/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1196 +++ b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1197 @@ -2,3 +2,4 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1198 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1199 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1200 b
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1201 +c
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1202
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1203
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1204 #else
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1205
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1206 Slightly bogus tests to get almost same repo structure as when x bit is used
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1207 - but with different hashes.
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1208
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1209 Mock "Preserve chmod +x"
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1210
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1211 $ echo a >> f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1212 $ hg commit -i -d '20 0' -mz <<EOF
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1213 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1214 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1215 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1216 > EOF
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1217 diff --git a/subdir/f1 b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1218 1 hunks, 1 lines changed
42585 ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1219 examine changes to 'subdir/f1'?
ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1220 (enter ? for help) [Ynesfdaq?] y
23054 40c01f95449b tests: adjust expected prompt choice outputs in test-record.t for Windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22589 diff changeset	1221
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1222 @@ -1,2 +1,3 @@
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1223 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1224 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1225 +a
42585 ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1226 record this change to 'subdir/f1'?
ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1227 (enter ? for help) [Ynesfdaq?] y
23054 40c01f95449b tests: adjust expected prompt choice outputs in test-record.t for Windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22589 diff changeset	1228
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1229
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1230 $ hg tip --config diff.git=True -p
27478 baa9810ee3ec test-commit-interactive: updates for the no-execbit case Matt Harbison <matt_harbison@yahoo.com> parents: 27412 diff changeset	1231 changeset: 24:c26cfe2c4eb0
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1232 tag: tip
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1233 user: test
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1234 date: Thu Jan 01 00:00:20 1970 +0000
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1235 summary: z
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1236
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1237 diff --git a/subdir/f1 b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1238 --- a/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1239 +++ b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1240 @@ -1,2 +1,3 @@
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1241 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1242 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1243 +a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1244
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1245
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1246 Mock "Preserve execute permission on original"
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1247
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1248 $ echo b >> f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1249 $ hg commit -i -d '21 0' -maa <<EOF
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1250 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1251 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1252 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1253 > EOF
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1254 diff --git a/subdir/f1 b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1255 1 hunks, 1 lines changed
42585 ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1256 examine changes to 'subdir/f1'?
ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1257 (enter ? for help) [Ynesfdaq?] y
23054 40c01f95449b tests: adjust expected prompt choice outputs in test-record.t for Windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22589 diff changeset	1258
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1259 @@ -1,3 +1,4 @@
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1260 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1261 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1262 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1263 +b
42585 ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1264 record this change to 'subdir/f1'?
ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1265 (enter ? for help) [Ynesfdaq?] y
23054 40c01f95449b tests: adjust expected prompt choice outputs in test-record.t for Windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22589 diff changeset	1266
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1267
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1268 $ hg tip --config diff.git=True -p
27478 baa9810ee3ec test-commit-interactive: updates for the no-execbit case Matt Harbison <matt_harbison@yahoo.com> parents: 27412 diff changeset	1269 changeset: 25:a48d2d60adde
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1270 tag: tip
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1271 user: test
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1272 date: Thu Jan 01 00:00:21 1970 +0000
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1273 summary: aa
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1274
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1275 diff --git a/subdir/f1 b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1276 --- a/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1277 +++ b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1278 @@ -1,3 +1,4 @@
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1279 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1280 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1281 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1282 +b
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1283
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1284
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1285 Mock "Preserve chmod -x"
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1286
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1287 $ chmod -x f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1288 $ echo c >> f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1289 $ hg commit -i -d '22 0' -mab <<EOF
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1290 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1291 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1292 > y
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1293 > EOF
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1294 diff --git a/subdir/f1 b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1295 1 hunks, 1 lines changed
42585 ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1296 examine changes to 'subdir/f1'?
ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1297 (enter ? for help) [Ynesfdaq?] y
23054 40c01f95449b tests: adjust expected prompt choice outputs in test-record.t for Windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22589 diff changeset	1298
27478 baa9810ee3ec test-commit-interactive: updates for the no-execbit case Matt Harbison <matt_harbison@yahoo.com> parents: 27412 diff changeset	1299 @@ -2,3 +2,4 @@ a
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1300 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1301 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1302 b
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1303 +c
42585 ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1304 record this change to 'subdir/f1'?
ebf353aa4385 tests: update test-commit-interactive.t for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 42566 diff changeset	1305 (enter ? for help) [Ynesfdaq?] y
23054 40c01f95449b tests: adjust expected prompt choice outputs in test-record.t for Windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22589 diff changeset	1306
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1307
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1308 $ hg tip --config diff.git=True -p
27478 baa9810ee3ec test-commit-interactive: updates for the no-execbit case Matt Harbison <matt_harbison@yahoo.com> parents: 27412 diff changeset	1309 changeset: 26:5cc89ae210fa
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1310 tag: tip
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1311 user: test
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1312 date: Thu Jan 01 00:00:22 1970 +0000
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1313 summary: ab
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1314
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1315 diff --git a/subdir/f1 b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1316 --- a/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1317 +++ b/subdir/f1
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1318 @@ -2,3 +2,4 @@
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1319 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1320 a
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1321 b
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1322 +c
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1323
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1324
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1325 #endif
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1326
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1327 $ cd ..
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1328
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1329
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1330 Abort early when a merge is in progress
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1331
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1332 $ hg up 4
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1333 1 files updated, 0 files merged, 7 files removed, 0 files unresolved
11237 feb2a58fc592 record: check that we are not committing a merge before patch selection Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8811 diff changeset	1334
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1335 $ touch iwillmergethat
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1336 $ hg add iwillmergethat
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1337
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1338 $ hg branch thatbranch
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1339 marked working directory as branch thatbranch
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 13295 diff changeset	1340 (branches are permanent and global, did you want a bookmark?)
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1341
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1342 $ hg ci -m'new head'
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1343
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1344 $ hg up default
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1345 7 files updated, 0 files merged, 2 files removed, 0 files unresolved
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1346
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1347 $ hg merge thatbranch
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1348 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1349 (branch merge, don't forget to commit)
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1350
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1351 $ hg commit -i -m'will abort'
13023 3e2281b85990 record: quote command in use hg commit message timeless <timeless@gmail.com> parents: 12843 diff changeset	1352 abort: cannot partially commit a merge (use "hg commit" instead)
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42585 diff changeset	1353 [10]
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1354
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1355 $ hg up -C
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1356 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1357
18954 b1639e98e8a1 record: ignore trailing content when parsing patches - introduce 'other' lines Mads Kiilerich <mads@kiilerich.com> parents: 18953 diff changeset	1358 Editing patch (and ignoring trailing text)
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1359
16901 5b89700cce30 tests: consistently use a HGEDITOR pattern that works with msys on windows Mads Kiilerich <mads@kiilerich.com> parents: 16899 diff changeset	1360 $ cat > editor.sh << '__EOF__'
19080 5e4491c114b2 check-code: add a rule against a GNU sed-ism Kevin Bullock <kbullock@ringworld.org> parents: 18954 diff changeset	1361 > sed -e 7d -e '5s/^-/ /' -e '/^# ---/i\
5e4491c114b2 check-code: add a rule against a GNU sed-ism Kevin Bullock <kbullock@ringworld.org> parents: 18954 diff changeset	1362 > trailing\nditto' "$1" > tmp
16332 42e95631887d tests: remove sed -i from test-record Matt Mackall <mpm@selenic.com> parents: 16328 diff changeset	1363 > mv tmp "$1"
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1364 > __EOF__
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1365 $ cat > editedfile << '__EOF__'
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1366 > This is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1367 > This is the second line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1368 > This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1369 > __EOF__
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1370 $ hg add editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1371 $ hg commit -medit-patch-1
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1372 $ cat > editedfile << '__EOF__'
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1373 > This line has changed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1374 > This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1375 > This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1376 > __EOF__
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1377 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-2 <<EOF
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1378 > y
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1379 > e
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1380 > EOF
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1381 diff --git a/editedfile b/editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1382 1 hunks, 2 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1383 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1384 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1385
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1386 @@ -1,3 +1,3 @@
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1387 -This is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1388 -This is the second line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1389 +This line has changed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1390 +This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1391 This is the third line
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1392 record this change to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1393 (enter ? for help) [Ynesfdaq?] e
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1394
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1395 $ cat editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1396 This line has changed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1397 This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1398 This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1399 $ hg cat -r tip editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1400 This is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1401 This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1402 This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1403 $ hg revert editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1404
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1405 Trying to edit patch for whole file
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1406
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1407 $ echo "This is the fourth line" >> editedfile
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1408 $ hg commit -i <<EOF
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1409 > e
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1410 > q
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1411 > EOF
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1412 diff --git a/editedfile b/editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1413 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1414 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1415 (enter ? for help) [Ynesfdaq?] e
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1416
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1417 cannot edit patch for whole file
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1418 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1419 (enter ? for help) [Ynesfdaq?] q
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1420
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1421 abort: user quit
45877 ac362d5a7893 errors: introduce CanceledError and use it in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 45846 diff changeset	1422 [250]
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1423 $ hg revert editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1424
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1425 Removing changes from patch
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1426
16338 118eb4575ea2 tests: fix one more sed -i Matt Mackall <mpm@selenic.com> parents: 16332 diff changeset	1427 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
118eb4575ea2 tests: fix one more sed -i Matt Mackall <mpm@selenic.com> parents: 16332 diff changeset	1428 $ mv tmp editedfile
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1429 $ echo "This line has been added" >> editedfile
16901 5b89700cce30 tests: consistently use a HGEDITOR pattern that works with msys on windows Mads Kiilerich <mads@kiilerich.com> parents: 16899 diff changeset	1430 $ cat > editor.sh << '__EOF__'
16332 42e95631887d tests: remove sed -i from test-record Matt Mackall <mpm@selenic.com> parents: 16328 diff changeset	1431 > sed -e 's/^[-+]/ /' "$1" > tmp
42e95631887d tests: remove sed -i from test-record Matt Mackall <mpm@selenic.com> parents: 16328 diff changeset	1432 > mv tmp "$1"
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1433 > __EOF__
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1434 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1435 > y
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1436 > e
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1437 > EOF
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1438 diff --git a/editedfile b/editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1439 1 hunks, 3 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1440 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1441 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1442
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1443 @@ -1,3 +1,3 @@
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1444 -This is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1445 -This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1446 -This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1447 +This change will not be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1448 +This is the second line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1449 +This line has been added
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1450 record this change to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1451 (enter ? for help) [Ynesfdaq?] e
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1452
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1453 no changes to record
30157 df224038c516 commit: return 1 for interactive commit with no changes (issue5397) Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 29180 diff changeset	1454 [1]
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1455 $ cat editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1456 This change will not be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1457 This is the second line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1458 This line has been added
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1459 $ hg cat -r tip editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1460 This is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1461 This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1462 This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1463 $ hg revert editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1464
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1465 Invalid patch
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1466
16332 42e95631887d tests: remove sed -i from test-record Matt Mackall <mpm@selenic.com> parents: 16328 diff changeset	1467 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
42e95631887d tests: remove sed -i from test-record Matt Mackall <mpm@selenic.com> parents: 16328 diff changeset	1468 $ mv tmp editedfile
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1469 $ echo "This line has been added" >> editedfile
16901 5b89700cce30 tests: consistently use a HGEDITOR pattern that works with msys on windows Mads Kiilerich <mads@kiilerich.com> parents: 16899 diff changeset	1470 $ cat > editor.sh << '__EOF__'
16332 42e95631887d tests: remove sed -i from test-record Matt Mackall <mpm@selenic.com> parents: 16328 diff changeset	1471 > sed s/This/That/ "$1" > tmp
42e95631887d tests: remove sed -i from test-record Matt Mackall <mpm@selenic.com> parents: 16328 diff changeset	1472 > mv tmp "$1"
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1473 > __EOF__
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1474 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1475 > y
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1476 > e
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1477 > EOF
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1478 diff --git a/editedfile b/editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1479 1 hunks, 3 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1480 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1481 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1482
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1483 @@ -1,3 +1,3 @@
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1484 -This is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1485 -This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1486 -This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1487 +This change will not be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1488 +This is the second line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1489 +This line has been added
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1490 record this change to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1491 (enter ? for help) [Ynesfdaq?] e
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1492
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1493 patching file editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1494 Hunk #1 FAILED at 0
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1495 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1496 abort: patch failed to apply
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42585 diff changeset	1497 [10]
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1498 $ cat editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1499 This change will not be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1500 This is the second line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1501 This line has been added
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1502 $ hg cat -r tip editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1503 This is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1504 This change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1505 This is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1506 $ cat editedfile.rej
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1507 --- editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1508 +++ editedfile
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1509 @@ -1,3 +1,3 @@
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1510 -That is the first line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1511 -That change will be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1512 -That is the third line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1513 +That change will not be committed
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1514 +That is the second line
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1515 +That line has been added
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1516
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1517 Malformed patch - error handling
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1518
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1519 $ cat > editor.sh << '__EOF__'
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1520 > sed -e '/^@/p' "$1" > tmp
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1521 > mv tmp "$1"
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1522 > __EOF__
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1523 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1524 > y
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1525 > e
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1526 > EOF
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1527 diff --git a/editedfile b/editedfile
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1528 1 hunks, 3 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1529 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1530 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1531
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1532 @@ -1,3 +1,3 @@
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1533 -This is the first line
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1534 -This change will be committed
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1535 -This is the third line
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1536 +This change will not be committed
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1537 +This is the second line
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1538 +This line has been added
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1539 record this change to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1540 (enter ? for help) [Ynesfdaq?] e
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1541
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1542 abort: error parsing patch: unhandled transition: range -> range
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42585 diff changeset	1543 [10]
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1544
25483 fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1545 Exiting editor with status 1, ignores the edit but does not stop the recording
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1546 session
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1547
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1548 $ HGEDITOR=false hg commit -i <<EOF
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1549 > y
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1550 > e
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1551 > n
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1552 > EOF
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1553 diff --git a/editedfile b/editedfile
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1554 1 hunks, 3 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1555 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1556 (enter ? for help) [Ynesfdaq?] y
25483 fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1557
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1558 @@ -1,3 +1,3 @@
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1559 -This is the first line
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1560 -This change will be committed
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1561 -This is the third line
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1562 +This change will not be committed
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1563 +This is the second line
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1564 +This line has been added
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1565 record this change to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1566 (enter ? for help) [Ynesfdaq?] e
25483 fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1567
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1568 editor exited with exit code 1
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1569 record this change to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1570 (enter ? for help) [Ynesfdaq?] n
25483 fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1571
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1572 no changes to record
30157 df224038c516 commit: return 1 for interactive commit with no changes (issue5397) Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 29180 diff changeset	1573 [1]
25483 fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1574
fb04372d7b38 record: exiting editor with non-zero status should not stop recording session Laurent Charignon <lcharignon@fb.com> parents: 25382 diff changeset	1575
18954 b1639e98e8a1 record: ignore trailing content when parsing patches - introduce 'other' lines Mads Kiilerich <mads@kiilerich.com> parents: 18953 diff changeset	1576 random text in random positions is still an error
b1639e98e8a1 record: ignore trailing content when parsing patches - introduce 'other' lines Mads Kiilerich <mads@kiilerich.com> parents: 18953 diff changeset	1577
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1578 $ cat > editor.sh << '__EOF__'
19080 5e4491c114b2 check-code: add a rule against a GNU sed-ism Kevin Bullock <kbullock@ringworld.org> parents: 18954 diff changeset	1579 > sed -e '/^@/i\
5e4491c114b2 check-code: add a rule against a GNU sed-ism Kevin Bullock <kbullock@ringworld.org> parents: 18954 diff changeset	1580 > other' "$1" > tmp
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1581 > mv tmp "$1"
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1582 > __EOF__
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1583 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1584 > y
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1585 > e
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1586 > EOF
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1587 diff --git a/editedfile b/editedfile
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1588 1 hunks, 3 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1589 examine changes to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1590 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1591
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1592 @@ -1,3 +1,3 @@
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1593 -This is the first line
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1594 -This change will be committed
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1595 -This is the third line
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1596 +This change will not be committed
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1597 +This is the second line
e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1598 +This line has been added
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1599 record this change to 'editedfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1600 (enter ? for help) [Ynesfdaq?] e
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1601
18954 b1639e98e8a1 record: ignore trailing content when parsing patches - introduce 'other' lines Mads Kiilerich <mads@kiilerich.com> parents: 18953 diff changeset	1602 abort: error parsing patch: unhandled transition: file -> other
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42585 diff changeset	1603 [10]
18953 e4ae397595e8 record: abort on malformed patches instead of crashing Mads Kiilerich <madski@unity3d.com> parents: 18266 diff changeset	1604
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1605 $ hg up -C
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1606 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1607
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1608 With win32text
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1609
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1610 $ echo '[extensions]' >> .hg/hgrc
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1611 $ echo 'win32text = ' >> .hg/hgrc
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1612 $ echo '[decode]' >> .hg/hgrc
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1613 $ echo '** = cleverdecode:' >> .hg/hgrc
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1614 $ echo '[encode]' >> .hg/hgrc
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1615 $ echo '** = cleverencode:' >> .hg/hgrc
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1616 $ echo '[patch]' >> .hg/hgrc
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1617 $ echo 'eol = crlf' >> .hg/hgrc
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 7718 diff changeset	1618
12843 8aeb6184b008 tests: test/silence win32text deprecation warning Martin Geisler <mg@lazybytes.net> parents: 12328 diff changeset	1619 Ignore win32text deprecation warning for now:
8aeb6184b008 tests: test/silence win32text deprecation warning Martin Geisler <mg@lazybytes.net> parents: 12328 diff changeset	1620
8aeb6184b008 tests: test/silence win32text deprecation warning Martin Geisler <mg@lazybytes.net> parents: 12328 diff changeset	1621 $ echo '[win32text]' >> .hg/hgrc
8aeb6184b008 tests: test/silence win32text deprecation warning Martin Geisler <mg@lazybytes.net> parents: 12328 diff changeset	1622 $ echo 'warn = no' >> .hg/hgrc
8aeb6184b008 tests: test/silence win32text deprecation warning Martin Geisler <mg@lazybytes.net> parents: 12328 diff changeset	1623
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1624 $ echo d >> subdir/f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1625 $ hg commit -i -d '24 0' -mw1 <<EOF
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1626 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1627 > y
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1628 > EOF
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1629 diff --git a/subdir/f1 b/subdir/f1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1630 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1631 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1632 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1633
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	1634 @@ -3,3 +3,4 @@ a
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1635 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1636 b
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1637 c
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1638 +d
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1639 record this change to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1640 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1641
8811 8b35b08724eb Make mq, record and transplant honor patch.eol Patrick Mezard <pmezard@gmail.com> parents: 7718 diff changeset	1642
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1643 $ hg status -A subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1644 C subdir/f1
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1645 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1646 changeset: 30:* (glob)
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1647 tag: tip
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1648 user: test
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1649 date: Thu Jan 01 00:00:24 1970 +0000
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1650 summary: w1
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1651
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16338 diff changeset	1652 diff -r ???????????? -r ???????????? subdir/f1 (glob)
16324 46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1653 --- a/subdir/f1 Thu Jan 01 00:00:23 1970 +0000
46b991a1f428 record: allow splitting of hunks by manually editing patches A. S. Budden <abudden@gmail.com> parents: 15623 diff changeset	1654 +++ b/subdir/f1 Thu Jan 01 00:00:24 1970 +0000
12074 35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1655 @@ -3,3 +3,4 @@
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1656 a
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1657 b
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1658 c
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1659 +d
35c143e85b1b tests: unify test-record Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11238 diff changeset	1660
24235 79fceed67676 record: allow editing new files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 23435 diff changeset	1661
79fceed67676 record: allow editing new files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 23435 diff changeset	1662
20171 a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1663 Test --user when ui.username not set
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1664 $ unset HGUSER
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1665 $ echo e >> subdir/f1
24279 7cf9a9e0cf89 record: add new tests for commit interactive (same tests as record) Laurent Charignon <lcharignon@fb.com> parents: 24235 diff changeset	1666 $ hg commit -i --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF
20171 a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1667 > y
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1668 > y
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1669 > EOF
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1670 diff --git a/subdir/f1 b/subdir/f1
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1671 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1672 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1673 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1674
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	1675 @@ -4,3 +4,4 @@ a
20171 a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1676 b
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1677 c
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1678 d
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1679 +e
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1680 record this change to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1681 (enter ? for help) [Ynesfdaq?] y
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 20580 diff changeset	1682
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1683 $ hg status -A subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1684 C subdir/f1
20171 a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1685 $ hg log --template '{author}\n' -l 1
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1686 xyz
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1687 $ HGUSER="test"
a765611e06dc record: --user/-u now works with record when ui.username not set (issue3857) Prasoon Shukla <prasoon92.iitr@gmail.com> parents: 19080 diff changeset	1688 $ export HGUSER
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16901 diff changeset	1689
24235 79fceed67676 record: allow editing new files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 23435 diff changeset	1690
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1691 Moving files
24235 79fceed67676 record: allow editing new files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 23435 diff changeset	1692
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1693 $ hg update -C .
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1694 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1695 $ hg mv plain plain3
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1696 $ echo somechange >> plain3
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1697 $ hg commit -i -d '23 0' -mmoving_files << EOF
24235 79fceed67676 record: allow editing new files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 23435 diff changeset	1698 > y
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1699 > y
24235 79fceed67676 record: allow editing new files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 23435 diff changeset	1700 > EOF
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1701 diff --git a/plain b/plain3
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1702 rename from plain
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1703 rename to plain3
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1704 1 hunks, 1 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1705 examine changes to 'plain' and 'plain3'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1706 (enter ? for help) [Ynesfdaq?] y
24235 79fceed67676 record: allow editing new files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 23435 diff changeset	1707
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 26863 diff changeset	1708 @@ -11,3 +11,4 @@ 8
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1709 9
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1710 10
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1711 11
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1712 +somechange
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1713 record this change to 'plain3'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1714 (enter ? for help) [Ynesfdaq?] y
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1715
24861 15d7f435108a test-commit-interactive: stablize output for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 24845 diff changeset	1716 The #if execbit block above changes the hash here on some systems
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1717 $ hg status -A plain3
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1718 C plain3
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1719 $ hg tip
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1720 changeset: 32:* (glob)
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1721 tag: tip
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1722 user: test
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1723 date: Thu Jan 01 00:00:23 1970 +0000
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1724 summary: moving_files
edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24279 diff changeset	1725
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1726 Editing patch of newly added file
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1727
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1728 $ hg update -C .
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1729 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1730 $ cat > editor.sh << '__EOF__'
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1731 > cat "$1" \| sed "s/first/very/g" > tt
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1732 > mv tt "$1"
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1733 > __EOF__
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1734 $ cat > newfile << '__EOF__'
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1735 > This is the first line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1736 > This is the second line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1737 > This is the third line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1738 > __EOF__
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1739 $ hg add newfile
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1740 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-new <<EOF
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1741 > y
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1742 > e
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1743 > EOF
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1744 diff --git a/newfile b/newfile
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1745 new file mode 100644
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1746 examine changes to 'newfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1747 (enter ? for help) [Ynesfdaq?] y
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1748
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1749 @@ -0,0 +1,3 @@
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1750 +This is the first line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1751 +This is the second line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1752 +This is the third line
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1753 record this change to 'newfile'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1754 (enter ? for help) [Ynesfdaq?] e
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1755
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1756 $ hg cat -r tip newfile
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1757 This is the very line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1758 This is the second line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1759 This is the third line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1760
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1761 $ cat newfile
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1762 This is the first line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1763 This is the second line
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24844 diff changeset	1764 This is the third line
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1765
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1766 Add new file from within a subdirectory
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1767 $ hg update -C .
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1768 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1769 $ mkdir folder
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1770 $ cd folder
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1771 $ echo "foo" > bar
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1772 $ hg add bar
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1773 $ hg commit -i -d '23 0' -mnewfilesubdir <<EOF
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1774 > y
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1775 > y
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1776 > EOF
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1777 diff --git a/folder/bar b/folder/bar
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1778 new file mode 100644
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1779 examine changes to 'folder/bar'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1780 (enter ? for help) [Ynesfdaq?] y
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1781
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1782 @@ -0,0 +1,1 @@
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1783 +foo
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1784 record this change to 'folder/bar'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1785 (enter ? for help) [Ynesfdaq?] y
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1786
24884 d7778b88838c test-commit-interactive: add more globs for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 24866 diff changeset	1787 The #if execbit block above changes the hashes here on some systems
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1788 $ hg tip -p
27412 14b184263846 record: fix hunk handling to remember the current function timeless <timeless@mozdev.org> parents: 27411 diff changeset	1789 changeset: 34:* (glob)
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1790 tag: tip
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1791 user: test
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1792 date: Thu Jan 01 00:00:23 1970 +0000
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1793 summary: newfilesubdir
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1794
24884 d7778b88838c test-commit-interactive: add more globs for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 24866 diff changeset	1795 diff -r * -r * folder/bar (glob)
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1796 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1797 +++ b/folder/bar Thu Jan 01 00:00:23 1970 +0000
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1798 @@ -0,0 +1,1 @@
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1799 +foo
e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24861 diff changeset	1800
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16901 diff changeset	1801 $ cd ..
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1802
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1803 $ hg status -A folder/bar
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1804 C folder/bar
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1805
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1806 Clear win32text configuration before size/timestamp sensitive test
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1807
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1808 $ cat >> .hg/hgrc <<EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1809 > [extensions]
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1810 > win32text = !
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1811 > [decode]
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1812 > ** = !
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1813 > [encode]
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1814 > ** = !
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1815 > [patch]
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1816 > eol = strict
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1817 > EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1818 $ hg update -q -C null
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1819 $ hg update -q -C tip
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1820
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1821 Test that partially committed file is still treated as "modified",
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1822 even if none of mode, size and timestamp is changed on the filesystem
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1823 (see also issue4583).
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1824
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1825 $ cat > subdir/f1 <<EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1826 > A
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1827 > a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1828 > a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1829 > b
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1830 > c
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1831 > d
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1832 > E
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1833 > EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1834 $ hg diff --git subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1835 diff --git a/subdir/f1 b/subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1836 --- a/subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1837 +++ b/subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1838 @@ -1,7 +1,7 @@
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1839 -a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1840 +A
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1841 a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1842 a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1843 b
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1844 c
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1845 d
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1846 -e
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1847 +E
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1848
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1849 $ touch -t 200001010000 subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1850
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1851 $ cat >> .hg/hgrc <<EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1852 > # emulate invoking patch.internalpatch() at 2000-01-01 00:00
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1853 > [fakepatchtime]
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1854 > fakenow = 200001010000
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1855 >
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1856 > [extensions]
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1857 > fakepatchtime = $TESTDIR/fakepatchtime.py
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1858 > EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1859 $ hg commit -i -m 'commit subdir/f1 partially' <<EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1860 > y
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1861 > y
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1862 > n
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1863 > EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1864 diff --git a/subdir/f1 b/subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1865 2 hunks, 2 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1866 examine changes to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1867 (enter ? for help) [Ynesfdaq?] y
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1868
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1869 @@ -1,6 +1,6 @@
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1870 -a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1871 +A
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1872 a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1873 a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1874 b
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1875 c
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1876 d
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1877 record change 1/2 to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1878 (enter ? for help) [Ynesfdaq?] y
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1879
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1880 @@ -2,6 +2,6 @@
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1881 a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1882 a
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1883 b
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1884 c
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1885 d
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1886 -e
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1887 +E
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1888 record change 2/2 to 'subdir/f1'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1889 (enter ? for help) [Ynesfdaq?] n
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1890
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1891 $ cat >> .hg/hgrc <<EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1892 > [extensions]
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1893 > fakepatchtime = !
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1894 > EOF
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1895
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1896 $ hg debugstate \| grep ' subdir/f1$'
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1897 n 0 -1 unset subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1898 $ hg status -A subdir/f1
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25483 diff changeset	1899 M subdir/f1
41454 d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1900
41560 66399f2e92aa commit: if interactive, look elsewhere for whitespace settings (BC) Kyle Lippincott <spectral@google.com> parents: 41557 diff changeset	1901 Test commands.commit.interactive.unified=0
41454 d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1902
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1903 $ hg init $TESTTMP/b
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1904 $ cd $TESTTMP/b
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1905 $ cat > foo <<EOF
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1906 > 1
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1907 > 2
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1908 > 3
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1909 > 4
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1910 > 5
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1911 > EOF
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1912 $ hg ci -qAm initial
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1913 $ cat > foo <<EOF
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1914 > 1
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1915 > change1
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1916 > 2
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1917 > 3
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1918 > change2
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1919 > 4
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1920 > 5
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1921 > EOF
41560 66399f2e92aa commit: if interactive, look elsewhere for whitespace settings (BC) Kyle Lippincott <spectral@google.com> parents: 41557 diff changeset	1922 $ printf 'y\ny\ny\n' \| hg ci -im initial --config commands.commit.interactive.unified=0
41454 d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1923 diff --git a/foo b/foo
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1924 2 hunks, 2 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1925 examine changes to 'foo'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1926 (enter ? for help) [Ynesfdaq?] y
41454 d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1927
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1928 @@ -1,0 +2,1 @@ 1
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1929 +change1
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1930 record change 1/2 to 'foo'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1931 (enter ? for help) [Ynesfdaq?] y
41454 d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1932
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1933 @@ -3,0 +5,1 @@ 3
d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1934 +change2
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1935 record change 2/2 to 'foo'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1936 (enter ? for help) [Ynesfdaq?] y
41454 d1d3094b54f9 patch: handle 0 context lines (diff.unified=0) when parsing patches Kyle Lippincott <spectral@google.com> parents: 40205 diff changeset	1937
41557 3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1938 $ cd $TESTTMP
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1939
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1940 Test diff.ignoreblanklines=1
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1941
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1942 $ hg init c
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1943 $ cd c
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1944 $ cat > foo <<EOF
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1945 > 1
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1946 > 2
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1947 > 3
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1948 > 4
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1949 > 5
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1950 > EOF
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1951 $ hg ci -qAm initial
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1952 $ cat > foo <<EOF
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1953 > 1
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1954 >
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1955 > 2
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1956 > 3
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1957 > change2
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1958 > 4
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1959 > 5
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1960 > EOF
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1961 $ printf 'y\ny\ny\n' \| hg ci -im initial --config diff.ignoreblanklines=1
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1962 diff --git a/foo b/foo
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1963 2 hunks, 2 lines changed
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1964 examine changes to 'foo'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1965 (enter ? for help) [Ynesfdaq?] y
41557 3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1966
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1967 @@ -1,3 +1,4 @@
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1968 1
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1969 +
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1970 2
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1971 3
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1972 record change 1/2 to 'foo'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1973 (enter ? for help) [Ynesfdaq?] y
41557 3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1974
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1975 @@ -2,4 +3,5 @@
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1976 2
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1977 3
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1978 +change2
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1979 4
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1980 5
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1981 record change 2/2 to 'foo'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 42253 diff changeset	1982 (enter ? for help) [Ynesfdaq?] y
41557 3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1983
3a01ce246ece commit: ignore diff whitespace settings when doing `commit -i` (issue5839) Kyle Lippincott <spectral@google.com> parents: 41454 diff changeset	1984

Mercurial > public > mercurial-scm > hg

annotate tests/test-commit-interactive.t @ 45892:06b64fabf91c