mercurial-scm/hg: tests/test-simplemerge.py annotate

annotate tests/test-simplemerge.py @ 45892:06b64fabf91c

copies: cache the ancestor checking call when tracing copy A good share of the time spent in this function is spent doing ancestors checking. To avoid spending time in duplicated call, we cache the result of calls. In the slower case, this provide a quite significant performance boost. Below are the result for a set of selected pairs (many of them pathological): (And further down is another table that summarize the current state of filelog based vs changeset base copy tracing) The benchmark have been configured to be killed after 6 minutes of runtime, which mean that any detect slower than 2 minutes will be marked as "killed". This drop some useful information about how much slower these case are? but also prevent 99% of the benchmark time to be spent on case that can be labelled "very slow" anyway. Repo Case Source-Rev Dest-Rev Old-Time New-Time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000044 s, +0.000000 s, ? 1.0000 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000138 s, +0.000000 s, ? 1.0000 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005067 s, 0.005052 s, -0.000015 s, ? 0.9970 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000218 s, 0.000219 s, +0.000001 s, ? 1.0046 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000053 s, 0.000055 s, +0.000002 s, ? 1.0377 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000125 s, 0.000128 s, +0.000003 s, ? 1.0240 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001098 s, 0.001089 s, -0.000009 s, ? 0.9918 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017546 s, 0.017407 s, -0.000139 s, ? 0.9921 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.096723 s, 0.094175 s, -0.002548 s, ? 0.9737 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.271796 s, 0.238009 s, -0.033787 s, ? 0.8757 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.128602 s, 0.125876 s, -0.002726 s, ? 0.9788 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 7.086742 s, 3.581556 s, -3.505186 s, ? 0.5054 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016634 s, 0.016721 s, +0.000087 s, ? 1.0052 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.254225 s, 0.242367 s, -0.011858 s, ? 0.9534 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000166 s, 0.000165 s, -0.000001 s, ? 0.9940 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000118 s, 0.000114 s, -0.000004 s, ? 0.9661 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000296 s, +0.000000 s, ? 1.0000 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001137 s, 0.001124 s, -0.000013 s, ? 0.9886 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.014133 s, 0.013060 s, -0.001073 s, ? 0.9241 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.016988 s, 0.017112 s, +0.000124 s, ? 1.0073 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.676361 s, 0.660350 s, -0.016011 s, ? 0.9763 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 12.515149 s, 10.032499 s, -2.482650 s, ? 0.8016 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000186 s, 0.000189 s, +0.000003 s, ? 1.0161 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000459 s, 0.000462 s, +0.000003 s, ? 1.0065 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000273 s, 0.000270 s, -0.000003 s, ? 0.9890 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001503 s, 0.001474 s, -0.000029 s, ? 0.9807 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004862 s, 0.004806 s, -0.000056 s, ? 0.9885 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088291 s, 0.085150 s, -0.003141 s, ? 0.9644 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007113 s, 0.007064 s, -0.000049 s, ? 0.9931 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004687 s, 0.004741 s, +0.000054 s, ? 1.0115 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.198710 s, 0.190133 s, -0.008577 s, ? 0.9568 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.036068 s, 0.035651 s, -0.000417 s, ? 0.9884 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.465362 s, 0.440694 s, -0.024668 s, ? 0.9470 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 24.519684 s, 18.454163 s, -6.065521 s, ? 0.7526 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 42.711897 s, 31.562719 s, -11.149178 s, ? 0.7390 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001201 s, 0.001189 s, -0.000012 s, ? 0.9900 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001216 s, 0.001204 s, -0.000012 s, ? 0.9901 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000595 s, 0.000586 s, -0.000009 s, ? 0.9849 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001856 s, 0.001845 s, -0.000011 s, ? 0.9941 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.064936 s, 0.063822 s, -0.001114 s, ? 0.9828 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.090601 s, 0.088038 s, -0.002563 s, ? 0.9717 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007510 s, 0.007389 s, -0.000121 s, ? 0.9839 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004911 s, 0.004868 s, -0.000043 s, ? 0.9912 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.233231 s, 0.222450 s, -0.010781 s, ? 0.9538 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.419989 s, 0.370675 s, -0.049314 s, ? 0.8826 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.401521 s, 0.358020 s, -0.043501 s, ? 0.8917 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.179555 s, 0.145235 s, -0.034320 s, ? 0.8089 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.038004 s, 0.037606 s, -0.000398 s, ? 0.9895 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 52.838482 s, 7.382439 s, -45.456043 s, ? 0.1397 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 8.705874 s, 7.273506 s, -1.432368 s, ? 0.8355 mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.126708 s, 1.074593 s, -0.052115 s, ? 0.9537 mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 83.854020 s, 27.746195 s, -56.107825 s, ? 0.3309 Below is a table comparing the runtime of the current "filelog centric" algorithm, with the "changeset centric" one, we just modified. The changeset centric algorithm is a significant win in many scenario, but they are still various cases where it is quite slower. When many revision has to be considered the cost of retrieving the copy information, creating new dictionaries, merging dictionaries and checking if revision are ancestors of each other can slow things down. The rest of this series, will introduce a rust version of the copy tracing code to deal with most of theses issues. Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000914 s, 0.000044 s, - 0.000870 s, ? 0.048140 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001812 s, 0.000138 s, - 0.001674 s, ? 0.076159 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.017954 s, 0.005052 s, - 0.012902 s, ? 0.281386 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001509 s, 0.000219 s, - 0.001290 s, ? 0.145129 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.206881 s, 0.000055 s, - 0.206826 s, ? 0.000266 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016951 s, 0.000128 s, - 0.016823 s, ? 0.007551 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019096 s, 0.001089 s, - 0.018007 s, ? 0.057028 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.762506 s, 0.017407 s, - 0.745099 s, ? 0.022829 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.179211 s, 0.094175 s, - 1.085036 s, ? 0.079863 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.249058 s, 0.238009 s, - 1.011049 s, ? 0.190551 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.614107 s, 0.125876 s, - 1.488231 s, ? 0.077985 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001064 s, 3.581556 s, + 3.580492 s, ? 3366.124060 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.061275 s, 0.016721 s, - 1.044554 s, ? 0.015756 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.341119 s, 0.242367 s, - 1.098752 s, ? 0.180720 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027803 s, 0.000165 s, - 0.027638 s, ? 0.005935 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.130014 s, 0.000114 s, - 0.129900 s, ? 0.000877 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.024990 s, 0.000296 s, - 0.024694 s, ? 0.011845 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052201 s, 0.001124 s, - 0.051077 s, ? 0.021532 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037642 s, 0.013060 s, - 0.024582 s, ? 0.346953 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.197086 s, 0.017112 s, - 0.179974 s, ? 0.086825 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.935148 s, 0.660350 s, - 0.274798 s, ? 0.706145 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.920674 s, 10.032499 s, + 6.111825 s, ? 2.558871 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024232 s, 0.000189 s, - 0.024043 s, ? 0.007800 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141483 s, 0.000462 s, - 0.141021 s, ? 0.003265 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025775 s, 0.000270 s, - 0.025505 s, ? 0.010475 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.084922 s, 0.001474 s, - 0.083448 s, ? 0.017357 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.194784 s, 0.004806 s, - 0.189978 s, ? 0.024673 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.161103 s, 0.085150 s, - 2.075953 s, ? 0.039401 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089347 s, 0.007064 s, - 0.082283 s, ? 0.079063 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.732171 s, 0.004741 s, - 0.727430 s, ? 0.006475 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.157287 s, 0.190133 s, - 0.967154 s, ? 0.164292 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.726568 s, 0.035651 s, - 6.690917 s, ? 0.005300 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.266229 s, 0.440694 s, - 2.825535 s, ? 0.134924 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 15.860534 s, 18.454163 s, + 2.593629 s, ? 1.163527 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.450475 s, 31.562719 s, +11.112244 s, ? 1.543373 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080442 s, 0.001189 s, - 0.079253 s, ? 0.014781 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.497672 s, 0.001204 s, - 0.496468 s, ? 0.002419 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021183 s, 0.000586 s, - 0.020597 s, ? 0.027664 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.230991 s, 0.001845 s, - 0.229146 s, ? 0.007987 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118461 s, 0.063822 s, - 1.054639 s, ? 0.057062 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.206083 s, 0.088038 s, - 2.118045 s, ? 0.039907 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089404 s, 0.007389 s, - 0.082015 s, ? 0.082647 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.733043 s, 0.004868 s, - 0.728175 s, ? 0.006641 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.163367 s, 0.222450 s, - 0.940917 s, ? 0.191212 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.085456 s, 0.370675 s, + 0.285219 s, ? 4.337612 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.083601 s, 0.358020 s, + 0.274419 s, ? 4.282485 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.366614 s, 0.145235 s, - 7.221379 s, ? 0.019715 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.664464 s, 0.037606 s, - 6.626858 s, ? 0.005643 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.467836 s, 7.382439 s, - 0.085397 s, ? 0.988565 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.801294 s, 7.273506 s, - 2.527788 s, ? 0.742097 mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.091886 s, killed mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.491140 s, 1.074593 s, -25.416547 s, ? 0.040564 mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.092863 s, killed mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.226823 s, killed mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 18.914630 s, 27.746195 s, + 8.831565 s, ? 1.466917 mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.198903 s, killed mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 24.952268 s, killed Differential Revision: https://phab.mercurial-scm.org/D9296

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 02 Nov 2020 11:03:56 +0100
parents	2372284d9457
children	98e3a693061a

rev	line source
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	1 # Copyright (C) 2004, 2005 Canonical Ltd
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	2 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	3 # This program is free software; you can redistribute it and/or modify
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	4 # it under the terms of the GNU General Public License as published by
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	5 # the Free Software Foundation; either version 2 of the License, or
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	6 # (at your option) any later version.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	7 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	8 # This program is distributed in the hope that it will be useful,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	11 # GNU General Public License for more details.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	12 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	13 # You should have received a copy of the GNU General Public License
15782 7de7630053cb Remove FSF mailing address from GPL headers Martin Geisler <mg@aragost.com> parents: 10413 diff changeset	14 # along with this program; if not, see <http://www.gnu.org/licenses/>.
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	15
28927 2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	16 from __future__ import absolute_import
2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	17
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	18 import unittest
28927 2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	19 from mercurial import (
2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	20 error,
2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	21 simplemerge,
2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	22 util,
2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	23 )
6002 abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	24
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	25 from mercurial.utils import stringutil
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 32279 diff changeset	26
28927 2d433fa7ff44 tests: make test-simplemerge use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28861 diff changeset	27 TestCase = unittest.TestCase
6002 abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	28 # bzr compatible interface, for the tests
abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	29 class Merge3(simplemerge.Merge3Text):
abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	30 """3-way merge of texts.
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	31
6002 abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	32 Given BASE, OTHER, THIS, tries to produce a combined text
abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	33 incorporating the changes from both BASE->OTHER and BASE->THIS.
abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	34 All three will typically be sequences of lines."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	35
6002 abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	36 def __init__(self, base, a, b):
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	37 basetext = b'\n'.join([i.strip(b'\n') for i in base] + [b''])
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	38 atext = b'\n'.join([i.strip(b'\n') for i in a] + [b''])
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	39 btext = b'\n'.join([i.strip(b'\n') for i in b] + [b''])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	40 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	41 stringutil.binary(basetext)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	42 or stringutil.binary(atext)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	43 or stringutil.binary(btext)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	44 ):
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	45 raise error.Abort(b"don't know how to merge binary files")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	46 simplemerge.Merge3Text.__init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	47 self, basetext, atext, btext, base, a, b
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	48 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	49
6002 abd66eb0889e merge: move the bulk of simplemerge into core Matt Mackall <mpm@selenic.com> parents: 4633 diff changeset	50
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	51 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	52
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	53
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	54 def split_lines(t):
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 26587 diff changeset	55 return util.stringio(t).readlines()
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	56
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	57
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	58 ############################################################
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	59 # test case data from the gnu diffutils manual
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	60 # common base
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	61 TZU = split_lines(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	62 b""" The Nameless is the origin of Heaven and Earth;
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	63 The named is the mother of all things.
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4363 diff changeset	64
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	65 Therefore let there always be non-being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	66 so we may see their subtlety,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	67 And let there always be being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	68 so we may see their outcome.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	69 The two are the same,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	70 But after they are produced,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	71 they have different names.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	72 They both may be called deep and profound.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	73 Deeper and more profound,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	74 The door of all subtleties!
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	75 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	76 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	77
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	78 LAO = split_lines(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	79 b""" The Way that can be told of is not the eternal Way;
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	80 The name that can be named is not the eternal name.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	81 The Nameless is the origin of Heaven and Earth;
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	82 The Named is the mother of all things.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	83 Therefore let there always be non-being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	84 so we may see their subtlety,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	85 And let there always be being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	86 so we may see their outcome.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	87 The two are the same,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	88 But after they are produced,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	89 they have different names.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	90 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	91 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	92
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	93
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	94 TAO = split_lines(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	95 b""" The Way that can be told of is not the eternal Way;
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	96 The name that can be named is not the eternal name.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	97 The Nameless is the origin of Heaven and Earth;
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	98 The named is the mother of all things.
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4363 diff changeset	99
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	100 Therefore let there always be non-being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	101 so we may see their subtlety,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	102 And let there always be being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	103 so we may see their result.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	104 The two are the same,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	105 But after they are produced,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	106 they have different names.
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4363 diff changeset	107
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	108 -- The Way of Lao-Tzu, tr. Wing-tsit Chan
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	109
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	110 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	111 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	112
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	113 MERGED_RESULT = split_lines(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	114 b"""\
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	115 The Way that can be told of is not the eternal Way;
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	116 The name that can be named is not the eternal name.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	117 The Nameless is the origin of Heaven and Earth;
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	118 The Named is the mother of all things.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	119 Therefore let there always be non-being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	120 so we may see their subtlety,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	121 And let there always be being,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	122 so we may see their result.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	123 The two are the same,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	124 But after they are produced,
38645 02850baddadd tests: prevent conflict markers in test case from triggering warnings Danny Hooper <hooper@google.com> parents: 37892 diff changeset	125 they have different names.\
02850baddadd tests: prevent conflict markers in test case from triggering warnings Danny Hooper <hooper@google.com> parents: 37892 diff changeset	126 \n<<<<<<< LAO\
02850baddadd tests: prevent conflict markers in test case from triggering warnings Danny Hooper <hooper@google.com> parents: 37892 diff changeset	127 \n=======
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4363 diff changeset	128
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	129 -- The Way of Lao-Tzu, tr. Wing-tsit Chan
38645 02850baddadd tests: prevent conflict markers in test case from triggering warnings Danny Hooper <hooper@google.com> parents: 37892 diff changeset	130 \
02850baddadd tests: prevent conflict markers in test case from triggering warnings Danny Hooper <hooper@google.com> parents: 37892 diff changeset	131 \n>>>>>>> TAO
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	132 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	133 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	134
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	135
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	136 class TestMerge3(TestCase):
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	137 def log(self, msg):
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	138 pass
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	139
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	140 def test_no_changes(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	141 """No conflicts because nothing changed"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	142 m3 = Merge3([b'aaa', b'bbb'], [b'aaa', b'bbb'], [b'aaa', b'bbb'])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	143
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	144 self.assertEqual(m3.find_unconflicted(), [(0, 2)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	145
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	146 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	147 list(m3.find_sync_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	148 [(0, 2, 0, 2, 0, 2), (2, 2, 2, 2, 2, 2)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	149 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	150
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	151 self.assertEqual(list(m3.merge_regions()), [(b'unchanged', 0, 2)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	152
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	153 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	154 list(m3.merge_groups()), [(b'unchanged', [b'aaa', b'bbb'])]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	155 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	156
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	157 def test_front_insert(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	158 m3 = Merge3([b'zz'], [b'aaa', b'bbb', b'zz'], [b'zz'])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	159
17513 d08b333816c6 spelling: sentinel timeless@mozdev.org parents: 15782 diff changeset	160 # todo: should use a sentinel at end as from get_matching_blocks
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	161 # to match without zz
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	162 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	163 list(m3.find_sync_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	164 [(0, 1, 2, 3, 0, 1), (1, 1, 3, 3, 1, 1)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	165 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	166
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	167 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	168 list(m3.merge_regions()), [(b'a', 0, 2), (b'unchanged', 0, 1)]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	169 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	170
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	171 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	172 list(m3.merge_groups()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	173 [(b'a', [b'aaa', b'bbb']), (b'unchanged', [b'zz'])],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	174 )
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4363 diff changeset	175
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	176 def test_null_insert(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	177 m3 = Merge3([], [b'aaa', b'bbb'], [])
17513 d08b333816c6 spelling: sentinel timeless@mozdev.org parents: 15782 diff changeset	178 # todo: should use a sentinel at end as from get_matching_blocks
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	179 # to match without zz
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	180 self.assertEqual(list(m3.find_sync_regions()), [(0, 0, 2, 2, 0, 0)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	181
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	182 self.assertEqual(list(m3.merge_regions()), [(b'a', 0, 2)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	183
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	184 self.assertEqual(list(m3.merge_lines()), [b'aaa', b'bbb'])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	185
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	186 def test_no_conflicts(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	187 """No conflicts because only one side changed"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	188 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	189 [b'aaa', b'bbb'], [b'aaa', b'111', b'bbb'], [b'aaa', b'bbb']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	190 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	191
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	192 self.assertEqual(m3.find_unconflicted(), [(0, 1), (1, 2)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	193
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	194 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	195 list(m3.find_sync_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	196 [(0, 1, 0, 1, 0, 1), (1, 2, 2, 3, 1, 2), (2, 2, 3, 3, 2, 2)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	197 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	198
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	199 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	200 list(m3.merge_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	201 [(b'unchanged', 0, 1), (b'a', 1, 2), (b'unchanged', 1, 2)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	202 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	203
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	204 def test_append_a(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	205 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	206 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	207 [b'aaa\n', b'bbb\n', b'222\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	208 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	209 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	210
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	211 self.assertEqual(b''.join(m3.merge_lines()), b'aaa\nbbb\n222\n')
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	212
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	213 def test_append_b(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	214 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	215 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	216 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	217 [b'aaa\n', b'bbb\n', b'222\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	218 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	219
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	220 self.assertEqual(b''.join(m3.merge_lines()), b'aaa\nbbb\n222\n')
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	221
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	222 def test_append_agreement(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	223 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	224 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	225 [b'aaa\n', b'bbb\n', b'222\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	226 [b'aaa\n', b'bbb\n', b'222\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	227 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	228
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	229 self.assertEqual(b''.join(m3.merge_lines()), b'aaa\nbbb\n222\n')
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	230
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	231 def test_append_clash(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	232 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	233 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	234 [b'aaa\n', b'bbb\n', b'222\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	235 [b'aaa\n', b'bbb\n', b'333\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	236 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	237
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	238 ml = m3.merge_lines(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	239 name_a=b'a',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	240 name_b=b'b',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	241 start_marker=b'<<',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	242 mid_marker=b'--',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	243 end_marker=b'>>',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	244 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	245 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	246 b''.join(ml),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	247 b'aaa\n' b'bbb\n' b'<< a\n' b'222\n' b'--\n' b'333\n' b'>> b\n',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	248 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	249
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	250 def test_insert_agreement(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	251 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	252 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	253 [b'aaa\n', b'222\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	254 [b'aaa\n', b'222\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	255 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	256
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	257 ml = m3.merge_lines(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	258 name_a=b'a',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	259 name_b=b'b',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	260 start_marker=b'<<',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	261 mid_marker=b'--',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	262 end_marker=b'>>',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	263 )
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	264 self.assertEqual(b''.join(ml), b'aaa\n222\nbbb\n')
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4363 diff changeset	265
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	266 def test_insert_clash(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	267 """Both try to insert lines in the same place."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	268 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	269 [b'aaa\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	270 [b'aaa\n', b'111\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	271 [b'aaa\n', b'222\n', b'bbb\n'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	272 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	273
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	274 self.assertEqual(m3.find_unconflicted(), [(0, 1), (1, 2)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	275
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	276 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	277 list(m3.find_sync_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	278 [(0, 1, 0, 1, 0, 1), (1, 2, 2, 3, 2, 3), (2, 2, 3, 3, 3, 3)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	279 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	280
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	281 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	282 list(m3.merge_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	283 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	284 (b'unchanged', 0, 1),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	285 (b'conflict', 1, 1, 1, 2, 1, 2),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	286 (b'unchanged', 1, 2),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	287 ],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	288 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	289
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	290 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	291 list(m3.merge_groups()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	292 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	293 (b'unchanged', [b'aaa\n']),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	294 (b'conflict', [], [b'111\n'], [b'222\n']),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	295 (b'unchanged', [b'bbb\n']),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	296 ],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	297 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	298
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	299 ml = m3.merge_lines(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	300 name_a=b'a',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	301 name_b=b'b',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	302 start_marker=b'<<',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	303 mid_marker=b'--',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	304 end_marker=b'>>',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	305 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	306 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	307 b''.join(ml),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	308 b'''aaa
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	309 << a
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	310 111
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	311 --
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	312 222
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	313 >> b
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	314 bbb
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	315 ''',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	316 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	317
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	318 def test_replace_clash(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	319 """Both try to insert lines in the same place."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	320 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	321 [b'aaa', b'000', b'bbb'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	322 [b'aaa', b'111', b'bbb'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	323 [b'aaa', b'222', b'bbb'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	324 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	325
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	326 self.assertEqual(m3.find_unconflicted(), [(0, 1), (2, 3)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	327
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	328 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	329 list(m3.find_sync_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	330 [(0, 1, 0, 1, 0, 1), (2, 3, 2, 3, 2, 3), (3, 3, 3, 3, 3, 3)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	331 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	332
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	333 def test_replace_multi(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	334 """Replacement with regions of different size."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	335 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	336 [b'aaa', b'000', b'000', b'bbb'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	337 [b'aaa', b'111', b'111', b'111', b'bbb'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	338 [b'aaa', b'222', b'222', b'222', b'222', b'bbb'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	339 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	340
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	341 self.assertEqual(m3.find_unconflicted(), [(0, 1), (3, 4)])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	342
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	343 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	344 list(m3.find_sync_regions()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	345 [(0, 1, 0, 1, 0, 1), (3, 4, 4, 5, 5, 6), (4, 4, 5, 5, 6, 6)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	346 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	347
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	348 def test_merge_poem(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	349 """Test case from diff3 manual"""
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	350 m3 = Merge3(TZU, LAO, TAO)
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	351 ml = list(m3.merge_lines(b'LAO', b'TAO'))
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	352 self.log(b'merge result:')
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	353 self.log(b''.join(ml))
37891 a3ed6e7217c1 tests: replace use of assertEquals with assertEqual in test-simplemerge.py Augie Fackler <augie@google.com> parents: 37084 diff changeset	354 self.assertEqual(ml, MERGED_RESULT)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	355
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	356 def test_binary(self):
32279 68c43a416585 tests: use context manager form of assertRaises Gregory Szorc <gregory.szorc@gmail.com> parents: 28927 diff changeset	357 with self.assertRaises(error.Abort):
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	358 Merge3([b'\x00'], [b'a'], [b'b'])
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	359
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	360 def test_dos_text(self):
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	361 base_text = b'a\r\n'
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	362 this_text = b'b\r\n'
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	363 other_text = b'c\r\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	364 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	365 base_text.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	366 other_text.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	367 this_text.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	368 )
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	369 m_lines = m3.merge_lines(b'OTHER', b'THIS')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	370 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	371 b'<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	372 b'>>>>>>> THIS\r\n'.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	373 list(m_lines),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	374 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	375
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	376 def test_mac_text(self):
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	377 base_text = b'a\r'
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	378 this_text = b'b\r'
c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	379 other_text = b'c\r'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	380 m3 = Merge3(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	381 base_text.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	382 other_text.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	383 this_text.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	384 )
37892 c1bc196e021d tests: port test-simplemerge.py to Python 3 Augie Fackler <augie@google.com> parents: 37891 diff changeset	385 m_lines = m3.merge_lines(b'OTHER', b'THIS')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	386 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	387 b'<<<<<<< OTHER\rc\r=======\rb\r'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	388 b'>>>>>>> THIS\r'.splitlines(True),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	389 list(m_lines),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	390 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	391
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	392
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	393 if __name__ == '__main__':
43010 d75142ef054a tests: use silenttestrunner in test-simplemerge.py Gregory Szorc <gregory.szorc@gmail.com> parents: 38645 diff changeset	394 import silenttestrunner
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43010 diff changeset	395
43010 d75142ef054a tests: use silenttestrunner in test-simplemerge.py Gregory Szorc <gregory.szorc@gmail.com> parents: 38645 diff changeset	396 silenttestrunner.main(__name__)

Mercurial > public > mercurial-scm > hg

annotate tests/test-simplemerge.py @ 45892:06b64fabf91c