mercurial-scm/hg: tests/test-subrepo-svn.t annotate

annotate tests/test-subrepo-svn.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	e598c874b4af
children	9987d14ad63f

rev	line source
22046 7a9cbb315d84 tests: replace exit 80 with #require Matt Mackall <mpm@selenic.com> parents: 21930 diff changeset	1 #require svn15
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	2
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	3 $ SVNREPOPATH=`pwd`/svn-repo
41496 e095a9688a31 tests: quote $PYTHON for py3 support on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 41480 diff changeset	4 $ SVNREPOURL="`"$PYTHON" $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	5
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	6 $ filter_svn_output () {
28533 dfd5a6830ea7 tests: make tests for convert with svn portable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26374 diff changeset	7 > egrep -v 'Committing\|Transmitting\|Updating\|(^$)' \|\| true
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	8 > }
048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	9
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	10 create subversion repo
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	11
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	12 $ WCROOT="`pwd`/svn-wc"
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	13 $ svnadmin create svn-repo
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	14 $ svn co "$SVNREPOURL" svn-wc
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	15 Checked out revision 0.
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	16 $ cd svn-wc
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	17 $ mkdir src
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	18 $ echo alpha > src/alpha
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	19 $ svn add src
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	20 A src
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	21 A src/alpha
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	22 $ mkdir externals
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	23 $ echo other > externals/other
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	24 $ svn add externals
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	25 A externals
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	26 A externals/other
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	27 $ svn ci -qm 'Add alpha'
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	28 $ svn up -q
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	29 $ echo "externals -r1 $SVNREPOURL/externals" > extdef
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	30 $ svn propset -F extdef svn:externals src
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	31 property 'svn:externals' set on 'src'
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	32 $ svn ci -qm 'Setting externals'
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	33 $ cd ..
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	34
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	35 create hg repo
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	36
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	37 $ mkdir sub
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	38 $ cd sub
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	39 $ hg init t
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	40 $ cd t
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	41
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	42 first revision, no sub
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	43
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	44 $ echo a > a
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	45 $ hg ci -Am0
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	46 adding a
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	47
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	48 add first svn sub with leading whitespaces
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	49
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	50 $ echo "s = [svn] $SVNREPOURL/src" >> .hgsub
0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	51 $ echo "subdir/s = [svn] $SVNREPOURL/src" >> .hgsub
0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	52 $ svn co --quiet "$SVNREPOURL"/src s
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	53 $ mkdir subdir
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	54 $ svn co --quiet "$SVNREPOURL"/src subdir/s
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	55 $ hg add .hgsub
34987 846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	56
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	57 svn subrepo is disabled by default
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	58
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	59 $ hg ci -m1
34989 1a314176da9c subrepo: use per-type config options to enable subrepos Gregory Szorc <gregory.szorc@gmail.com> parents: 34987 diff changeset	60 abort: svn subrepos not allowed
34987 846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	61 (see 'hg help config.subrepos' for details)
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	62 [255]
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	63
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	64 so enable it
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	65
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	66 $ cat >> $HGRCPATH <<EOF
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	67 > [subrepos]
34989 1a314176da9c subrepo: use per-type config options to enable subrepos Gregory Szorc <gregory.szorc@gmail.com> parents: 34987 diff changeset	68 > svn:allowed = true
34987 846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	69 > EOF
846942fd6d15 subrepo: disable git and svn subrepos by default (BC) (SEC) Yuya Nishihara <yuya@tcha.org> parents: 33660 diff changeset	70
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	71 $ hg ci -m1
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	72
12798 3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	73 make sure we avoid empty commits (issue2445)
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	74
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	75 $ hg sum
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	76 parent: 1:* tip (glob)
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	77 1
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	78 branch: default
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	79 commit: (clean)
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	80 update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25125 diff changeset	81 phases: 2 draft
12798 3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	82 $ hg ci -moops
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	83 nothing changed
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	84 [1]
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	85
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	86 debugsub
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	87
12366 c01dc9087d9a tests: drop a bunch of sed calls from unified tests Matt Mackall <mpm@selenic.com> parents: 12365 diff changeset	88 $ hg debugsub
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	89 path s
44096 e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	90 source file:/*/svn-repo/src (glob) (windows !)
e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	91 source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	92 revision 2
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	93 path subdir/s
44096 e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	94 source file:/*/svn-repo/src (glob) (windows !)
e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	95 source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	96 revision 2
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	97
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	98 change file in svn and hg, commit
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	99
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	100 $ echo a >> a
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	101 $ echo alpha >> s/alpha
12798 3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	102 $ hg sum
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	103 parent: 1:* tip (glob)
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	104 1
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	105 branch: default
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	106 commit: 1 modified, 1 subrepos
3d6ba8c2b1b8 subrepo: fix status check on SVN subrepos (issue2445) Matt Mackall <mpm@selenic.com> parents: 12668 diff changeset	107 update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25125 diff changeset	108 phases: 2 draft
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	109 $ hg commit --subrepos -m 'Message!' \| filter_svn_output
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	110 committing subrepository s
12377 a5b77eb0409b tests: various fixes for new unified test pattern format Matt Mackall <mpm@selenic.com> parents: 12376 diff changeset	111 Sending*s/alpha (glob)
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	112 Committed revision 3.
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	113 Fetching external item into 's/externals' (glob)
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	114 External at revision 1.
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	115 At revision 3.
12366 c01dc9087d9a tests: drop a bunch of sed calls from unified tests Matt Mackall <mpm@selenic.com> parents: 12365 diff changeset	116 $ hg debugsub
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	117 path s
44096 e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	118 source file:/*/svn-repo/src (glob) (windows !)
e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	119 source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	120 revision 3
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	121 path subdir/s
44096 e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	122 source file:/*/svn-repo/src (glob) (windows !)
e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	123 source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	124 revision 2
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	125
16529 3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	126 missing svn file, commit should fail
3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	127
3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	128 $ rm s/alpha
3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	129 $ hg commit --subrepos -m 'abort on missing file'
3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	130 committing subrepository s
33365 6d88468d435b subrepo: make the output references to subrepositories consistent Matt Harbison <matt_harbison@yahoo.com> parents: 30060 diff changeset	131 abort: cannot commit missing svn entries (in subrepository "s")
16529 3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	132 [255]
3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	133 $ svn revert s/alpha > /dev/null
3d5d204a08c7 subrepo/svn: abort on commit with missing file (issue3029) Patrick Mezard <patrick@mezard.eu> parents: 16527 diff changeset	134
13287 d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	135 add an unrelated revision in svn and update the subrepo to without
d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	136 bringing any changes.
d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	137
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	138 $ svn mkdir "$SVNREPOURL/unrelated" -qm 'create unrelated'
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	139 $ svn up -q s
13287 d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	140 $ hg sum
d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	141 parent: 2:* tip (glob)
d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	142 Message!
d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	143 branch: default
d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	144 commit: (clean)
d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	145 update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25125 diff changeset	146 phases: 3 draft
13287 d0e0d3d43e14 subrepo: compare svn subrepo state to last committed revision Patrick Mezard <pmezard@gmail.com> parents: 13015 diff changeset	147
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	148 $ echo a > s/a
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	149
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	150 should be empty despite change to s/a
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	151
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	152 $ hg st
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	153
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	154 add a commit from svn
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	155
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	156 $ cd "$WCROOT/src"
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	157 $ svn up -q
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	158 $ echo xyz >> alpha
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	159 $ svn propset svn:mime-type 'text/xml' alpha
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	160 property 'svn:mime-type' set on 'alpha'
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	161 $ svn ci -qm 'amend a from svn'
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	162 $ cd ../../sub/t
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	163
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	164 this commit from hg will fail
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	165
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	166 $ echo zzz >> s/alpha
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	167 $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") \| grep -vi 'out of date'
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	168 committing subrepository s
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	169 abort: svn:*Commit failed (details follow): (glob)
12366 c01dc9087d9a tests: drop a bunch of sed calls from unified tests Matt Mackall <mpm@selenic.com> parents: 12365 diff changeset	170 [255]
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	171 $ svn revert -q s/alpha
10273 e898bc7810ad subrepo: handle svn externals and meta changes (issue1982) Patrick Mezard <pmezard@gmail.com> parents: 10267 diff changeset	172
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	173 this commit fails because of meta changes
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	174
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	175 $ svn propset svn:mime-type 'text/html' s/alpha
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	176 property 'svn:mime-type' set on 's/alpha'
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	177 $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") \| grep -vi 'out of date'
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	178 committing subrepository s
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	179 abort: svn:*Commit failed (details follow): (glob)
12366 c01dc9087d9a tests: drop a bunch of sed calls from unified tests Matt Mackall <mpm@selenic.com> parents: 12365 diff changeset	180 [255]
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	181 $ svn revert -q s/alpha
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	182
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	183 this commit fails because of externals changes
10273 e898bc7810ad subrepo: handle svn externals and meta changes (issue1982) Patrick Mezard <pmezard@gmail.com> parents: 10267 diff changeset	184
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	185 $ echo zzz > s/externals/other
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15282 diff changeset	186 $ hg ci --subrepos -m 'amend externals from hg'
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	187 committing subrepository s
33365 6d88468d435b subrepo: make the output references to subrepositories consistent Matt Harbison <matt_harbison@yahoo.com> parents: 30060 diff changeset	188 abort: cannot commit svn externals (in subrepository "s")
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12209 diff changeset	189 [255]
12209 affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	190 $ hg diff --subrepos -r 1:2 \| grep -v diff
affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	191 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	192 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	193 @@ -1,2 +1,2 @@
12209 affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	194 -2 s
affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	195 +3 s
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	196 2 subdir/s
12209 affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	197 --- a/a Thu Jan 01 00:00:00 1970 +0000
affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	198 +++ b/a Thu Jan 01 00:00:00 1970 +0000
affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	199 @@ -1,1 +1,2 @@
affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	200 a
affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 11916 diff changeset	201 +a
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	202 $ svn revert -q s/externals/other
10273 e898bc7810ad subrepo: handle svn externals and meta changes (issue1982) Patrick Mezard <pmezard@gmail.com> parents: 10267 diff changeset	203
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	204 this commit fails because of externals meta changes
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	205
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	206 $ svn propset svn:mime-type 'text/html' s/externals/other
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	207 property 'svn:mime-type' set on 's/externals/other'
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15282 diff changeset	208 $ hg ci --subrepos -m 'amend externals from hg'
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	209 committing subrepository s
33365 6d88468d435b subrepo: make the output references to subrepositories consistent Matt Harbison <matt_harbison@yahoo.com> parents: 30060 diff changeset	210 abort: cannot commit svn externals (in subrepository "s")
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12209 diff changeset	211 [255]
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	212 $ svn revert -q s/externals/other
10273 e898bc7810ad subrepo: handle svn externals and meta changes (issue1982) Patrick Mezard <pmezard@gmail.com> parents: 10267 diff changeset	213
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	214 clone
10178 cd477be6f2fc subrepo: Subversion support Augie Fackler <durin42@gmail.com> parents: diff changeset	215
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	216 $ cd ..
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	217 $ hg clone t tc
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	218 updating to branch default
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	219 A tc/s/alpha
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	220 U tc/s
13907 a0ed0d0dd713 subrepo: fix up svn test output Matt Mackall <mpm@selenic.com> parents: 13559 diff changeset	221
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	222 Fetching external item into 'tc/s/externals'* (glob)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	223 A tc/s/externals/other
13907 a0ed0d0dd713 subrepo: fix up svn test output Matt Mackall <mpm@selenic.com> parents: 13559 diff changeset	224 Checked out external at revision 1.
a0ed0d0dd713 subrepo: fix up svn test output Matt Mackall <mpm@selenic.com> parents: 13559 diff changeset	225
a0ed0d0dd713 subrepo: fix up svn test output Matt Mackall <mpm@selenic.com> parents: 13559 diff changeset	226 Checked out revision 3.
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	227 A tc/subdir/s/alpha
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	228 U tc/subdir/s
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	229
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	230 Fetching external item into 'tc/subdir/s/externals'* (glob)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	231 A tc/subdir/s/externals/other
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	232 Checked out external at revision 1.
82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	233
82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	234 Checked out revision 2.
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	235 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	236 $ cd tc
10954 33119d0252c1 subrepo: fix repo root path handling in svn subrepo Brett Cannon <brett@python.org> parents: 10791 diff changeset	237
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	238 debugsub in clone
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	239
12366 c01dc9087d9a tests: drop a bunch of sed calls from unified tests Matt Mackall <mpm@selenic.com> parents: 12365 diff changeset	240 $ hg debugsub
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	241 path s
44096 e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	242 source file:/*/svn-repo/src (glob) (windows !)
e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	243 source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	244 revision 3
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	245 path subdir/s
44096 e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	246 source file:/*/svn-repo/src (glob) (windows !)
e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	247 source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	248 revision 2
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	249
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	250 verify subrepo is contained within the repo directory
d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	251
39723 5495ceab5637 py3: use print as a function in tests/test-subrepo-svn.t Pulkit Goyal <pulkit@yandex-team.ru> parents: 39707 diff changeset	252 $ "$PYTHON" -c "from __future__ import print_function; import os.path; print(os.path.exists('s'))"
11916 d1ea16ca6520 tests: unify test-subrepo-svn Martin Geisler <mg@lazybytes.net> parents: 11142 diff changeset	253 True
12930 9bb180abc4d0 subrepo: test & fix svn subrepo removal Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 12798 diff changeset	254
9bb180abc4d0 subrepo: test & fix svn subrepo removal Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 12798 diff changeset	255 update to nullrev (must delete the subrepo)
9bb180abc4d0 subrepo: test & fix svn subrepo removal Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 12798 diff changeset	256
9bb180abc4d0 subrepo: test & fix svn subrepo removal Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 12798 diff changeset	257 $ hg up null
9bb180abc4d0 subrepo: test & fix svn subrepo removal Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 12798 diff changeset	258 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
13015 82ca0c43bc44 subrepo: prune empty directories when removing svn subrepo Patrick Mezard <pmezard@gmail.com> parents: 12930 diff changeset	259 $ ls
13322 c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	260
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	261 Check hg update --clean
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	262 $ cd "$TESTTMP/sub/t"
13322 c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	263 $ cd s
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	264 $ echo c0 > alpha
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	265 $ echo c1 > f1
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	266 $ echo c1 > f2
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	267 $ svn add f1 -q
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	268 $ svn status \| sort
fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	269
13410 1f2b2c33d386 tests: fixes for svn 1.4.2 Matt Mackall <mpm@selenic.com> parents: 13332 diff changeset	270 ? * a (glob)
1f2b2c33d386 tests: fixes for svn 1.4.2 Matt Mackall <mpm@selenic.com> parents: 13332 diff changeset	271 ? * f2 (glob)
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	272 A * f1 (glob)
13410 1f2b2c33d386 tests: fixes for svn 1.4.2 Matt Mackall <mpm@selenic.com> parents: 13332 diff changeset	273 M * alpha (glob)
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	274 Performing status on external item at 'externals'* (glob)
fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	275 X * externals (glob)
13332 927e3940bfc3 subrepo: fix update -C with svn subrepos when cwd != repo.root Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	276 $ cd ../..
927e3940bfc3 subrepo: fix update -C with svn subrepos when cwd != repo.root Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	277 $ hg -R t update -C
13322 c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	278
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	279 Fetching external item into 't/s/externals'* (glob)
13322 c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	280 Checked out external at revision 1.
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	281
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	282 Checked out revision 3.
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13287 diff changeset	283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
13332 927e3940bfc3 subrepo: fix update -C with svn subrepos when cwd != repo.root Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	284 $ cd t/s
16526 f2cc0ffb09de test-subrepo-svn: fix non-determinism Patrick Mezard <patrick@mezard.eu> parents: 16451 diff changeset	285 $ svn status \| sort
f2cc0ffb09de test-subrepo-svn: fix non-determinism Patrick Mezard <patrick@mezard.eu> parents: 16451 diff changeset	286
13410 1f2b2c33d386 tests: fixes for svn 1.4.2 Matt Mackall <mpm@selenic.com> parents: 13332 diff changeset	287 ? * a (glob)
1f2b2c33d386 tests: fixes for svn 1.4.2 Matt Mackall <mpm@selenic.com> parents: 13332 diff changeset	288 ? * f1 (glob)
1f2b2c33d386 tests: fixes for svn 1.4.2 Matt Mackall <mpm@selenic.com> parents: 13332 diff changeset	289 ? * f2 (glob)
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	290 Performing status on external item at 'externals'* (glob)
16526 f2cc0ffb09de test-subrepo-svn: fix non-determinism Patrick Mezard <patrick@mezard.eu> parents: 16451 diff changeset	291 X * externals (glob)
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	292
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	293 Sticky subrepositories, no changes
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	294 $ cd "$TESTTMP/sub/t"
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	295 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	296 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	297 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	298 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	299 3
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	300 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	301 $ hg update 1
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	302 U *s/alpha (glob)
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	303
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	304 Fetching external item into 's/externals' (glob)
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	305 Checked out external at revision 1.
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	306
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	307 Checked out revision 2.
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	308 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	309 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	310 1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	311 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	312 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	313 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	314 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	315
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 19811 diff changeset	316 Sticky subrepositories, file changes
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	317 $ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	318 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	319 $ svn add f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	320 A f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	321 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	322 $ hg id -n
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 17108 diff changeset	323 1+
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	324 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	325 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	326 2M
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	327 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	328 $ hg update tip
19811 5e10d41e7b9c merge: let the user choose to merge, keep local or keep remote subrepo revisions Angel Ezquerra <angel.ezquerra@gmail.com> parents: 19799 diff changeset	329 subrepository s diverged (local revision: 2, remote revision: 3)
42588 f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	330 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	331 what do you want to do? m
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	332 subrepository sources for s differ
42588 f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	333 you can use (l)ocal source (2) or (r)emote source (3).
f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	334 what do you want to do? l
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	335 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	336 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	337 2+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	338 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	339 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	340 2M
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	341 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	342 $ hg update --clean tip
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	343 U *s/alpha (glob)
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	344
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	345 Fetching external item into 's/externals' (glob)
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	346 Checked out external at revision 1.
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	347
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	348 Checked out revision 3.
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	349 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	350
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	351 Sticky subrepository, revision updates
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	352 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	353 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	354 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	355 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	356 3
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	357 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	358 $ cd s
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	359 $ svn update -qr 1
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	360 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	361 $ hg update 1
19811 5e10d41e7b9c merge: let the user choose to merge, keep local or keep remote subrepo revisions Angel Ezquerra <angel.ezquerra@gmail.com> parents: 19799 diff changeset	362 subrepository s diverged (local revision: 3, remote revision: 2)
42588 f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	363 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	364 what do you want to do? m
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	365 subrepository sources for s differ (in checked out version)
42588 f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	366 you can use (l)ocal source (1) or (r)emote source (2).
f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	367 what do you want to do? l
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	368 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	369 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	370 1+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	371 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	372 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	373 1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	374 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	375
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	376 Sticky subrepository, file changes and revision updates
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	377 $ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	378 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	379 $ svn add f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	380 A f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	381 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	382 1M
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	383 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	384 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	385 1+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	386 $ hg update tip
19811 5e10d41e7b9c merge: let the user choose to merge, keep local or keep remote subrepo revisions Angel Ezquerra <angel.ezquerra@gmail.com> parents: 19799 diff changeset	387 subrepository s diverged (local revision: 3, remote revision: 3)
42588 f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	388 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	389 what do you want to do? m
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	390 subrepository sources for s differ
42588 f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	391 you can use (l)ocal source (1) or (r)emote source (3).
f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	392 what do you want to do? l
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	393 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	394 $ hg id -n
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 17108 diff changeset	395 2+
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	396 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	397 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	398 1M
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	399 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	400
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	401 Sticky repository, update --clean
17032 7dd82e0c43ea test-subrepo-svn.t: partially adapt for Windows Eduard-Cristian Stefan <alexandrul.ct@gmail.com> parents: 16898 diff changeset	402 $ hg update --clean tip \| grep -v 's[/\]externals[/\]other'
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	403 U *s/alpha (glob)
fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	404 U *s (glob)
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	405
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	406 Fetching external item into 's/externals' (glob)
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	407 Checked out external at revision 1.
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	408
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	409 Checked out revision 3.
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	410 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	411 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	412 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	413 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	414 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	415 3
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	416 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	417
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	418 Test subrepo already at intended revision:
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	419 $ cd s
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	420 $ svn update -qr 2
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	421 $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	422 $ hg update 1
19811 5e10d41e7b9c merge: let the user choose to merge, keep local or keep remote subrepo revisions Angel Ezquerra <angel.ezquerra@gmail.com> parents: 19799 diff changeset	423 subrepository s diverged (local revision: 3, remote revision: 2)
42588 f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	424 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
f6540aba8e3e subrepos: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41496 diff changeset	425 what do you want to do? m
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	426 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	427 $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	428 1+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	429 $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	430 $ svnversion
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	431 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13410 diff changeset	432 $ cd ..
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	433
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	434 Test case where subversion would fail to update the subrepo because there
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	435 are unknown directories being replaced by tracked ones (happens with rebase).
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	436
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	437 $ cd "$WCROOT/src"
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	438 $ mkdir dir
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	439 $ echo epsilon.py > dir/epsilon.py
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	440 $ svn add dir
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	441 A dir
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	442 A dir/epsilon.py
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	443 $ svn ci -qm 'Add dir/epsilon.py'
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	444 $ cd ../..
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	445 $ hg init rebaserepo
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	446 $ cd rebaserepo
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	447 $ svn co -r5 --quiet "$SVNREPOURL"/src s
0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	448 $ echo "s = [svn] $SVNREPOURL/src" >> .hgsub
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	449 $ hg add .hgsub
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	450 $ hg ci -m addsub
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	451 $ echo a > a
23963 8f02682ff3b0 subrepo: don't abort in add when non-hg subrepos are present (issue4513) Matt Harbison <matt_harbison@yahoo.com> parents: 22947 diff changeset	452 $ hg add .
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	453 adding a
23963 8f02682ff3b0 subrepo: don't abort in add when non-hg subrepos are present (issue4513) Matt Harbison <matt_harbison@yahoo.com> parents: 22947 diff changeset	454 $ hg ci -m adda
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	455 $ hg up 0
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	456 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	457 $ svn up -qr6 s
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	458 $ hg ci -m updatesub
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	459 created new head
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	460 $ echo pyc > s/dir/epsilon.pyc
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	461 $ hg up 1
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	462 D *s/dir (glob)
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	463
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	464 Fetching external item into 's/externals' (glob)
14050 9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	465 Checked out external at revision 1.
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	466
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	467 Checked out revision 5.
9e8a9d45945c subrepo: handle svn tracked/unknown directory collisions Patrick Mezard <pmezard@gmail.com> parents: 13559 diff changeset	468 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
16898 bb91c602d4ad tests: change odd uses of 'if hghave' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16554 diff changeset	469 $ hg up -q 2
14664 0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	470
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	471 Modify one of the externals to point to a different path so we can
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	472 test having obstructions when switching branches on checkout:
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	473 $ hg checkout tip
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	474 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	475 $ echo "obstruct = [svn] $SVNREPOURL/externals" >> .hgsub
0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	476 $ svn co -r5 --quiet "$SVNREPOURL"/externals obstruct
15372 695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests Matt Mackall <mpm@selenic.com> parents: 15346 diff changeset	477 $ hg commit -m 'Start making obstructed working copy'
14664 0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	478 $ hg book other
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	479 $ hg co -r 'p1(tip)'
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	480 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
21404 ca275f7ec576 update: when deactivating a bookmark, print a message Siddharth Agarwal <sid0@fb.com> parents: 21024 diff changeset	481 (leaving bookmark other)
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	482 $ echo "obstruct = [svn] $SVNREPOURL/src" >> .hgsub
0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	483 $ svn co -r5 --quiet "$SVNREPOURL"/src obstruct
14664 0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	484 $ hg commit -m 'Other branch which will be obstructed'
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	485 created new head
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	486
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	487 Switching back to the head where we have another path mapped to the
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	488 same subrepo should work if the subrepo is clean.
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	489 $ hg co other
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	490 A *obstruct/other (glob)
14664 0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	491 Checked out revision 1.
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	492 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21404 diff changeset	493 (activating bookmark other)
14664 0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	494
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	495 This is surprising, but is also correct based on the current code:
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	496 $ echo "updating should (maybe) fail" > obstruct/other
0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	497 $ hg co tip
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 18364 diff changeset	498 abort: uncommitted changes
ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 18364 diff changeset	499 (commit or update --clean to discard changes)
14664 0ae98cd2a83f svn subrepos: work around checkout obstructions (issue2752) Augie Fackler <durin42@gmail.com> parents: 14052 diff changeset	500 [255]
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	501
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	502 Point to a Subversion branch which has since been deleted and recreated
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	503 First, create that condition in the repository.
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	504
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	505 $ hg ci --subrepos -m cleanup \| filter_svn_output
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	506 committing subrepository obstruct
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	507 Sending obstruct/other
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	508 Committed revision 7.
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	509 At revision 7.
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	510 $ svn mkdir -qm "baseline" $SVNREPOURL/trunk
048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	511 $ svn copy -qm "initial branch" $SVNREPOURL/trunk $SVNREPOURL/branch
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	512 $ svn co --quiet "$SVNREPOURL"/branch tempwc
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	513 $ cd tempwc
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	514 $ echo "something old" > somethingold
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	515 $ svn add somethingold
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	516 A somethingold
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	517 $ svn ci -qm 'Something old'
048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	518 $ svn rm -qm "remove branch" $SVNREPOURL/branch
048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	519 $ svn copy -qm "recreate branch" $SVNREPOURL/trunk $SVNREPOURL/branch
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	520 $ svn up -q
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	521 $ echo "something new" > somethingnew
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	522 $ svn add somethingnew
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	523 A somethingnew
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	524 $ svn ci -qm 'Something new'
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	525 $ cd ..
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	526 $ rm -rf tempwc
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	527 $ svn co "$SVNREPOURL/branch"@10 recreated
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	528 A recreated/somethingold
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	529 Checked out revision 10.
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	530 $ echo "recreated = [svn] $SVNREPOURL/branch" >> .hgsub
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	531 $ hg ci -m addsub
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	532 $ cd recreated
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	533 $ svn up -q
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	534 $ cd ..
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	535 $ hg ci -m updatesub
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	536 $ hg up -r-2
15607 fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	537 D *recreated/somethingnew (glob)
fab28a577a38 test-svn-subrepo: fix reference output for svn 1.7 Patrick Mezard <pmezard@gmail.com> parents: 15372 diff changeset	538 A *recreated/somethingold (glob)
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	539 Checked out revision 10.
7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	540 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
21404 ca275f7ec576 update: when deactivating a bookmark, print a message Siddharth Agarwal <sid0@fb.com> parents: 21024 diff changeset	541 (leaving bookmark other)
15282 d4addef0ec74 tests: don't use 'test -e' Mads Kiilerich <mads@kiilerich.com> parents: 14820 diff changeset	542 $ test -f recreated/somethingold
14820 7ef125fa9b35 subrepo: correct revision in svn checkout Eli Carter <eli.carter@tektronix.com> parents: 14664 diff changeset	543
16450 c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	544 Test archive
c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	545
25125 bd625cd4e5e7 progress: get the extremely verbose output out of default debug Pierre-Yves David <pierre-yves.david@fb.com> parents: 25111 diff changeset	546 $ hg archive -S ../archive-all --debug --config progress.debug=true
16450 c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	547 archiving: 0/2 files (0.00%)
c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	548 archiving: .hgsub 1/2 files (50.00%)
c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	549 archiving: .hgsubstate 2/2 files (100.00%)
c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	550 archiving (obstruct): 0/1 files (0.00%)
c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	551 archiving (obstruct): 1/1 files (100.00%)
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18109 diff changeset	552 archiving (recreated): 0/1 files (0.00%)
6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18109 diff changeset	553 archiving (recreated): 1/1 files (100.00%)
16450 c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	554 archiving (s): 0/2 files (0.00%)
c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	555 archiving (s): 1/2 files (50.00%)
c9c8c9053119 archive: make it work with svn subrepos (issue3308) Patrick Mezard <patrick@mezard.eu> parents: 15607 diff changeset	556 archiving (s): 2/2 files (100.00%)
16527 17a1f7690b49 subrepo: fix default implementation of forget() (issue3404) Patrick Mezard <patrick@mezard.eu> parents: 16526 diff changeset	557
25125 bd625cd4e5e7 progress: get the extremely verbose output out of default debug Pierre-Yves David <pierre-yves.david@fb.com> parents: 25111 diff changeset	558 $ hg archive -S ../archive-exclude --debug --config progress.debug=true -X **old
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	559 archiving: 0/2 files (0.00%)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	560 archiving: .hgsub 1/2 files (50.00%)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	561 archiving: .hgsubstate 2/2 files (100.00%)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	562 archiving (obstruct): 0/1 files (0.00%)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	563 archiving (obstruct): 1/1 files (100.00%)
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18109 diff changeset	564 archiving (recreated): 0 files
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	565 archiving (s): 0/2 files (0.00%)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	566 archiving (s): 1/2 files (50.00%)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	567 archiving (s): 2/2 files (100.00%)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	568 $ find ../archive-exclude \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	569 ../archive-exclude
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	570 ../archive-exclude/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	571 ../archive-exclude/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	572 ../archive-exclude/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	573 ../archive-exclude/obstruct
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	574 ../archive-exclude/obstruct/other
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	575 ../archive-exclude/s
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	576 ../archive-exclude/s/alpha
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	577 ../archive-exclude/s/dir
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	578 ../archive-exclude/s/dir/epsilon.py
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17033 diff changeset	579
16527 17a1f7690b49 subrepo: fix default implementation of forget() (issue3404) Patrick Mezard <patrick@mezard.eu> parents: 16526 diff changeset	580 Test forgetting files, not implemented in svn subrepo, used to
17a1f7690b49 subrepo: fix default implementation of forget() (issue3404) Patrick Mezard <patrick@mezard.eu> parents: 16526 diff changeset	581 traceback
17a1f7690b49 subrepo: fix default implementation of forget() (issue3404) Patrick Mezard <patrick@mezard.eu> parents: 16526 diff changeset	582
44096 e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	583 $ hg forget 'notafile'
e598c874b4af tests: stabilize test-subrepo-svn.t on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 42588 diff changeset	584 notafile: $ENOENT$
16527 17a1f7690b49 subrepo: fix default implementation of forget() (issue3404) Patrick Mezard <patrick@mezard.eu> parents: 16526 diff changeset	585 [1]
16554 ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	586
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	587 Test a subrepo referencing a just moved svn path. Last commit rev will
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	588 be different from the revision, and the path will be different as
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	589 well.
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	590
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	591 $ cd "$WCROOT"
16554 ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	592 $ svn up > /dev/null
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	593 $ mkdir trunk/subdir branches
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	594 $ echo a > trunk/subdir/a
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	595 $ svn add trunk/subdir branches
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	596 A trunk/subdir
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	597 A trunk/subdir/a
16554 ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	598 A branches
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	599 $ svn ci -qm addsubdir
048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	600 $ svn cp -qm branchtrunk $SVNREPOURL/trunk $SVNREPOURL/branches/somebranch
16554 ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	601 $ cd ..
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	602
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	603 $ hg init repo2
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	604 $ cd repo2
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	605 $ svn co $SVNREPOURL/branches/somebranch/subdir
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	606 A subdir/a
16554 ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	607 Checked out revision 15.
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 17032 diff changeset	608 $ echo "subdir = [svn] $SVNREPOURL/branches/somebranch/subdir" > .hgsub
16554 ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	609 $ hg add .hgsub
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	610 $ hg ci -m addsub
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	611 $ hg up null
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	612 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	613 $ hg up
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	614 A *subdir/a (glob)
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	615 Checked out revision 15.
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	616 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
ae2664ee0223 subrepo/svn: fix checked out rev number retrieval (issue2968) Patrick Mezard <patrick@mezard.eu> parents: 16530 diff changeset	617 $ cd ..
21564 2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	618
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	619 Test sanitizing ".hg/hgrc" in subrepo
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	620
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	621 $ cd sub/t
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	622 $ hg update -q -C tip
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	623 $ cd s
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	624 $ mkdir .hg
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	625 $ echo '.hg/hgrc in svn repo' > .hg/hgrc
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	626 $ mkdir -p sub/.hg
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	627 $ echo 'sub/.hg/hgrc in svn repo' > sub/.hg/hgrc
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	628 $ svn add .hg sub
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	629 A .hg
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	630 A .hg/hgrc
21564 2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	631 A sub
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	632 A sub/.hg
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	633 A sub/.hg/hgrc
26374 048e41e9a6ac tests: suppress verbose output of svn transaction Yuya Nishihara <yuya@tcha.org> parents: 25382 diff changeset	634 $ svn ci -qm 'add .hg/hgrc to be sanitized at hg update'
21564 2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	635 $ svn up -q
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	636 $ cd ..
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	637 $ hg commit -S -m 'commit with svn revision including .hg/hgrc'
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	638 $ grep ' s$' .hgsubstate
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	639 16 s
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	640 $ cd ..
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	641
21566 a01988cd9b61 subrepo: make "_sanitize()" take absolute path to the root of subrepo FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21564 diff changeset	642 $ hg -R tc pull -u -q 2>&1 \| sort
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	643 warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg'
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35230 diff changeset	644 warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg'
21564 2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	645 $ cd tc
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	646 $ grep ' s$' .hgsubstate
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	647 16 s
21930 a5168eb9b2bc tests: cat error messages are different on Solaris Danek Duvall <danek.duvall@oracle.com> parents: 21585 diff changeset	648 $ test -f s/.hg/hgrc
21564 2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	649 [1]
21930 a5168eb9b2bc tests: cat error messages are different on Solaris Danek Duvall <danek.duvall@oracle.com> parents: 21585 diff changeset	650 $ test -f s/sub/.hg/hgrc
21564 2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	651 [1]
2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	652
21567 5900bc09e684 subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21566 diff changeset	653 Test that sanitizing is omitted in meta data area:
5900bc09e684 subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21566 diff changeset	654
5900bc09e684 subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21566 diff changeset	655 $ mkdir s/.svn/.hg
5900bc09e684 subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21566 diff changeset	656 $ echo '.hg/hgrc in svn metadata area' > s/.svn/.hg/hgrc
5900bc09e684 subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21566 diff changeset	657 $ hg update -q -C '.^1'
5900bc09e684 subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21566 diff changeset	658
21564 2e91d4964ecd subrepo: make "_sanitize()" work FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	659 $ cd ../..
33657 60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	660
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	661 SEC: test for ssh exploit
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	662
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	663 $ hg init ssh-vuln
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	664 $ cd ssh-vuln
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	665 $ echo "s = [svn]$SVNREPOURL/src" >> .hgsub
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	666 $ svn co --quiet "$SVNREPOURL"/src s
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	667 $ hg add .hgsub
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	668 $ hg ci -m1
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	669 $ echo "s = [svn]svn+ssh://-oProxyCommand=touch%20owned%20nested" > .hgsub
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	670 $ hg ci -m2
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	671 $ cd ..
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	672 $ hg clone ssh-vuln ssh-vuln-clone
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	673 updating to branch default
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	674 abort: potentially unsafe url: 'svn+ssh://-oProxyCommand=touch owned nested' (in subrepository "s")
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	675 [255]
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	676
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	677 also check that a percent encoded '-' (%2D) doesn't work
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	678
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	679 $ cd ssh-vuln
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	680 $ echo "s = [svn]svn+ssh://%2DoProxyCommand=touch%20owned%20nested" > .hgsub
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	681 $ hg ci -m3
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	682 $ cd ..
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	683 $ rm -r ssh-vuln-clone
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	684 $ hg clone ssh-vuln ssh-vuln-clone
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	685 updating to branch default
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	686 abort: potentially unsafe url: 'svn+ssh://-oProxyCommand=touch owned nested' (in subrepository "s")
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	687 [255]
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	688
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	689 also check that hiding the attack in the username doesn't work:
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	690
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	691 $ cd ssh-vuln
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	692 $ echo "s = [svn]svn+ssh://%2DoProxyCommand=touch%20owned%20foo@example.com/nested" > .hgsub
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	693 $ hg ci -m3
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	694 $ cd ..
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	695 $ rm -r ssh-vuln-clone
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	696 $ hg clone ssh-vuln ssh-vuln-clone
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	697 updating to branch default
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	698 abort: potentially unsafe url: 'svn+ssh://-oProxyCommand=touch owned foo@example.com/nested' (in subrepository "s")
60ee7af2a2ba subrepo: add tests for svn rogue ssh urls (SEC) Sean Farley <sean@farley.io> parents: 33365 diff changeset	699 [255]

Mercurial > public > mercurial-scm > hg

annotate tests/test-subrepo-svn.t @ 45892:06b64fabf91c