tests/test-fastannotate-hg.t

copies-rust: parse the changed-file sidedata directly in rust

It does not make much sense to parse the data into python object using slow
python code to later turn them into rust object. We directly pass the binary
blob and use it directly in Rust.

Ideally we could directly read the sidedata in Rust, using a revlog in Rust.
However we do not have this ready to use yet.

This more direct approach provides a nice speedup over the board. Especially five
cases that we previously too slow to return in the previous changeset are not
able to finish.

Notably, we are now significantly faster than the Python version of this code in
all the meaningful cases.

I looked at the various cases that remains significantly slower then the filelog
version and they are currently 3 main source of slowness:

* The isancestor computation: even if we cache them, if the revs spawn over a
  large amount of history the ancestry checking is still quite expensive. Using
  a different approach more centered on the graph we are currently considering
  might yield significant speed.

* Merging of the map from the two parents: in some case, this climb up to ⅔ of
  the time spent in copy tracing. See inline comment for idea to handle this
  better.

* Extracting data from the filelog. I would like to think this mostly comes from
  the fact my test repositories pre-date Valentin Gatien-Baron improvement of
  the `files` field (99ebde4fec99) and that more recent revisions will be faster
  to fetch. Further testing on this aspect is needed.

This revision compared to the previous one:
===========================================

Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
--------------------------------------------------------------------------------------------------------------------------------------------------------------
mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :      1 revs,   0.000047 s,   0.000049 s,  +0.000002 s, × 1.0426,    49 µs/rev
mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000181 s,   0.000114 s,  -0.000067 s, × 0.6298,    19 µs/rev
mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.005852 s,   0.004223 s,  -0.001629 s, × 0.7216,     4 µs/rev
pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000229 s,   0.000305 s,  +0.000076 s, × 1.3319,    33 µs/rev
pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000058 s,   0.000060 s,  +0.000002 s, × 1.0345,    60 µs/rev
pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000146 s,   0.000173 s,  +0.000027 s, × 1.1849,    24 µs/rev
pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.001206 s,   0.000446 s,  -0.000760 s, × 0.3698,   446 µs/rev
pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.025275 s,   0.010360 s,  -0.014915 s, × 0.4099,  1726 µs/rev
pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.080303 s,   0.048002 s,  -0.032301 s, × 0.5978,    10 µs/rev
pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.152641 s,   0.075705 s,  -0.076936 s, × 0.4960,    11 µs/rev
pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.099107 s,   0.056705 s,  -0.042402 s, × 0.5722,    10 µs/rev
pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43646 revs,   2.137894 s,   0.794685 s,  -1.343209 s, × 0.3717,    18 µs/rev
pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  26389 revs,   0.022202 s,   0.020209 s,  -0.001993 s, × 0.9102,     0 µs/rev
pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.228946 s,   0.122475 s,  -0.106471 s, × 0.5350,    10 µs/rev
netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000186 s,   0.000142 s,  -0.000044 s, × 0.7634,    71 µs/rev
netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000133 s,   0.000113 s,  -0.000020 s, × 0.8496,    56 µs/rev
netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000320 s,   0.000241 s,  -0.000079 s, × 0.7531,    80 µs/rev
netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.001339 s,   0.000729 s,  -0.000610 s, × 0.5444,    81 µs/rev
netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.015694 s,   0.010198 s,  -0.005496 s, × 0.6498,     7 µs/rev
netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.018457 s,   0.015312 s,  -0.003145 s, × 0.8296,     9 µs/rev
netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.111691 s,   0.060517 s,  -0.051174 s, × 0.5418,    10 µs/rev
netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  67005 revs,   1.166017 s,   0.611102 s,  -0.554915 s, × 0.5241,     9 µs/rev
mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000197 s,   0.000164 s,  -0.000033 s, × 0.8325,    82 µs/rev
mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000626 s,   0.000334 s,  -0.000292 s, × 0.5335,    41 µs/rev
mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000303 s,   0.000463 s,  +0.000160 s, × 1.5281,    51 µs/rev
mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.001679 s,   0.000730 s,  -0.000949 s, × 0.4348,   104 µs/rev
mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.006947 s,   0.003522 s,  -0.003425 s, × 0.5070,  1174 µs/rev
mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.133070 s,   0.072518 s,  -0.060552 s, × 0.5450, 12086 µs/rev
mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.008705 s,   0.005760 s,  -0.002945 s, × 0.6617,     3 µs/rev
mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.005913 s,   0.005720 s,  -0.000193 s, × 0.9674,     0 µs/rev
mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.101373 s,   0.063310 s,  -0.038063 s, × 0.6245,     8 µs/rev
mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.046526 s,   0.043608 s,  -0.002918 s, × 0.9373,     0 µs/rev
mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.313954 s,   0.204831 s,  -0.109123 s, × 0.6524,     6 µs/rev
mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,   3.367395 s,   2.161906 s,  -1.205489 s, × 0.6420,    14 µs/rev
mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 210546 revs,   4.691820 s,   3.291831 s,  -1.399989 s, × 0.7016,    15 µs/rev
mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.001199 s,   0.001213 s,  +0.000014 s, × 1.0117,   606 µs/rev
mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.001216 s,   0.001225 s,  +0.000009 s, × 1.0074,   612 µs/rev
mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000613 s,   0.000564 s,  -0.000049 s, × 0.9201,   141 µs/rev
mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001906 s,   0.001549 s,  -0.000357 s, × 0.8127,   774 µs/rev
mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.092766 s,   0.035918 s,  -0.056848 s, × 0.3872, 35918 µs/rev
mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.136074 s,   0.073788 s,  -0.062286 s, × 0.5423, 12298 µs/rev
mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.009067 s,   0.006151 s,  -0.002916 s, × 0.6784,     3 µs/rev
mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.006243 s,   0.006165 s,  -0.000078 s, × 0.9875,     0 µs/rev
mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.114463 s,   0.065421 s,  -0.049042 s, × 0.5715,     9 µs/rev
mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.433683 s,   0.313749 s,  -0.119934 s, × 0.7235,     7 µs/rev
mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.411278 s,   0.297867 s,  -0.113411 s, × 0.7242,     7 µs/rev
mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :  54487 revs,   0.155133 s,   0.111300 s,  -0.043833 s, × 0.7174,     2 µs/rev
mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.048933 s,   0.046202 s,  -0.002731 s, × 0.9442,     1 µs/rev
mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   8.100385 s,   1.999640 s,  -6.100745 s, × 0.2469,    20 µs/rev
mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   1.446720 s,   0.809134 s,  -0.637586 s, × 0.5593,    15 µs/rev
mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs, killed      ,  47.406785 s,             ,         ,   130 µs/rev
mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 444327 revs,   1.369537 s,   0.996219 s,  -0.373318 s, × 0.7274,     2 µs/rev
mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs, killed      ,  47.273399 s,             ,         ,   130 µs/rev
mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs, killed      ,  47.419099 s,             ,         ,   131 µs/rev
mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   5.186079 s,   3.512653 s,  -1.673426 s, × 0.6773,    18 µs/rev
mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs, killed      ,  44.459049 s,             ,         ,   187 µs/rev
mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 391148 revs, killed      ,  52.837926 s,             ,         ,   135 µs/rev

This revision compared to the python code:
==========================================

Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  Python-Time  Rust-Time    Difference    Factor    time per rev
--------------------------------------------------------------------------------------------------------------------------------------------------------------
mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :      1 revs,   0.000044 s,   0.000049 s,  +0.000005 s, × 1.1136,    49 µs/rev
mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000138 s,   0.000114 s,  -0.000024 s, × 0.8261,    19 µs/rev
mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.005052 s,   0.004223 s,  -0.000829 s, × 0.8359,     4 µs/rev
pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000219 s,   0.000305 s,  +0.000086 s, × 1.3927,    33 µs/rev
pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000055 s,   0.000060 s,  +0.000005 s, × 1.0909,    60 µs/rev
pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000128 s,   0.000173 s,  +0.000045 s, × 1.3516,    24 µs/rev
pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.001089 s,   0.000446 s,  -0.000643 s, × 0.4096,   446 µs/rev
pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.017407 s,   0.010360 s,  -0.007047 s, × 0.5952,  1726 µs/rev
pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.094175 s,   0.048002 s,  -0.046173 s, × 0.5097,    10 µs/rev
pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.238009 s,   0.075705 s,  -0.162304 s, × 0.3181,    11 µs/rev
pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.125876 s,   0.056705 s,  -0.069171 s, × 0.4505,    10 µs/rev
pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43646 revs,   3.581556 s,   0.794685 s,  -2.786871 s, × 0.2219,    18 µs/rev
pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  26389 revs,   0.016721 s,   0.020209 s,  +0.003488 s, × 1.2086,     0 µs/rev
pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.242367 s,   0.122475 s,  -0.119892 s, × 0.5053,    10 µs/rev
netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000165 s,   0.000142 s,  -0.000023 s, × 0.8606,    71 µs/rev
netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000114 s,   0.000113 s,  -0.000001 s, × 0.9912,    56 µs/rev
netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000296 s,   0.000241 s,  -0.000055 s, × 0.8142,    80 µs/rev
netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.001124 s,   0.000729 s,  -0.000395 s, × 0.6486,    81 µs/rev
netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.013060 s,   0.010198 s,  -0.002862 s, × 0.7809,     7 µs/rev
netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.017112 s,   0.015312 s,  -0.001800 s, × 0.8948,     9 µs/rev
netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.660350 s,   0.060517 s,  -0.599833 s, × 0.0916,    10 µs/rev
netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  67005 revs,  10.032499 s,   0.611102 s,  -9.421397 s, × 0.0609,     9 µs/rev
mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000189 s,   0.000164 s,  -0.000025 s, × 0.8677,    82 µs/rev
mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000462 s,   0.000334 s,  -0.000128 s, × 0.7229,    41 µs/rev
mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000270 s,   0.000463 s,  +0.000193 s, × 1.7148,    51 µs/rev
mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.001474 s,   0.000730 s,  -0.000744 s, × 0.4953,   104 µs/rev
mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.004806 s,   0.003522 s,  -0.001284 s, × 0.7328,  1174 µs/rev
mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.085150 s,   0.072518 s,  -0.012632 s, × 0.8517, 12086 µs/rev
mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.007064 s,   0.005760 s,  -0.001304 s, × 0.8154,     3 µs/rev
mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.004741 s,   0.005720 s,  +0.000979 s, × 1.2065,     0 µs/rev
mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.190133 s,   0.063310 s,  -0.126823 s, × 0.3330,     8 µs/rev
mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.035651 s,   0.043608 s,  +0.007957 s, × 1.2232,     0 µs/rev
mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.440694 s,   0.204831 s,  -0.235863 s, × 0.4648,     6 µs/rev
mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,  18.454163 s,   2.161906 s, -16.292257 s, × 0.1172,    14 µs/rev
mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 210546 revs,  31.562719 s,   3.291831 s, -28.270888 s, × 0.1043,    15 µs/rev
mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.001189 s,   0.001213 s,  +0.000024 s, × 1.0202,   606 µs/rev
mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.001204 s,   0.001225 s,  +0.000021 s, × 1.0174,   612 µs/rev
mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000586 s,   0.000564 s,  -0.000022 s, × 0.9625,   141 µs/rev
mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001845 s,   0.001549 s,  -0.000296 s, × 0.8396,   774 µs/rev
mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.063822 s,   0.035918 s,  -0.027904 s, × 0.5628, 35918 µs/rev
mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.088038 s,   0.073788 s,  -0.014250 s, × 0.8381, 12298 µs/rev
mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.007389 s,   0.006151 s,  -0.001238 s, × 0.8325,     3 µs/rev
mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.004868 s,   0.006165 s,  +0.001297 s, × 1.2664,     0 µs/rev
mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.222450 s,   0.065421 s,  -0.157029 s, × 0.2941,     9 µs/rev
mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.370675 s,   0.313749 s,  -0.056926 s, × 0.8464,     7 µs/rev
mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.358020 s,   0.297867 s,  -0.060153 s, × 0.8320,     7 µs/rev
mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :  54487 revs,   0.145235 s,   0.111300 s,  -0.033935 s, × 0.7663,     2 µs/rev
mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.037606 s,   0.046202 s,  +0.008596 s, × 1.2286,     1 µs/rev
mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   7.382439 s,   1.999640 s,  -5.382799 s, × 0.2709,    20 µs/rev
mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   7.273506 s,   0.809134 s,  -6.464372 s, × 0.1112,    15 µs/rev
mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs, killed      ,  47.406785 s,             ,         ,   130 µs/rev
mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 444327 revs,   1.074593 s,   0.996219 s,  -0.078374 s, × 0.9271,     2 µs/rev
mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs, killed      ,  47.273399 s,             ,         ,   130 µs/rev
mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs, killed      ,  47.419099 s,             ,         ,   131 µs/rev
mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,  27.746195 s,   3.512653 s, -24.233542 s, × 0.1266,    18 µs/rev
mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs, killed      ,  44.459049 s,             ,         ,   187 µs/rev
mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 391148 revs, killed      ,  52.837926 s,             ,         ,   135 µs/rev


This revision compared to the filelog algorithm:
================================================

Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  filelog     sidedata      Difference    Factor    time per rev
--------------------------------------------------------------------------------------------------------------------------------------------------------------
mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :      1 revs,   0.000906 s,   0.000049 s,  -0.000857 s, × 0.0540,     48 µs/rev
mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.001844 s,   0.000114 s,  -0.001730 s, × 0.0618,     18 µs/rev
mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.018577 s,   0.004223 s,  -0.014354 s, × 0.2273,      4 µs/rev
pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.005009 s,   0.000305 s,  -0.004704 s, × 0.0608,     33 µs/rev
pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.209606 s,   0.000060 s,  -0.209546 s, × 0.0002,     59 µs/rev
pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.017008 s,   0.000173 s,  -0.016835 s, × 0.0101,     24 µs/rev
pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.019227 s,   0.000446 s,  -0.018781 s, × 0.0231,    445 µs/rev
pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.765782 s,   0.010360 s,  -0.755422 s, × 0.0135,   1726 µs/rev
pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   1.186068 s,   0.048002 s,  -1.138066 s, × 0.0404,     10 µs/rev
pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   1.266745 s,   0.075705 s,  -1.191040 s, × 0.0597,     11 µs/rev
pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   1.666389 s,   0.056705 s,  -1.609684 s, × 0.0340,     10 µs/rev
pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43646 revs,   0.001070 s,   0.794685 s,  +0.793615 s, × 742.69,     18 µs/rev
pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  26389 revs,   1.076269 s,   0.020209 s,  -1.056060 s, × 0.0187,      0 µs/rev
pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   1.355085 s,   0.122475 s,  -1.232610 s, × 0.0903,     10 µs/rev
netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.028551 s,   0.000142 s,  -0.028409 s, × 0.0049,     70 µs/rev
netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.157319 s,   0.000113 s,  -0.157206 s, × 0.0007,     56 µs/rev
netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.025722 s,   0.000241 s,  -0.025481 s, × 0.0093,     80 µs/rev
netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.053374 s,   0.000729 s,  -0.052645 s, × 0.0136,     80 µs/rev
netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.038146 s,   0.010198 s,  -0.027948 s, × 0.2673,      7 µs/rev
netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.229215 s,   0.015312 s,  -0.213903 s, × 0.0668,      9 µs/rev
netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.974484 s,   0.060517 s,  -0.913967 s, × 0.0621,     10 µs/rev
netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  67005 revs,   3.924308 s,   0.611102 s,  -3.313206 s, × 0.1557,      9 µs/rev
mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.035563 s,   0.000164 s,  -0.035399 s, × 0.0046,     81 µs/rev
mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.145766 s,   0.000334 s,  -0.145432 s, × 0.0022,     41 µs/rev
mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.026283 s,   0.000463 s,  -0.025820 s, × 0.0176,     51 µs/rev
mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.087403 s,   0.000730 s,  -0.086673 s, × 0.0083,    104 µs/rev
mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.209484 s,   0.003522 s,  -0.205962 s, × 0.0168,   1173 µs/rev
mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   2.197867 s,   0.072518 s,  -2.125349 s, × 0.0329,  12084 µs/rev
mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.090142 s,   0.005760 s,  -0.084382 s, × 0.0638,      3 µs/rev
mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.742658 s,   0.005720 s,  -0.736938 s, × 0.0077,      0 µs/rev
mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   1.166159 s,   0.063310 s,  -1.102849 s, × 0.0542,      8 µs/rev
mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   6.721719 s,   0.043608 s,  -6.678111 s, × 0.0064,      0 µs/rev
mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   3.356523 s,   0.204831 s,  -3.151692 s, × 0.0610,      6 µs/rev
mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,  15.880822 s,   2.161906 s, -13.718916 s, × 0.1361,     14 µs/rev
mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 210546 revs,  20.781275 s,   3.291831 s, -17.489444 s, × 0.1584,     15 µs/rev
mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.084165 s,   0.001213 s,  -0.082952 s, × 0.0144,    606 µs/rev
mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.503744 s,   0.001225 s,  -0.502519 s, × 0.0024,    612 µs/rev
mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.021545 s,   0.000564 s,  -0.020981 s, × 0.0261,    140 µs/rev
mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.240699 s,   0.001549 s,  -0.239150 s, × 0.0064,    774 µs/rev
mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   1.100682 s,   0.035918 s,  -1.064764 s, × 0.0326,  35882 µs/rev
mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   2.234809 s,   0.073788 s,  -2.161021 s, × 0.0330,  12295 µs/rev
mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.091222 s,   0.006151 s,  -0.085071 s, × 0.0674,      3 µs/rev
mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.764722 s,   0.006165 s,  -0.758557 s, × 0.0080,      0 µs/rev
mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   1.185655 s,   0.065421 s,  -1.120234 s, × 0.0551,      9 µs/rev
mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.089736 s,   0.313749 s,  +0.224013 s, × 3.4963,      7 µs/rev
mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.084132 s,   0.297867 s,  +0.213735 s, × 3.5404,      7 µs/rev
mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :  54487 revs,   7.581932 s,   0.111300 s,  -7.470632 s, × 0.0146,      2 µs/rev
mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   6.671144 s,   0.046202 s,  -6.624942 s, × 0.0069,      1 µs/rev
mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   7.674771 s,   1.999640 s,  -5.675131 s, × 0.2605,     20 µs/rev
mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   9.870343 s,   0.809134 s,  -9.061209 s, × 0.0819,     15 µs/rev
mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   0.094781 s,  47.406785 s, +47.312004 s, × 500.17,    130 µs/rev
mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 444327 revs,  26.690029 s,   0.996219 s, -25.693810 s, × 0.0373,      2 µs/rev
mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   0.094941 s,  47.273399 s, +47.178458 s, × 497.92,    130 µs/rev
mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   0.233811 s,  47.419099 s, +47.185288 s, × 202.80,    131 µs/rev
mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,  19.321750 s,   3.512653 s, -15.809097 s, × 0.1817,     18 µs/rev
mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs,  21.358350 s,  44.459049 s, +23.100699 s, × 2.0815,    187 µs/rev
mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 391148 revs,  25.328737 s,  52.837926 s, +27.509189 s, × 2.0860,    135 µs/rev

Differential Revision: https://phab.mercurial-scm.org/D9307

(this file is backported from core hg tests/test-annotate.t)

  $ cat >> $HGRCPATH << EOF
  > [ui]
  > merge = :merge3
  > [diff]
  > git=1
  > [extensions]
  > fastannotate=
  > [fastannotate]
  > modes=fctx
  > forcefollow=False
  > mainbranch=.
  > EOF

init

  $ hg init repo
  $ cd repo

commit

  $ echo 'a' > a
  $ hg ci -A -m test -u nobody -d '1 0'
  adding a

annotate -c

  $ hg annotate -c a
  8435f90966e4: a

annotate -cl

  $ hg annotate -cl a
  8435f90966e4:1: a

annotate -d

  $ hg annotate -d a
  Thu Jan 01 00:00:01 1970 +0000: a

annotate -n

  $ hg annotate -n a
  0: a

annotate -nl

  $ hg annotate -nl a
  0:1: a

annotate -u

  $ hg annotate -u a
  nobody: a

annotate -cdnu

  $ hg annotate -cdnu a
  nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a

annotate -cdnul

  $ hg annotate -cdnul a
  nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a

annotate (JSON)

  $ hg annotate -Tjson a
  [
   {
    "lines": [{"line": "a\n", "rev": 0}],
    "path": "a"
   }
  ]

  $ hg annotate -Tjson -cdfnul a
  [
   {
    "lines": [{"date": [1.0, 0], "line": "a\n", "lineno": 1, "node": "8435f90966e442695d2ded29fdade2bac5ad8065", "path": "a", "rev": 0, "user": "nobody"}],
    "path": "a"
   }
  ]

  $ cat <<EOF >>a
  > a
  > a
  > EOF
  $ hg ci -ma1 -d '1 0'
  $ hg cp a b
  $ hg ci -mb -d '1 0'
  $ cat <<EOF >> b
  > b4
  > b5
  > b6
  > EOF
  $ hg ci -mb2 -d '2 0'

annotate -n b

  $ hg annotate -n b
  0: a
  1: a
  1: a
  3: b4
  3: b5
  3: b6

annotate --no-follow b

  $ hg annotate --no-follow b
  2: a
  2: a
  2: a
  3: b4
  3: b5
  3: b6

annotate -nl b

  $ hg annotate -nl b
  0:1: a
  1:2: a
  1:3: a
  3:4: b4
  3:5: b5
  3:6: b6

annotate -nf b

  $ hg annotate -nf b
  0 a: a
  1 a: a
  1 a: a
  3 b: b4
  3 b: b5
  3 b: b6

annotate -nlf b

  $ hg annotate -nlf b
  0 a:1: a
  1 a:2: a
  1 a:3: a
  3 b:4: b4
  3 b:5: b5
  3 b:6: b6

  $ hg up -C 2
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat <<EOF >> b
  > b4
  > c
  > b5
  > EOF
  $ hg ci -mb2.1 -d '2 0'
  created new head
  $ hg merge
  merging b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]
  $ cat b
  a
  a
  a
  <<<<<<< working copy: 5fbdc1152d97 - test: b2.1
  b4
  c
  b5
  ||||||| base
  =======
  b4
  b5
  b6
  >>>>>>> merge rev:    37ec9f5c3d1f - test: b2
  $ cat <<EOF > b
  > a
  > a
  > a
  > b4
  > c
  > b5
  > EOF
  $ hg resolve --mark -q
  $ rm b.orig
  $ hg ci -mmergeb -d '3 0'

annotate after merge
(note: the first one falls back to the vanilla annotate which does not use linelog)

  $ hg annotate -nf b --debug
  fastannotate: b: rebuilding broken cache
  fastannotate: b: 5 new changesets in the main branch
  0 a: a
  1 a: a
  1 a: a
  3 b: b4
  4 b: c
  3 b: b5

(difference explained below)

  $ hg annotate -nf b --debug
  fastannotate: b: using fast path (resolved fctx: False)
  0 a: a
  1 a: a
  1 a: a
  4 b: b4
  4 b: c
  4 b: b5

annotate after merge with -l
(fastannotate differs from annotate)

  $ hg log -Gp -T '{rev}:{node}' -r '2..5'
  @    5:64afcdf8e29e063c635be123d8d2fb160af00f7e
  |\
  | o  4:5fbdc1152d97597717021ad9e063061b200f146bdiff --git a/b b/b
  | |  --- a/b
  | |  +++ b/b
  | |  @@ -1,3 +1,6 @@
  | |   a
  | |   a
  | |   a
  | |  +b4
  | |  +c
  | |  +b5
  | |
  o |  3:37ec9f5c3d1f99572d7075971cb4876e2139b52fdiff --git a/b b/b
  |/   --- a/b
  |    +++ b/b
  |    @@ -1,3 +1,6 @@
  |     a
  |     a
  |     a
  |    +b4
  |    +b5
  |    +b6
  |
  o  2:3086dbafde1ce745abfc8d2d367847280aabae9ddiff --git a/a b/b
  |  copy from a
  ~  copy to b
  

(in this case, "b4", "b5" could be considered introduced by either rev 3, or rev 4.
 and that causes the rev number difference)

  $ hg annotate -nlf b --config fastannotate.modes=
  0 a:1: a
  1 a:2: a
  1 a:3: a
  3 b:4: b4
  4 b:5: c
  3 b:5: b5

  $ hg annotate -nlf b
  0 a:1: a
  1 a:2: a
  1 a:3: a
  4 b:4: b4
  4 b:5: c
  4 b:6: b5

  $ hg up -C 1
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ hg cp a b
  $ cat <<EOF > b
  > a
  > z
  > a
  > EOF
  $ hg ci -mc -d '3 0'
  created new head
Work around the pure version not resolving the conflict like native code
#if pure
  $ hg merge
  merging b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]
  $ cat <<EOF > b
  > a
  > z
  > a
  > b4
  > c
  > b5
  > EOF
  $ hg resolve -m b
  (no more unresolved files)
  $ rm b.orig
#else
  $ hg merge
  merging b
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
#endif
  $ echo d >> b
  $ hg ci -mmerge2 -d '4 0'

annotate after rename merge

  $ hg annotate -nf b
  0 a: a
  6 b: z
  1 a: a
  3 b: b4
  4 b: c
  3 b: b5
  7 b: d

annotate after rename merge with -l
(fastannotate differs from annotate)

  $ hg log -Gp -T '{rev}:{node}' -r '0+1+6+7'
  @    7:6284bb6c38fef984a929862a53bbc71ce9eafa81diff --git a/b b/b
  |\   --- a/b
  | :  +++ b/b
  | :  @@ -1,3 +1,7 @@
  | :   a
  | :   z
  | :   a
  | :  +b4
  | :  +c
  | :  +b5
  | :  +d
  | :
  o :  6:b80e3e32f75a6a67cd4ac85496a11511e9112816diff --git a/a b/b
  :/   copy from a
  :    copy to b
  :    --- a/a
  :    +++ b/b
  :    @@ -1,3 +1,3 @@
  :    -a (?)
  :     a
  :    +z
  :     a
  :    -a (?)
  :
  o  1:762f04898e6684ff713415f7b8a8d53d33f96c92diff --git a/a b/a
  |  --- a/a
  |  +++ b/a
  |  @@ -1,1 +1,3 @@
  |   a
  |  +a
  |  +a
  |
  o  0:8435f90966e442695d2ded29fdade2bac5ad8065diff --git a/a b/a
     new file mode 100644
     --- /dev/null
     +++ b/a
     @@ -0,0 +1,1 @@
     +a
  

(note on question marks:
 the upstream bdiff change (96f2f50d923f+3633403888ae+8c0c75aa3ff4+5c4e2636c1a9
 +38ed54888617) alters the output so deletion is not always at the end of the
 output. for example:
 | a | b | old | new | # old: e1d6aa0e4c3a, new: 8836f13e3c5b
 |-------------------|
 | a | a |  a  | -a  |
 | a | z | +z  |  a  |
 | a | a |  a  | +z  |
 |   |   | -a  |  a  |
 |-------------------|
 | a | a |     a     |
 | a | a |     a     |
 | a |   |    -a     |
 this leads to more question marks below)

(rev 1 adds two "a"s and rev 6 deletes one "a".
 the "a" that rev 6 deletes could be either the first or the second "a" of those two "a"s added by rev 1.
 and that causes the line number difference)

  $ hg annotate -nlf b --config fastannotate.modes=
  0 a:1: a
  6 b:2: z
  1 a:3: a
  3 b:4: b4
  4 b:5: c
  3 b:5: b5
  7 b:7: d

  $ hg annotate -nlf b
  0 a:1: a (?)
  1 a:2: a (?)
  6 b:2: z
  1 a:2: a (?)
  1 a:3: a (?)
  3 b:4: b4
  4 b:5: c
  3 b:5: b5
  7 b:7: d

Issue2807: alignment of line numbers with -l
(fastannotate differs from annotate, same reason as above)

  $ echo more >> b
  $ hg ci -mmore -d '5 0'
  $ echo more >> b
  $ hg ci -mmore -d '6 0'
  $ echo more >> b
  $ hg ci -mmore -d '7 0'
  $ hg annotate -nlf b
   0 a: 1: a (?)
   1 a: 2: a (?)
   6 b: 2: z
   1 a: 2: a (?)
   1 a: 3: a (?)
   3 b: 4: b4
   4 b: 5: c
   3 b: 5: b5
   7 b: 7: d
   8 b: 8: more
   9 b: 9: more
  10 b:10: more

linkrev vs rev

  $ hg annotate -r tip -n a
  0: a
  1: a
  1: a

linkrev vs rev with -l

  $ hg annotate -r tip -nl a
  0:1: a
  1:2: a
  1:3: a

Issue589: "undelete" sequence leads to crash

annotate was crashing when trying to --follow something

like A -> B -> A

generate ABA rename configuration

  $ echo foo > foo
  $ hg add foo
  $ hg ci -m addfoo
  $ hg rename foo bar
  $ hg ci -m renamefoo
  $ hg rename bar foo
  $ hg ci -m renamebar

annotate after ABA with follow

  $ hg annotate --follow foo
  foo: foo

missing file

  $ hg ann nosuchfile
  abort: nosuchfile: no such file in rev e9e6b4fa872f
  [255]

annotate file without '\n' on last line

  $ printf "" > c
  $ hg ci -A -m test -u nobody -d '1 0'
  adding c
  $ hg annotate c
  $ printf "a\nb" > c
  $ hg ci -m test
  $ hg annotate c
  [0-9]+: a (re)
  [0-9]+: b (re)

Issue3841: check annotation of the file of which filelog includes
merging between the revision and its ancestor

to reproduce the situation with recent Mercurial, this script uses (1)
"hg debugsetparents" to merge without ancestor check by "hg merge",
and (2) the extension to allow filelog merging between the revision
and its ancestor by overriding "repo._filecommit".

  $ cat > ../legacyrepo.py <<EOF
  > from __future__ import absolute_import
  > from mercurial import commit, error, extensions, node
  > def _filecommit(orig, repo, fctx, manifest1, manifest2,
  >                 linkrev, tr, includecopymeta, ms):
  >     fname = fctx.path()
  >     text = fctx.data()
  >     flog = repo.file(fname)
  >     fparent1 = manifest1.get(fname, node.nullid)
  >     fparent2 = manifest2.get(fname, node.nullid)
  >     meta = {}
  >     copy = fctx.copysource()
  >     if copy and copy != fname:
  >         raise error.Abort('copying is not supported')
  >     if fparent2 != node.nullid:
  >         return flog.add(text, meta, tr, linkrev,
  >                         fparent1, fparent2), 'modified'
  >     raise error.Abort('only merging is supported')
  > def uisetup(ui):
  >     extensions.wrapfunction(commit, '_filecommit', _filecommit)
  > EOF

  $ cat > baz <<EOF
  > 1
  > 2
  > 3
  > 4
  > 5
  > EOF
  $ hg add baz
  $ hg commit -m "baz:0"

  $ cat > baz <<EOF
  > 1 baz:1
  > 2
  > 3
  > 4
  > 5
  > EOF
  $ hg commit -m "baz:1"

  $ cat > baz <<EOF
  > 1 baz:1
  > 2 baz:2
  > 3
  > 4
  > 5
  > EOF
  $ hg debugsetparents 17 17
  $ hg --config extensions.legacyrepo=../legacyrepo.py  commit -m "baz:2"
  $ hg debugindexdot baz
  digraph G {
  	-1 -> 0
  	0 -> 1
  	1 -> 2
  	1 -> 2
  }
  $ hg annotate baz
  17: 1 baz:1
  18: 2 baz:2
  16: 3
  16: 4
  16: 5

  $ cat > baz <<EOF
  > 1 baz:1
  > 2 baz:2
  > 3 baz:3
  > 4
  > 5
  > EOF
  $ hg commit -m "baz:3"

  $ cat > baz <<EOF
  > 1 baz:1
  > 2 baz:2
  > 3 baz:3
  > 4 baz:4
  > 5
  > EOF
  $ hg debugsetparents 19 18
  $ hg --config extensions.legacyrepo=../legacyrepo.py  commit -m "baz:4"
  $ hg debugindexdot baz
  digraph G {
  	-1 -> 0
  	0 -> 1
  	1 -> 2
  	1 -> 2
  	2 -> 3
  	3 -> 4
  	2 -> 4
  }
  $ hg annotate baz
  17: 1 baz:1
  18: 2 baz:2
  19: 3 baz:3
  20: 4 baz:4
  16: 5

annotate clean file

  $ hg annotate -ncr "wdir()" foo
  11 472b18db256d : foo

annotate modified file

  $ echo foofoo >> foo
  $ hg annotate -r "wdir()" foo
  11 : foo
  20+: foofoo

  $ hg annotate -cr "wdir()" foo
  472b18db256d : foo
  b6bedd5477e7+: foofoo

  $ hg annotate -ncr "wdir()" foo
  11 472b18db256d : foo
  20 b6bedd5477e7+: foofoo

  $ hg annotate --debug -ncr "wdir()" foo
  11 472b18db256d1e8282064eab4bfdaf48cbfe83cd : foo
  20 b6bedd5477e797f25e568a6402d4697f3f895a72+: foofoo

  $ hg annotate -udr "wdir()" foo
  test Thu Jan 01 00:00:00 1970 +0000: foo
  test [A-Za-z0-9:+ ]+: foofoo (re)

  $ hg annotate -ncr "wdir()" -Tjson foo
  [
   {
    "lines": [{"line": "foo\n", "node": "472b18db256d1e8282064eab4bfdaf48cbfe83cd", "rev": 11}, {"line": "foofoo\n", "node": "ffffffffffffffffffffffffffffffffffffffff", "rev": 2147483647}],
    "path": "foo"
   }
  ]

annotate added file

  $ echo bar > bar
  $ hg add bar
  $ hg annotate -ncr "wdir()" bar
  20 b6bedd5477e7+: bar

annotate renamed file

  $ hg rename foo renamefoo2
  $ hg annotate -ncr "wdir()" renamefoo2
  11 472b18db256d : foo
  20 b6bedd5477e7+: foofoo

annotate missing file

  $ rm baz
  $ hg annotate -ncr "wdir()" baz
  abort: $TESTTMP/repo/baz: $ENOENT$ (windows !)
  abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
  [255]

annotate removed file

  $ hg rm baz
  $ hg annotate -ncr "wdir()" baz
  abort: $TESTTMP/repo/baz: $ENOENT$ (windows !)
  abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
  [255]

Test annotate with whitespace options

  $ cd ..
  $ hg init repo-ws
  $ cd repo-ws
  $ cat > a <<EOF
  > aa
  > 
  > b b
  > EOF
  $ hg ci -Am "adda"
  adding a
  $ sed 's/EOL$//g' > a <<EOF
  > a  a
  > 
  >  EOL
  > b  b
  > EOF
  $ hg ci -m "changea"

Annotate with no option

  $ hg annotate a
  1: a  a
  0: 
  1:  
  1: b  b

Annotate with --ignore-space-change

  $ hg annotate --ignore-space-change a
  1: a  a
  1: 
  0:  
  0: b  b

Annotate with --ignore-all-space

  $ hg annotate --ignore-all-space a
  0: a  a
  0: 
  1:  
  0: b  b

Annotate with --ignore-blank-lines (similar to no options case)

  $ hg annotate --ignore-blank-lines a
  1: a  a
  0: 
  1:  
  1: b  b

  $ cd ..

Annotate with linkrev pointing to another branch
------------------------------------------------

create history with a filerev whose linkrev points to another branch

  $ hg init branchedlinkrev
  $ cd branchedlinkrev
  $ echo A > a
  $ hg commit -Am 'contentA'
  adding a
  $ echo B >> a
  $ hg commit -m 'contentB'
  $ hg up --rev 'desc(contentA)'
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo unrelated > unrelated
  $ hg commit -Am 'unrelated'
  adding unrelated
  created new head
  $ hg graft -r 'desc(contentB)'
  grafting 1:fd27c222e3e6 "contentB"
  $ echo C >> a
  $ hg commit -m 'contentC'
  $ echo W >> a
  $ hg log -G
  @  changeset:   4:072f1e8df249
  |  tag:         tip
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     contentC
  |
  o  changeset:   3:ff38df03cc4b
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     contentB
  |
  o  changeset:   2:62aaf3f6fc06
  |  parent:      0:f0932f74827e
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     unrelated
  |
  | o  changeset:   1:fd27c222e3e6
  |/   user:        test
  |    date:        Thu Jan 01 00:00:00 1970 +0000
  |    summary:     contentB
  |
  o  changeset:   0:f0932f74827e
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     contentA
  

Annotate should list ancestor of starting revision only

  $ hg annotate a
  0: A
  3: B
  4: C

  $ hg annotate a -r 'wdir()'
  0 : A
  3 : B
  4 : C
  4+: W

Even when the starting revision is the linkrev-shadowed one:

  $ hg annotate a -r 3
  0: A
  3: B

  $ cd ..

Issue5360: Deleted chunk in p1 of a merge changeset

  $ hg init repo-5360
  $ cd repo-5360
  $ echo 1 > a
  $ hg commit -A a -m 1
  $ echo 2 >> a
  $ hg commit -m 2
  $ echo a > a
  $ hg commit -m a
  $ hg update '.^' -q
  $ echo 3 >> a
  $ hg commit -m 3 -q
  $ hg merge 2 -q
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
  [1]
  $ cat a
  <<<<<<< working copy: 0a068f0261cf - test: 3
  1
  2
  3
  ||||||| base
  1
  2
  =======
  a
  >>>>>>> merge rev:    9409851bc20a - test: a
  $ cat > a << EOF
  > b
  > 1
  > 2
  > 3
  > a
  > EOF
  $ hg resolve --mark -q
  $ rm a.orig
  $ hg commit -m m
  $ hg annotate a
  4: b
  0: 1
  1: 2
  3: 3
  2: a

  $ cd ..