Mercurial > public > mercurial-scm > hg
annotate tests/test-convert-svn-encoding.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 | 0ea9c86fac89 |
children | 1d075b857c90 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20117
diff
changeset
|
1 #require svn svn-bindings |
8882
48a04961b0dd
convert/svn: remove useless encoding/decoding calls (issue1676)
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 |
13519
43b3b761d9d1
tests: don't overwrite HGRCPATH
Martin Geisler <mg@aragost.com>
parents:
12943
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
4 > [extensions] |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
14162
diff
changeset
|
5 > convert = |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
6 > EOF |
8882
48a04961b0dd
convert/svn: remove useless encoding/decoding calls (issue1676)
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
8 $ svnadmin create svn-repo |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
9 $ svnadmin load -q svn-repo < "$TESTDIR/svn/encoding.svndump" |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
10 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
11 Convert while testing all possible outputs |
8882
48a04961b0dd
convert/svn: remove useless encoding/decoding calls (issue1676)
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 |
25125
bd625cd4e5e7
progress: get the extremely verbose output out of default debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24728
diff
changeset
|
13 $ hg --debug convert svn-repo A-hg --config progress.debug=1 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
14 initializing destination A-hg repository |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
15 reparent to file:/*/$TESTTMP/svn-repo (glob) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
16 run hg sink pre-conversion action |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
17 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
18 found trunk at 'trunk' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
19 found tags at 'tags' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
20 found branches at 'branches' |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
21 found branch branch\xc3\xa9 at 5 (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
22 found branch branch\xc3\xa9e at 6 (esc) |
22414
299eaa09b41b
convert: enable deterministic conversion progress bar for svn
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
23 scanning: 1/4 revisions (25.00%) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
24 reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
25 fetching revision log for "/trunk" from 4 to 0 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
26 parsing revision 4 (2 changes) |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
27 parsing revision 3 (4 changes) |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
28 parsing revision 2 (3 changes) |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
29 parsing revision 1 (3 changes) |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
30 no copyfrom path, don't know what to do. |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
31 '/branches' is not under '/trunk', ignoring |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
32 '/tags' is not under '/trunk', ignoring |
22414
299eaa09b41b
convert: enable deterministic conversion progress bar for svn
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
33 scanning: 2/4 revisions (50.00%) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
34 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9 (glob) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
35 fetching revision log for "/branches/branch\xc3\xa9" from 5 to 0 (esc) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
36 parsing revision 5 (1 changes) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
37 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
38 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9 (glob) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
39 found parent of branch /branches/branch\xc3\xa9 at 4: /trunk (esc) |
22414
299eaa09b41b
convert: enable deterministic conversion progress bar for svn
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
40 scanning: 3/4 revisions (75.00%) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
41 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
42 fetching revision log for "/branches/branch\xc3\xa9e" from 6 to 0 (esc) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
43 parsing revision 6 (1 changes) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
44 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
45 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
46 found parent of branch /branches/branch\xc3\xa9e at 5: /branches/branch\xc3\xa9 (esc) |
22414
299eaa09b41b
convert: enable deterministic conversion progress bar for svn
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
47 scanning: 4/4 revisions (100.00%) |
299eaa09b41b
convert: enable deterministic conversion progress bar for svn
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
48 scanning: 5/4 revisions (125.00%) |
299eaa09b41b
convert: enable deterministic conversion progress bar for svn
Augie Fackler <raf@durin42.com>
parents:
22046
diff
changeset
|
49 scanning: 6/4 revisions (150.00%) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
50 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
51 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
52 5 init projA |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
53 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
54 converting: 0/6 revisions (0.00%) |
39109
a915db9a5e77
commit: add debug message regarding manifest reuse
Yuya Nishihara <yuya@tcha.org>
parents:
35451
diff
changeset
|
55 reusing manifest from p1 (no file change) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
56 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28471
diff
changeset
|
57 updating the branch cache |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
58 4 hello |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
59 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
60 converting: 1/6 revisions (16.67%) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
61 reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
62 scanning paths: /trunk/\xc3\xa0 0/3 paths (0.00%) (esc) |
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
63 scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 paths (33.33%) (esc) |
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
64 scanning paths: /trunk/\xc3\xa9 2/3 paths (66.67%) (esc) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
65 committing files: |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
66 \xc3\xa0/e\xcc\x81 (esc) |
28470
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
67 getting files: \xc3\xa0/e\xcc\x81 1/2 files (50.00%) (esc) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
68 \xc3\xa9 (esc) |
28470
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
69 getting files: \xc3\xa9 2/2 files (100.00%) (esc) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
70 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
71 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28471
diff
changeset
|
72 updating the branch cache |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
73 3 copy files |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
74 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
75 converting: 2/6 revisions (33.33%) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
76 scanning paths: /trunk/\xc3\xa0 0/4 paths (0.00%) (esc) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
77 gone from -1 |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
78 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
79 reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
80 scanning paths: /trunk/\xc3\xa8 1/4 paths (25.00%) (esc) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
81 copied to \xc3\xa8 from \xc3\xa9@2 (esc) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
82 scanning paths: /trunk/\xc3\xa9 2/4 paths (50.00%) (esc) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
83 gone from -1 |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
84 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
85 reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
86 scanning paths: /trunk/\xc3\xb9 3/4 paths (75.00%) (esc) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
87 mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc) |
28470
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
88 getting files: \xc3\xa0/e\xcc\x81 1/4 files (25.00%) (esc) |
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
89 getting files: \xc3\xa9 2/4 files (50.00%) (esc) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
90 committing files: |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
91 \xc3\xa8 (esc) |
28470
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
92 getting files: \xc3\xa8 3/4 files (75.00%) (esc) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
93 \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) |
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
94 \xc3\xb9/e\xcc\x81 (esc) |
28470
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
95 getting files: \xc3\xb9/e\xcc\x81 4/4 files (100.00%) (esc) |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12679
diff
changeset
|
96 \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
97 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
98 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28471
diff
changeset
|
99 updating the branch cache |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
100 2 remove files |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
101 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
102 converting: 3/6 revisions (50.00%) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
103 scanning paths: /trunk/\xc3\xa8 0/2 paths (0.00%) (esc) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
104 gone from -1 |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
105 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
106 reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
107 scanning paths: /trunk/\xc3\xb9 1/2 paths (50.00%) (esc) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
108 gone from -1 |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
109 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
110 reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) |
28470
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
111 getting files: \xc3\xa8 1/2 files (50.00%) (esc) |
80bd110dbf5e
convert: specify unit for ui.progress when operating on files
Anton Shestakov <av6@dwimlabs.net>
parents:
25125
diff
changeset
|
112 getting files: \xc3\xb9/e\xcc\x81 2/2 files (100.00%) (esc) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
113 committing files: |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
114 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
115 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28471
diff
changeset
|
116 updating the branch cache |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
117 1 branch to branch? |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
118 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
119 converting: 4/6 revisions (66.67%) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
120 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9 (glob) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
121 scanning paths: /branches/branch\xc3\xa9 0/1 paths (0.00%) (esc) |
39109
a915db9a5e77
commit: add debug message regarding manifest reuse
Yuya Nishihara <yuya@tcha.org>
parents:
35451
diff
changeset
|
122 reusing manifest from p1 (no file change) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
123 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28471
diff
changeset
|
124 updating the branch cache |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
125 0 branch to branch?e |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
126 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
127 converting: 5/6 revisions (83.33%) |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
128 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) |
28471
f106913c6a4e
convert: specify unit for ui.progress when scanning paths
Anton Shestakov <av6@dwimlabs.net>
parents:
28470
diff
changeset
|
129 scanning paths: /branches/branch\xc3\xa9e 0/1 paths (0.00%) (esc) |
39109
a915db9a5e77
commit: add debug message regarding manifest reuse
Yuya Nishihara <yuya@tcha.org>
parents:
35451
diff
changeset
|
130 reusing manifest from p1 (no file change) |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
131 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28471
diff
changeset
|
132 updating the branch cache |
35451
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
133 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
134 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
135 reparent to file:/*/$TESTTMP/svn-repo (glob) |
d624c8558c61
tests: update expected output of svn encoding test
Augie Fackler <augie@google.com>
parents:
32267
diff
changeset
|
136 reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
137 updating tags |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
138 committing files: |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
139 .hgtags |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
140 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23587
diff
changeset
|
141 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28471
diff
changeset
|
142 updating the branch cache |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
143 run hg sink post-conversion action |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
144 $ cd A-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
145 $ hg up |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
146 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8882
48a04961b0dd
convert/svn: remove useless encoding/decoding calls (issue1676)
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
147 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
148 Check tags are in UTF-8 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
149 |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12942
diff
changeset
|
150 $ cat .hgtags |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13519
diff
changeset
|
151 e94e4422020e715add80525e8f0f46c9968689f1 branch\xc3\xa9e (esc) |
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13519
diff
changeset
|
152 f7e66f98380ed1e53a797c5c7a7a2616a7ab377d branch\xc3\xa9 (esc) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
153 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8887
diff
changeset
|
154 $ cd .. |
44968
75b59d221aa3
py3: pass native string to urlreq.url2pathname()
Manuel Jacob <me@manueljacob.de>
parents:
39109
diff
changeset
|
155 |
45020
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
156 Subversion sources don't support non-ASCII characters in HTTP(S) URLs. |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
157 |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
158 $ XFF=$($PYTHON -c 'from mercurial.utils.procutil import stdout; stdout.write(b"\xff")') |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
159 $ hg convert --source-type=svn http://localhost:$HGPORT/$XFF test |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
160 initializing destination test repository |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
161 Subversion sources don't support non-ASCII characters in HTTP(S) URLs. Please percent-encode them. |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
162 http://localhost:$HGPORT/\xff does not look like a Subversion repository (esc) |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
163 abort: http://localhost:$HGPORT/\xff: missing or unsupported repository (esc) |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
164 [255] |
697212a830fb
convert: bail out in Subversion source if encountering non-ASCII HTTP(S) URL
Manuel Jacob <me@manueljacob.de>
parents:
44968
diff
changeset
|
165 |
45022
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
166 In Subversion, paths are Unicode (encoded as UTF-8). Therefore paths that can't |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
167 be converted between UTF-8 and the locale encoding (which is always ASCII in |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
168 tests) don't work. |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
169 |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
170 $ cp -R svn-repo $XFF |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
171 $ hg convert $XFF test |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
172 initializing destination test repository |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
173 Subversion requires that paths can be converted to Unicode using the current locale encoding (ascii) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
174 \xff does not look like a CVS checkout (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
175 $TESTTMP/\xff does not look like a Git repository (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
176 \xff does not look like a Subversion repository (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
177 \xff is not a local Mercurial repository (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
178 \xff does not look like a darcs repository (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
179 \xff does not look like a monotone repository (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
180 \xff does not look like a GNU Arch repository (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
181 \xff does not look like a Bazaar repository (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
182 cannot find required "p4" tool |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
183 abort: \xff: missing or unsupported repository (glob) (esc) |
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
184 [255] |
45023
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
185 $ hg convert file://$TESTTMP/$XFF test |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
186 initializing destination test repository |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
187 Subversion requires that file URLs can be converted to Unicode using the current locale encoding (ascii) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
188 file:/*/$TESTTMP/\xff does not look like a CVS checkout (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
189 $TESTTMP/file:$TESTTMP/\xff does not look like a Git repository (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
190 file:/*/$TESTTMP/\xff does not look like a Subversion repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
191 file:/*/$TESTTMP/\xff is not a local Mercurial repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
192 file:/*/$TESTTMP/\xff does not look like a darcs repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
193 file:/*/$TESTTMP/\xff does not look like a monotone repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
194 file:/*/$TESTTMP/\xff does not look like a GNU Arch repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
195 file:/*/$TESTTMP/\xff does not look like a Bazaar repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
196 file:/*/$TESTTMP/\xff does not look like a P4 repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
197 abort: file:/*/$TESTTMP/\xff: missing or unsupported repository (glob) (esc) |
e54c3cafda15
convert: convert URLs to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45022
diff
changeset
|
198 [255] |
45022
e3b19004087a
convert: correctly convert paths to UTF-8 for Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45020
diff
changeset
|
199 |
45027
0ea9c86fac89
convert: handle percent-encoded bytes in file URLs like Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45024
diff
changeset
|
200 Subversion decodes percent-encoded bytes on the converted, UTF-8-encoded |
0ea9c86fac89
convert: handle percent-encoded bytes in file URLs like Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45024
diff
changeset
|
201 string. Therefore, if the percent-encoded bytes aren't valid UTF-8, Subversion |
0ea9c86fac89
convert: handle percent-encoded bytes in file URLs like Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45024
diff
changeset
|
202 would choke on them when converting them to the locale encoding. |
44968
75b59d221aa3
py3: pass native string to urlreq.url2pathname()
Manuel Jacob <me@manueljacob.de>
parents:
39109
diff
changeset
|
203 |
45024
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
204 $ hg convert file://$TESTTMP/%FF test |
44968
75b59d221aa3
py3: pass native string to urlreq.url2pathname()
Manuel Jacob <me@manueljacob.de>
parents:
39109
diff
changeset
|
205 initializing destination test repository |
45027
0ea9c86fac89
convert: handle percent-encoded bytes in file URLs like Subversion
Manuel Jacob <me@manueljacob.de>
parents:
45024
diff
changeset
|
206 Subversion does not support non-UTF-8 percent-encoded bytes in file URLs |
45024
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
207 file:/*/$TESTTMP/%FF does not look like a CVS checkout (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
208 $TESTTMP/file:$TESTTMP/%FF does not look like a Git repository |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
209 file:/*/$TESTTMP/%FF does not look like a Subversion repository (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
210 file:/*/$TESTTMP/%FF is not a local Mercurial repository (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
211 file:/*/$TESTTMP/%FF does not look like a darcs repository (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
212 file:/*/$TESTTMP/%FF does not look like a monotone repository (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
213 file:/*/$TESTTMP/%FF does not look like a GNU Arch repository (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
214 file:/*/$TESTTMP/%FF does not look like a Bazaar repository (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
215 file:/*/$TESTTMP/%FF does not look like a P4 repository (glob) |
6597e2a73a28
tests: use path inside test dir
Manuel Jacob <me@manueljacob.de>
parents:
45023
diff
changeset
|
216 abort: file:/*/$TESTTMP/%FF: missing or unsupported repository (glob) |
44968
75b59d221aa3
py3: pass native string to urlreq.url2pathname()
Manuel Jacob <me@manueljacob.de>
parents:
39109
diff
changeset
|
217 [255] |