Skip to content
Snippets Groups Projects
  1. Dec 21, 2020
    • Pierre-Yves David's avatar
      copies-rust: use imrs::OrdSet instead of imrs::HashSet · 4a91293ada87
      Pierre-Yves David authored
      This yield small speedup all over the board, and a large one for our slower
      cases:
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
      ---------------------------------------------------------------------------------------------------------------------------------------------------------------
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   2.034596 s,   1.465264 s,  -0.569332 s, × 0.7202,    15 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   0.694030 s,   0.690376 s,  -0.003654 s, × 0.9947,    13 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   4.407723 s,   4.011322 s,  -0.396401 s, × 0.9101,    11 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  34414 revs,   0.574355 s,   0.573541 s,  -0.000814 s, × 0.9986,    16 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   4.457827 s,   3.981133 s,  -0.476694 s, × 0.8931,    10 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.351696 s,   3.996647 s,  -0.355049 s, × 0.9184,    11 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  80.828689 s,  50.244975 s, -30.583714 s, × 0.6216,   219 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  34.094064 s,  20.030023 s, -14.064041 s, × 0.5875,    52 µs/rev
      private                                                                         : 459513 revs,  27.435529 s,  24.490825 s,  -2.944704 s, × 0.8927,    53 µs/rev
      
      We also got significantly faster than the implementation using is_ancestors
      except for one of our reference case:
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
      ---------------------------------------------------------------------------------------------------------------------------------------------------------------
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   5.138169 s,   4.011322 s,  -1.126847 s, × 0.7807,    11 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   5.127809 s,   3.981133 s,  -1.146676 s, × 0.7764,    10 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.971136 s,   3.996647 s,  -0.974489 s, × 0.8040,    11 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   1.741678 s,   1.520607 s,  -0.221071 s, × 0.8731,     7 µs/rev
      private                                                                         : 459513 revs,  37.179470 s,  24.490825 s, -12.688645 s, × 0.6587,    53 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  40.314822 s,  50.244975 s,  +9.930153 s, × 1.2463,   219 µs/rev
      
      
      Below are three different benchmark comparing this changeset to:
      * the previous one,
      * the implementation based on `is_anscestors`,
      * the filelog copy tracing.
      
      
      ### Compared to the previous ones
      
      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.000043 s,   0.000041 s,  -0.000002 s, × 0.9535,    41 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000114 s,   0.000116 s,  +0.000002 s, × 1.0175,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.004899 s,   0.004933 s,  +0.000034 s, × 1.0069,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000196 s,   0.000193 s,  -0.000003 s, × 0.9847,    21 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000049 s,   0.000048 s,  -0.000001 s, × 0.9796,    48 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000117 s,   0.000114 s,  -0.000003 s, × 0.9744,    16 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.6f1f4a s,   0.000319 s,  -0.000003 s, × 0.9907,   319 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.011856 s,   0.012025 s,  +0.000169 s, × 1.0143,  2004 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.050992 s,   0.050525 s,  -0.000467 s, × 0.9908,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.087444 s,   0.085713 s,  -0.001731 s, × 0.9802,    12 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.062487 s,   0.061825 s,  -0.000662 s, × 0.9894,    11 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43645 revs,   0.634909 s,   0.543998 s,  -0.090911 s, × 0.8568,    12 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :      2 revs,   0.013360 s,   0.013455 s,  +0.000095 s, × 1.0071,  6727 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.120775 s,   0.117479 s,  -0.003296 s, × 0.9727,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000085 s,   0.000084 s,  -0.000001 s, × 0.9882,    42 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000108 s,   0.000111 s,  +0.000003 s, × 1.0278,    55 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000176 s,   0.000175 s,  -0.000001 s, × 0.9943,    58 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.000747 s,   0.000732 s,  -0.000015 s, × 0.9799,    81 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.010128 s,   0.010062 s,  -0.000066 s, × 0.9935,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.015899 s,   0.015659 s,  -0.000240 s, × 0.9849,    10 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.062215 s,   0.062744 s,  +0.000529 s, × 1.0085,    10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  66949 revs,   0.521004 s,   0.499449 s,  -0.021555 s, × 0.9586,     7 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000090 s,   0.000088 s,  -0.000002 s, × 0.9778,    44 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000264 s,   0.000266 s,  +0.000002 s, × 1.0076,    33 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000186 s,   0.000182 s,  -0.000004 s, × 0.9785,    20 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.000660 s,   0.000656 s,  -0.000004 s, × 0.9939,    93 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.003542 s,   0.003389 s,  -0.000153 s, × 0.9568,  1129 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.071574 s,   0.075882 s,  +0.004308 s, × 1.0602, 12647 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006498 s,   0.006479 s,  -0.000019 s, × 0.9971,     4 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005206 s,   0.004889 s,  -0.000317 s, × 0.9391,   119 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.065535 s,   0.064394 s,  -0.001141 s, × 0.9826,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.027139 s,   0.026815 s,  -0.000324 s, × 0.9881,    43 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.201924 s,   0.cc85eb s,  +0.000940 s, × 1.0047,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,   1.257201 s,   1.219445 s,  -0.037756 s, × 0.9700,     7 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 204976 revs,   1.663045 s,   1.613857 s,  -0.049188 s, × 0.9704,     7 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.000866 s,   0.000873 s,  +0.000007 s, × 1.0081,   436 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.000883 s,   0.000885 s,  +0.000002 s, × 1.0023,   442 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000163 s,   0.000161 s,  -0.000002 s, × 0.9877,    40 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001139 s,   0.001138 s,  -0.000001 s, × 0.9991,   569 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.032753 s,   0.033399 s,  +0.000646 s, × 1.0197, 33399 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.073266 s,   0.075445 s,  +0.002179 s, × 1.0297, 12574 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006567 s,   0.006456 s,  -0.000111 s, × 0.9831,     4 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005427 s,   0.005462 s,  +0.000035 s, × 1.0064,   133 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.064058 s,   0.064117 s,  +0.000059 s, × 1.0009,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.303320 s,   0.297563 s,  -0.005757 s, × 0.9810,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.288456 s,   0.282463 s,  -0.005993 s, × 0.9792,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   8598 revs,   0.085925 s,   0.084038 s,  -0.001887 s, × 0.9780,     9 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.027302 s,   0.027306 s,  +0.000004 s, × 1.0001,    44 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   2.034596 s,   1.465264 s,  -0.569332 s, × 0.7202,    15 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   0.694030 s,   0.690376 s,  -0.003654 s, × 0.9947,    13 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   4.407723 s,   4.011322 s,  -0.396401 s, × 0.9101,    11 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  34414 revs,   0.574355 s,   0.573541 s,  -0.000814 s, × 0.9986,    16 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   4.457827 s,   3.981133 s,  -0.476694 s, × 0.8931,    10 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.351696 s,   3.996647 s,  -0.355049 s, × 0.9184,    11 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   1.570065 s,   1.520607 s,  -0.049458 s, × 0.9685,     7 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  80.828689 s,  50.244975 s, -30.583714 s, × 0.6216,   219 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  34.094064 s,  20.030023 s, -14.064041 s, × 0.5875,    52 µs/rev
      private                                                                         : 459513 revs,  27.435529 s,  24.490825 s,  -2.944704 s, × 0.8927,    53 µs/rev
      
      ### Compared to the implementation using `is_anscestor`
      
      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.000042 s,   0.000041 s,  -0.000001 s, × 0.9762,    41 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000110 s,   0.000116 s,  +0.000006 s, × 1.0545,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.004945 s,   0.004933 s,  -0.000012 s, × 0.9976,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000192 s,   0.000193 s,  +0.000001 s, × 1.0052,    21 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000049 s,   0.000048 s,  -0.000001 s, × 0.9796,    48 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000112 s,   0.000114 s,  +0.000002 s, × 1.0179,    16 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.000323 s,   0.000319 s,  -0.000004 s, × 0.9876,   319 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.010042 s,   0.012025 s,  +0.001983 s, × 1.1975,  2004 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.049813 s,   0.050525 s,  +0.000712 s, × 1.0143,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.079937 s,   0.085713 s,  +0.005776 s, × 1.0723,    12 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.059412 s,   0.061825 s,  +0.002413 s, × 1.0406,    11 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43645 revs,   0.533769 s,   0.543998 s,  +0.010229 s, × 1.0192,    12 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :      2 revs,   0.013147 s,   0.013455 s,  +0.000308 s, × 1.0234,  6727 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.110680 s,   0.117479 s,  +0.006799 s, × 1.0614,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000085 s,   0.000084 s,  -0.000001 s, × 0.9882,    42 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000107 s,   0.000111 s,  +0.000004 s, × 1.0374,    55 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000175 s,   0.000175 s,  +0.000000 s, × 1.0000,    58 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.000720 s,   0.000732 s,  +0.000012 s, × 1.0167,    81 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.010019 s,   0.010062 s,  +0.000043 s, × 1.0043,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.015602 s,   0.015659 s,  +0.000057 s, × 1.0037,    10 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.058759 s,   0.062744 s,  +0.003985 s, × 1.0678,    10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  66949 revs,   0.491550 s,   0.499449 s,  +0.007899 s, × 1.0161,     7 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000087 s,   0.000088 s,  +0.000001 s, × 1.0115,    44 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000268 s,   0.000266 s,  -0.000002 s, × 0.9925,    33 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000181 s,   0.000182 s,  +0.000001 s, × 1.0055,    20 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.000661 s,   0.000656 s,  -0.000005 s, × 0.9924,    93 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.003256 s,   0.003389 s,  +0.000133 s, × 1.0408,  1129 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.066749 s,   0.075882 s,  +0.009133 s, × 1.1368, 12647 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006462 s,   0.006479 s,  +0.000017 s, × 1.0026,     4 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.004919 s,   0.004889 s,  -0.000030 s, × 0.9939,   119 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.062421 s,   0.064394 s,  +0.001973 s, × 1.0316,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.026633 s,   0.026815 s,  +0.000182 s, × 1.0068,    43 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.197792 s,   0.cc85eb s,  +0.005072 s, × 1.0256,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,   1.259970 s,   1.219445 s,  -0.040525 s, × 0.9678,     7 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 204976 revs,   1.689184 s,   1.613857 s,  -0.075327 s, × 0.9554,     7 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.000865 s,   0.000873 s,  +0.000008 s, × 1.0092,   436 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.000893 s,   0.000885 s,  -0.000008 s, × 0.9910,   442 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000172 s,   0.000161 s,  -0.000011 s, × 0.9360,    40 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001159 s,   0.001138 s,  -0.000021 s, × 0.9819,   569 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.031621 s,   0.033399 s,  +0.001778 s, × 1.0562, 33399 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.068571 s,   0.075445 s,  +0.006874 s, × 1.1002, 12574 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006452 s,   0.006456 s,  +0.000004 s, × 1.0006,     4 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005443 s,   0.005462 s,  +0.000019 s, × 1.0035,   133 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.063180 s,   0.064117 s,  +0.000937 s, × 1.0148,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.293564 s,   0.297563 s,  +0.003999 s, × 1.0136,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.286595 s,   0.282463 s,  -0.004132 s, × 0.9856,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   8598 revs,   0.083256 s,   0.084038 s,  +0.000782 s, × 1.0094,     9 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.027282 s,   0.027306 s,  +0.000024 s, × 1.0009,    44 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   1.343373 s,   1.465264 s,  +0.121891 s, × 1.0907,    15 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   0.665737 s,   0.690376 s,  +0.024639 s, × 1.0370,    13 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   5.138169 s,   4.011322 s,  -1.126847 s, × 0.7807,    11 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  34414 revs,   0.573276 s,   0.573541 s,  +0.000265 s, × 1.0005,    16 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   5.127809 s,   3.981133 s,  -1.146676 s, × 0.7764,    10 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.971136 s,   3.996647 s,  -0.974489 s, × 0.8040,    11 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   1.741678 s,   1.520607 s,  -0.221071 s, × 0.8731,     7 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  40.314822 s,  50.244975 s,  +9.930153 s, × 1.2463,   219 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  20.048029 s,  20.030023 s,  -0.018006 s, × 0.9991,    52 µs/rev
      private                                                                         : 459513 revs,  37.179470 s,  24.490825 s, -12.688645 s, × 0.6587,    53 µs/rev
      
      ### Compared to the filelog based copy tracing
      
      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.000918 s,  0.000041 s,  -0.000877 s, × 0.044662,    40 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,  0.001853 s,  0.000116 s,  -0.001737 s, × 0.062601,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,  0.018994 s,  0.004933 s,  -0.014061 s, × 0.259714,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,  0.001532 s,  0.000193 s,  -0.001339 s, × 0.125979,    21 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,  0.210633 s,  0.000048 s,  -0.210585 s, × 0.000228,    47 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,  0.017041 s,  0.000114 s,  -0.016927 s, × 0.006690,    16 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,  0.019474 s,  0.000319 s,  -0.019155 s, × 0.016381,   318 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,  0.763136 s,  0.012025 s,  -0.751111 s, × 0.015757,  2003 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,  1.226569 s,  0.050525 s,  -1.176044 s, × 0.041192,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,  1.314572 s,  0.085713 s,  -1.228859 s, × 0.065202,    12 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,  1.686022 s,  0.061825 s,  -1.624197 s, × 0.036669,    11 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43645 revs,  0.001110 s,  0.543998 s,  +0.542888 s, × 490.0882,    12 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :      2 revs,  1.106265 s,  0.013455 s,  -1.092810 s, × 0.012163,  6724 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,  1.377398 s,  0.117479 s,  -1.259919 s, × 0.085291,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,  0.028579 s,  0.000084 s,  -0.028495 s, × 0.002939,    41 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,  0.133644 s,  0.000111 s,  -0.133533 s, × 0.000831,    55 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,  0.025988 s,  0.000175 s,  -0.025813 s, × 0.006734,    58 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,  0.053011 s,  0.000732 s,  -0.052279 s, × 0.013808,    81 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,  0.037858 s,  0.010062 s,  -0.027796 s, × 0.265783,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,  0.200517 s,  0.015659 s,  -0.184858 s, × 0.078093,    10 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,  0.964542 s,  0.062744 s,  -0.901798 s, × 0.065051,    10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  66949 revs,  3.976210 s,  0.499449 s,  -3.476761 s, × 0.125609,     7 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,  0.025172 s,  0.000088 s,  -0.025084 s, × 0.003496,    43 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,  0.145144 s,  0.000266 s,  -0.144878 s, × 0.001833,    33 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,  0.026139 s,  0.000182 s,  -0.025957 s, × 0.006963,    20 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,  0.086184 s,  0.000656 s,  -0.085528 s, × 0.007612,    93 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,  0.203187 s,  0.003389 s,  -0.199798 s, × 0.016679,  1129 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,  2.255675 s,  0.075882 s,  -2.179793 s, × 0.033640, 12644 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,  0.091147 s,  0.006479 s,  -0.084668 s, × 0.071083,     4 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,  0.767530 s,  0.004889 s,  -0.762641 s, × 0.006370,   119 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,  1.185330 s,  0.064394 s,  -1.120936 s, × 0.054326,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,  6.831179 s,  0.026815 s,  -6.804364 s, × 0.003925,    43 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,  3.373551 s,  0.cc85eb s,  -3.170687 s, × 0.060134,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs, 16.540604 s,  1.219445 s, -15.321159 s, × 0.073724,     7 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 204976 revs, 21.527155 s,  1.613857 s, -19.913298 s, × 0.074968,     7 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,  0.084540 s,  0.000873 s,  -0.083667 s, × 0.010326,   436 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,  0.507151 s,  0.000885 s,  -0.506266 s, × 0.001745,   442 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,  0.021748 s,  0.000161 s,  -0.021587 s, × 0.007403,    40 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,  0.236786 s,  0.001138 s,  -0.235648 s, × 0.004806,   568 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,  1.111735 s,  0.033399 s,  -1.078336 s, × 0.030042, 33365 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,  2.228030 s,  0.075445 s,  -2.152585 s, × 0.033862, 12572 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,  0.091289 s,  0.006456 s,  -0.084833 s, × 0.070720,     4 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,  0.771361 s,  0.005462 s,  -0.765899 s, × 0.007081,   133 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,  1.189483 s,  0.064117 s,  -1.125366 s, × 0.053903,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,  0.089756 s,  0.297563 s,  +0.207807 s, × 3.315244,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,  0.084888 s,  0.282463 s,  +0.197575 s, × 3.327479,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   8598 revs,  7.682665 s,  0.084038 s,  -7.598627 s, × 0.010939,     9 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,  6.894680 s,  0.027306 s,  -6.867374 s, × 0.003960,    44 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,  7.650907 s,  1.465264 s,  -6.185643 s, × 0.191515,    15 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,  9.898788 s,  0.690376 s,  -9.208412 s, × 0.069743,    13 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,  0.092208 s,  4.011322 s,  +3.919114 s, × 43.50297,    11 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  34414 revs, 28.130003 s,  0.573541 s, -27.556462 s, × 0.020389,    16 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,  0.093366 s,  3.981133 s,  +3.887767 s, × 42.64007,    10 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,  0.229368 s,  3.996647 s,  +3.767279 s, × 17.42460,    11 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs, 19.624851 s,  1.520607 s, -18.104244 s, × 0.077484,     7 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 22.070126 s, 50.244975 s, +28.174849 s, × 2.276606,   219 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs, 26.006524 s, 20.030023 s,  -5.976501 s, × 0.770192,    52 µs/rev
      private                                                                         : 459513 revs, 18.704612 s, 24.490825 s,  +5.786213 s, × 1.309347,    53 µs/rev
      
      Differential Revision: https://phab.mercurial-scm.org/D9656
      4a91293ada87
    • Pierre-Yves David's avatar
      copies-rust: use simpler overwrite when value on both side are identical · 4f45caab44f9
      Pierre-Yves David authored
      If the value are the same, their "overwritten" set is the same and we don't need
      to combine them.
      
      
      It helps our slower cases
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
      ---------------------------------------------------------------------------------------------------------------------------------------------------------------
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  86.722016 s,  80.828689 s,  -5.893327 s, × 0.9320,   352 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  35.113727 s,  34.094064 s,  -1.019663 s, × 0.9710,    89 µs/rev
      
      Full comparison with the previous revision below:
      
      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.000043 s,   0.000043 s,  +0.000000 s, × 1.0000,    43 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000114 s,   0.000114 s,  +0.000000 s, × 1.0000,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.004899 s,   0.004899 s,  +0.000000 s, × 1.0000,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000196 s,   0.000196 s,  +0.000000 s, × 1.0000,    21 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000050 s,   0.000049 s,  -0.000001 s, × 0.9800,    49 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000125 s,   0.000117 s,  -0.000008 s, × 0.9360,    16 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.000321 s,   0.6f1f4a s,  +0.000001 s, × 1.0031,   322 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.011948 s,   0.011856 s,  -0.000092 s, × 0.9923,  1976 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.051267 s,   0.050992 s,  -0.000275 s, × 0.9946,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.087755 s,   0.087444 s,  -0.000311 s, × 0.9965,    12 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.061818 s,   0.062487 s,  +0.000669 s, × 1.0108,    11 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43645 revs,   0.634253 s,   0.634909 s,  +0.000656 s, × 1.0010,    14 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :      2 revs,   0.013179 s,   0.013360 s,  +0.000181 s, × 1.0137,  6680 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.119643 s,   0.120775 s,  +0.001132 s, × 1.0095,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000085 s,   0.000085 s,  +0.000000 s, × 1.0000,    42 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000107 s,   0.000108 s,  +0.000001 s, × 1.0093,    54 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000176 s,   0.000176 s,  +0.000000 s, × 1.0000,    58 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.000743 s,   0.000747 s,  +0.000004 s, × 1.0054,    83 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.010246 s,   0.010128 s,  -0.000118 s, × 0.9885,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.015853 s,   0.015899 s,  +0.000046 s, × 1.0029,    10 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.062971 s,   0.062215 s,  -0.000756 s, × 0.9880,    10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  66949 revs,   0.518337 s,   0.521004 s,  +0.002667 s, × 1.0051,     7 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000090 s,   0.000090 s,  +0.000000 s, × 1.0000,    45 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000268 s,   0.000264 s,  -0.000004 s, × 0.9851,    33 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000187 s,   0.000186 s,  -0.000001 s, × 0.9947,    20 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.000661 s,   0.000660 s,  -0.000001 s, × 0.9985,    94 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.003494 s,   0.003542 s,  +0.000048 s, × 1.0137,  1180 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.070509 s,   0.071574 s,  +0.001065 s, × 1.0151, 11929 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006489 s,   0.006498 s,  +0.000009 s, × 1.0014,     4 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005070 s,   0.005206 s,  +0.000136 s, × 1.0268,   126 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.065241 s,   0.065535 s,  +0.000294 s, × 1.0045,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.027284 s,   0.027139 s,  -0.000145 s, × 0.9947,    44 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.203671 s,   0.201924 s,  -0.001747 s, × 0.9914,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,   1.239373 s,   1.257201 s,  +0.017828 s, × 1.0144,     8 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 204976 revs,   1.649803 s,   1.663045 s,  +0.013242 s, × 1.0080,     8 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.000868 s,   0.000866 s,  -0.000002 s, × 0.9977,   433 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.000885 s,   0.000883 s,  -0.000002 s, × 0.9977,   441 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000165 s,   0.000163 s,  -0.000002 s, × 0.9879,    40 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001147 s,   0.001139 s,  -0.000008 s, × 0.9930,   569 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.032885 s,   0.032753 s,  -0.000132 s, × 0.9960, 32752 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.071304 s,   0.073266 s,  +0.001962 s, × 1.0275, 12211 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006506 s,   0.006567 s,  +0.000061 s, × 1.0094,     4 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005486 s,   0.005427 s,  -0.000059 s, × 0.9892,   132 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.064677 s,   0.064058 s,  -0.000619 s, × 0.9904,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.306000 s,   0.303320 s,  -0.002680 s, × 0.9912,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.288217 s,   0.288456 s,  +0.000239 s, × 1.0008,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   8598 revs,   0.086117 s,   0.085925 s,  -0.000192 s, × 0.9978,     9 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.027512 s,   0.027302 s,  -0.000210 s, × 0.9924,    44 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   1.998239 s,   2.034596 s,  +0.036357 s, × 1.0182,    20 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   0.688201 s,   0.694030 s,  +0.005829 s, × 1.0085,    13 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   4.389428 s,   4.407723 s,  +0.018295 s, × 1.0042,    12 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  34414 revs,   0.578736 s,   0.574355 s,  -0.004381 s, × 0.9924,    16 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   4.363599 s,   4.457827 s,  +0.094228 s, × 1.0216,    12 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.324129 s,   4.351696 s,  +0.027567 s, × 1.0064,    12 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   1.565727 s,   1.570065 s,  +0.004338 s, × 1.0028,     8 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  86.722016 s,  80.828689 s,  -5.893327 s, × 0.9320,   352 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  35.113727 s,  34.094064 s,  -1.019663 s, × 0.9710,    89 µs/rev
      private                                                                         : 459513 revs,  27.397070 s,  27.435529 s,  +0.038459 s, × 1.0014,    59 µs/rev
      
      Differential Revision: https://phab.mercurial-scm.org/D9655
      4f45caab44f9
    • Pierre-Yves David's avatar
      copies-rust: make more use of the new comparison property · 7b3ccc77badb
      Pierre-Yves David authored
      We deal with the "both are the same" sooner and simplify the rest of the
      conditional.
      
      Differential Revision: https://phab.mercurial-scm.org/D9654
      7b3ccc77badb
  2. Dec 16, 2020
    • Pierre-Yves David's avatar
      copies-rust: implement PartialEqual manually · abd898aca0b2
      Pierre-Yves David authored
      Now that we know that each (dest, rev) pair has at most a unique CopySource, we
      can simplify comparison a lot.
      
      This "simple" step buy a good share of the previous slowdown back in some case:
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
      ---------------------------------------------------------------------------------------------------------------------------------------------------------------
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  43.304637 s,  34.443661 s,  -8.860976 s, × 0.7954,    90 µs/rev
      
      
      Full benchmark:
      
      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.000043 s,   0.000043 s,  +0.000000 s, × 1.0000,    43 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000114 s,   0.000117 s,  +0.000003 s, × 1.0263,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.004937 s,   0.004892 s,  -0.000045 s, × 0.9909,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000339 s,   0.000196 s,  -0.000143 s, × 0.5782,    21 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000049 s,   0.000050 s,  +0.000001 s, × 1.0204,    50 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000202 s,   0.000117 s,  -0.000085 s, × 0.5792,    16 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.000409 s,   0.6f1f4a s,  -0.000087 s, × 0.7873,   322 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.011984 s,   0.011949 s,  -0.000035 s, × 0.9971,  1991 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.050820 s,   0.050802 s,  -0.000018 s, × 0.9996,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.087953 s,   0.088090 s,  +0.000137 s, × 1.0016,    12 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.062902 s,   0.062079 s,  -0.000823 s, × 0.9869,    11 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43645 revs,   0.679234 s,   0.635337 s,  -0.043897 s, × 0.9354,    14 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :      2 revs,   0.013095 s,   0.013262 s,  +0.000167 s, × 1.0128,  6631 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.120910 s,   0.120085 s,  -0.000825 s, × 0.9932,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000087 s,   0.000085 s,  -0.000002 s, × 0.9770,    42 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000107 s,   0.000110 s,  +0.000003 s, × 1.0280,    55 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000186 s,   0.000177 s,  -0.000009 s, × 0.9516,    59 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.000754 s,   0.000743 s,  -0.000011 s, × 0.9854,    82 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.010443 s,   0.010168 s,  -0.000275 s, × 0.9737,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.015697 s,   0.015946 s,  +0.000249 s, × 1.0159,    10 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.063528 s,   0.062712 s,  -0.000816 s, × 0.9872,    10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  66949 revs,   0.545515 s,   0.523832 s,  -0.021683 s, × 0.9603,     7 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000089 s,   0.000090 s,  +0.000001 s, × 1.0112,    45 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000265 s,   0.000264 s,  -0.000001 s, × 0.9962,    33 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000381 s,   0.000187 s,  -0.000194 s, × 0.4908,    20 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.000672 s,   0.000665 s,  -0.000007 s, × 0.9896,    95 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.003497 s,   0.003556 s,  +0.000059 s, × 1.0169,  1185 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.073204 s,   0.071345 s,  -0.001859 s, × 0.9746, 11890 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006482 s,   0.006551 s,  +0.000069 s, × 1.0106,     4 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005066 s,   0.005078 s,  +0.000012 s, × 1.0024,   123 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.065707 s,   0.065823 s,  +0.000116 s, × 1.0018,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.026800 s,   0.027050 s,  +0.000250 s, × 1.0093,    43 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.203856 s,   0.202443 s,  -0.001413 s, × 0.9931,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,   1.293394 s,   1.261583 s,  -0.031811 s, × 0.9754,     8 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 204976 revs,   1.698239 s,   1.643869 s,  -0.054370 s, × 0.9680,     8 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.000875 s,   0.000868 s,  -0.000007 s, × 0.9920,   434 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.000891 s,   0.000887 s,  -0.000004 s, × 0.9955,   443 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000292 s,   0.000168 s,  -0.000124 s, × 0.5753,    42 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.003939 s,   0.001160 s,  -0.002779 s, × 0.2945,   580 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.033027 s,   0.033016 s,  -0.000011 s, × 0.9997, 33016 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.073703 s,   0.073312 s,  -0.39ae31 s, × 0.9947, 12218 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006469 s,   0.006485 s,  +0.000016 s, × 1.0025,     4 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005278 s,   0.005494 s,  +0.000216 s, × 1.0409,   134 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.064995 s,   0.064879 s,  -0.000116 s, × 0.9982,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.301041 s,   0.301469 s,  +0.000428 s, × 1.0014,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.285575 s,   0.297113 s,  +0.011538 s, × 1.0404,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   8598 revs,   0.085597 s,   0.085890 s,  +0.000293 s, × 1.0034,     9 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.027118 s,   0.027718 s,  +0.000600 s, × 1.0221,    45 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   2.119204 s,   2.048949 s,  -0.070255 s, × 0.9668,    21 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   0.701479 s,   0.685924 s,  -0.015555 s, × 0.9778,    13 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   4.482399 s,   4.482891 s,  +0.000492 s, × 1.0001,    12 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  34414 revs,   0.574082 s,   0.577633 s,  +0.003551 s, × 1.0062,    16 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   4.480366 s,   4.397816 s,  -0.082550 s, × 0.9816,    12 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.369070 s,   4.370538 s,  +0.001468 s, × 1.0003,    12 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   1.592506 s,   1.570439 s,  -0.022067 s, × 0.9861,     8 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  87.824489 s,  88.388512 s,  +0.564023 s, × 1.0064,   386 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  43.304637 s,  34.443661 s,  -8.860976 s, × 0.7954,    90 µs/rev
      private                                                                         : 459513 revs,  33.853687 s,  27.370148 s,  -6.483539 s, × 0.8085,    59 µs/rev
      
      Differential Revision: https://phab.mercurial-scm.org/D9653
      abd898aca0b2
    • Pierre-Yves David's avatar
      copies-rust: record "overwritten" information from both side on delete · 154e277d58dd
      Pierre-Yves David authored
      With this change, we can ensure every (`dest`, `rev`) points to the same value,
      making a lots of comparison simpler.
      
      Differential Revision: https://phab.mercurial-scm.org/D9652
      154e277d58dd
    • Pierre-Yves David's avatar
      copies-rust: refactor the "deletion" case · 38e42dbecc7b
      Pierre-Yves David authored
      We rearrange the code to single out the case where information need to be
      overwritten on both side of the merge. This open the way to better dealing with
      this case.
      
      Differential Revision: https://phab.mercurial-scm.org/D9651
      38e42dbecc7b
    • Pierre-Yves David's avatar
      copies-rust: process copy information of both parent at the same time · 3fb5b844470c
      Pierre-Yves David authored
      This avoid a double iteration and this open the way to a better handing of
      deletion. That better handling of deletion is the core reason we are doing this
      refactoring.
      
      Differential Revision: https://phab.mercurial-scm.org/D9650
      3fb5b844470c
  3. Dec 21, 2020
  4. Dec 16, 2020
  5. Dec 15, 2020
    • Pierre-Yves David's avatar
      copies-rust: remove the ancestor Oracle logic · 6c03b423f7dd
      Pierre-Yves David authored
      We are not doing any `is_ancestor` call anymore. So we can drop that logic and
      associated arguments.
      
      Differential Revision: https://phab.mercurial-scm.org/D9645
      6c03b423f7dd
    • Pierre-Yves David's avatar
      copies-rust: track "overwrites" directly within CopySource · a632383f4604
      Pierre-Yves David authored
      Overwrite are "rare enough" that explicitly keeping track of them is going to be
      "cheap", or at least much cheaper that issuing many `is_ancestor` calls.
      
      Even a simple implementation using no specific optimisation (eg: using the
      generic HashSet type) yield good result in most cases.
      
      They are interesting optimization to can do on top of that. We will implement
      them in later changesets.
      
      We tried different approach to speed up the overwrite detection and this one
      seems the most promising. Without further optimization, we already see sizable
      speedup on various cases.
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
      ---------------------------------------------------------------------------------------------------------------------------------------------------------------
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   5.138169 s,   4.482399 s,  -0.655770 s, × 0.8724,    12 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   5.127809 s,   4.480366 s,  -0.647443 s, × 0.8737,    12 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.971136 s,   4.369070 s,  -0.602066 s, × 0.8789,    12 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   1.741678 s,   1.592506 s,  -0.149172 s, × 0.9144,     8 µs/rev
      
      However, some of the case doing a lot of overwrite get significantly slower.
      The one with a really problematic slowdown are the special "head reducing" merge
      in mozilla-try so I am not too worried about them. In addition, further
      changeset are going to improve the performance of all this.
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
      ---------------------------------------------------------------------------------------------------------------------------------------------------------------
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   1.343373 s,   2.119204 s,  +0.775831 s, × 1.5775,    21 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  40.314822 s,  87.824489 s, +47.509667 s, × 2.1785,   383 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  20.048029 s,  43.304637 s, +23.256608 s, × 2.1600,   113 µs/rev
      
      
      Full benchmark below:
      
      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.000042 s,   0.000043 s,  +0.000001 s, × 1.0238,    43 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000110 s,   0.000114 s,  +0.000004 s, × 1.0364,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.004945 s,   0.004937 s,  -0.000008 s, × 0.9984,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000192 s,   0.000339 s,  +0.000147 s, × 1.7656,    37 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000049 s,   0.000049 s,  +0.000000 s, × 1.0000,    49 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000112 s,   0.000202 s,  +0.000090 s, × 1.8036,    28 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.000323 s,   0.000409 s,  +0.000086 s, × 1.2663,   409 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.010042 s,   0.011984 s,  +0.001942 s, × 1.1934,  1997 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.049813 s,   0.050820 s,  +0.001007 s, × 1.0202,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.079937 s,   0.087953 s,  +0.008016 s, × 1.1003,    12 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.059412 s,   0.062902 s,  +0.003490 s, × 1.0587,    11 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43645 revs,   0.533769 s,   0.679234 s,  +0.145465 s, × 1.2725,    15 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :      2 revs,   0.013147 s,   0.013095 s,  -0.000052 s, × 0.9960,  6547 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.110680 s,   0.120910 s,  +0.010230 s, × 1.0924,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000085 s,   0.000087 s,  +0.000002 s, × 1.0235,    43 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000107 s,   0.000107 s,  +0.000000 s, × 1.0000,    53 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000175 s,   0.000186 s,  +0.000011 s, × 1.0629,    62 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.000720 s,   0.000754 s,  +0.000034 s, × 1.0472,    83 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.010019 s,   0.010443 s,  +0.000424 s, × 1.0423,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.015602 s,   0.015697 s,  +0.000095 s, × 1.0061,    10 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.058759 s,   0.063528 s,  +0.004769 s, × 1.0812,    11 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  66949 revs,   0.491550 s,   0.545515 s,  +0.053965 s, × 1.1098,     8 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000087 s,   0.000089 s,  +0.000002 s, × 1.0230,    44 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000268 s,   0.000265 s,  -0.000003 s, × 0.9888,    33 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000181 s,   0.000381 s,  +0.000200 s, × 2.1050,    42 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.000661 s,   0.000672 s,  +0.000011 s, × 1.0166,    96 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.003256 s,   0.003497 s,  +0.000241 s, × 1.0740,  1165 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.066749 s,   0.073204 s,  +0.006455 s, × 1.0967, 12200 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006462 s,   0.006482 s,  +0.000020 s, × 1.0031,     4 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.004919 s,   0.005066 s,  +0.000147 s, × 1.0299,   123 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.062421 s,   0.065707 s,  +0.003286 s, × 1.0526,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.026633 s,   0.026800 s,  +0.000167 s, × 1.0063,    43 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.197792 s,   0.203856 s,  +0.006064 s, × 1.0307,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,   1.259970 s,   1.293394 s,  +0.033424 s, × 1.0265,     8 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 204976 revs,   1.689184 s,   1.698239 s,  +0.009055 s, × 1.0054,     8 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.000865 s,   0.000875 s,  +0.000010 s, × 1.0116,   437 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.000893 s,   0.000891 s,  -0.000002 s, × 0.9978,   445 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000172 s,   0.000292 s,  +0.000120 s, × 1.6977,    73 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001159 s,   0.003939 s,  +0.002780 s, × 3.3986,  1969 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.031621 s,   0.033027 s,  +0.001406 s, × 1.0445, 33027 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.068571 s,   0.073703 s,  +0.005132 s, × 1.0748, 12283 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.006452 s,   0.006469 s,  +0.000017 s, × 1.0026,     4 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :     41 revs,   0.005443 s,   0.005278 s,  -0.000165 s, × 0.9697,   128 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.063180 s,   0.064995 s,  +0.001815 s, × 1.0287,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.293564 s,   0.301041 s,  +0.007477 s, × 1.0255,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.286595 s,   0.285575 s,  -0.001020 s, × 0.9964,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   8598 revs,   0.083256 s,   0.085597 s,  +0.002341 s, × 1.0281,     9 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :    615 revs,   0.027282 s,   0.027118 s,  -0.000164 s, × 0.9940,    44 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   1.343373 s,   2.119204 s,  +0.775831 s, × 1.5775,    21 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   0.665737 s,   0.701479 s,  +0.035742 s, × 1.0537,    13 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   5.138169 s,   4.482399 s,  -0.655770 s, × 0.8724,    12 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  34414 revs,   0.573276 s,   0.574082 s,  +0.000806 s, × 1.0014,    16 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   5.127809 s,   4.480366 s,  -0.647443 s, × 0.8737,    12 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   4.971136 s,   4.369070 s,  -0.602066 s, × 0.8789,    12 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   1.741678 s,   1.592506 s,  -0.149172 s, × 0.9144,     8 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs,  40.314822 s,  87.824489 s, +47.509667 s, × 2.1785,   383 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 382065 revs,  20.048029 s,  43.304637 s, +23.256608 s, × 2.1600,   113 µs/rev
      private                                                                         : 459513 revs,  37.179470 s,  33.853687 s,  -3.325783 s, × 0.9105,    73 µs/rev
      
      Differential Revision: https://phab.mercurial-scm.org/D9644
      a632383f4604
  6. Dec 23, 2020
  7. Dec 21, 2020
  8. Dec 15, 2020
  9. Dec 12, 2020
  10. Dec 14, 2020
    • Pierre-Yves David's avatar
      copies: rearrange all value comparison conditional · 193ab7823d12
      Pierre-Yves David authored
      To properly handle the newly tested case (chaining of merges) we will need to
      detect more accurately when an actualy merging of the copy information (and
      superseed the two existing data). Before starting to do so, we need to
      reorganise the values comparison to introduce different conditional branches
      when such actual merging is needed/detected.
      
      To avoid mixing too many change in this complicated code, we do the
      reorganisation before adding the "overwrite detection" logic in the next
      changesets.
      
      Differential Revision: https://phab.mercurial-scm.org/D9612
      193ab7823d12
    • Pierre-Yves David's avatar
      copies-test: add test chaining multiple merge · 718ba037e34e
      Pierre-Yves David authored
      Right now, the copy tracing logic take the right decision for merges, but it
      does not keep track of the right information about these decision and can fall
      into later traps. We start with highlighting this possibility by adding new
      tests, and we will fix them later.
      
      Check the inline test documentation for details.
      
      Differential Revision: https://phab.mercurial-scm.org/D9611
      718ba037e34e
    • Pierre-Yves David's avatar
      copies-test: add test chaining multiple merge · d2ab64a81a2a
      Pierre-Yves David authored
      Right now, the copy tracing logic take the right decision for merges, but it
      does not keep track of the right information about these decision and can fall
      into later traps. We start with highlighting this possibility by adding new
      tests, and we will fix them later.
      
      Check the inline test documentation for details.
      
      Differential Revision: https://phab.mercurial-scm.org/D9610
      d2ab64a81a2a
    • Pierre-Yves David's avatar
      copies-test: add test chaining multiple merge · 412297e1f2bd
      Pierre-Yves David authored
      Right now, the copy tracing logic take the right decision for merges, but it
      does not keep track of the right information about these decision and can fall
      into later traps. We start with highlighting this possibility by adding new
      tests, and we will fix them later.
      
      Check the inline test documentation for details.
      
      Differential Revision: https://phab.mercurial-scm.org/D9609
      412297e1f2bd
  11. Dec 10, 2020
    • Pierre-Yves David's avatar
      copies: reinstall initial empty files for chained copied · 86f83b8e56c1
      Pierre-Yves David authored
      This effectively back out changeset deeb215be337. Changeset deeb215be337 does not
      really include a justification for its change and make mes uncomfortable. I have
      been thinking about it and they are two options:
      
      - either having empty/full files does not make a difference, and deeb215be337 is
        a gratuitous changes.
      
      - either having empty/full files do make a difference and deeb215be337 silently
        change the test coverage. In such situation if we want the "not empty" case to
        be tested, we should add new cases to cover them
      
      In practice, we know that the "file content did not change, but merge still need
      to create a new filenode" case exists (for example if merging result in similar
      content but both parent of the file need to be recorded), and that such case are
      easy to miss/mess-up in the tests. Having all the file using the same (empty)
      content was done on purpose to increase the coverage of such corner case.
      
      As a result I am reinstalling the previous test situation. If we want to
      increase the coverage of some case involving content-merge in
      test-copies-chain-merge.t, we should add a new, dedicated, cases. For the
      current work, it is much more likely to have the corner case broken with the
      common case working than the corner case working and the common case broken (cf
      the next paragraph). So testing the corner case is more important. I also
      suspect that the common case (merge changing the content) is already covered in
      `test-copies-chain-merge.t` or elsewhere but I did not had time to investigate
      this in details. I am planning to do a extensive pass on the copy tracing
      testing to make sure all case we gathered along the way are properly documented
      and tested (I am keeping a list). However they are a lot of things to do
      regarding copy tracing and my bandwidth is limited. I am currently focussing on
      testing and fixing more important (and currently known to be broken) cases.
      
      Doing so has a large impact on the output of the "copy info in changeset extra" variant
      added in 5e72827dae1e (2 changesets after deeb215be337). It seems to highlight
      various breakage when merge without content change are involved, this is a good
      example of why we want to explicitly test theses cases. Because the different
      -do- matters a lot.
      
      Fixing the "copy info in changeset extra" is not a priority here. because (1)
      this changeset does not break anything, it only highlight that they were always
      broken. (2) the only people using "copy info in changeset extra" do not have
      merge.
      
      Differential Revision: https://phab.mercurial-scm.org/D9587
      86f83b8e56c1
  12. Dec 29, 2020
    • Raphaël Gomès's avatar
      hg-core: add basic config module · 95d6f31e88db
      Raphaël Gomès authored
      The config module exposes a `Config` struct, unused for now.
      
      It only reads the config file local to the repository, but handles all valid
      patterns and includes/unsets.
      It is structured in layers instead of erasing by reverse order of precedence,
      allowing us to transparently know more about the config for debugging purposes,
      and potentially other things I haven't thought about yet.
      
      This change also introduces `format_bytes!` to `hg-core`.
      
      Differential Revision: https://phab.mercurial-scm.org/D9408
      95d6f31e88db
  13. Dec 14, 2020
  14. Dec 20, 2020
  15. Dec 01, 2020
  16. Dec 26, 2020
  17. Dec 28, 2020
  18. Dec 19, 2020
  19. Dec 18, 2020
    • Yuya Nishihara's avatar
      procutil: assign pseudo file object if sys.stdout/stderr is missing · a04c03b0678e
      Yuya Nishihara authored
      This basically simulates the Python 2 behavior. If libc stdio were used,
      these file objects would be available and raise EBADF. There is subtle
      difference between py2 and py3, but I think py3 behavior (i.e. exit 255)
      is more correct.
      
      "if" conditions are adjust so that they look similar to
      dispatch.initstdio().
      a04c03b0678e
  20. Dec 19, 2020
  21. Dec 18, 2020
  22. Dec 19, 2020
    • Matt Harbison's avatar
      mergetools: add BeyondCompare 4 for Windows · dbc462e34e92
      Matt Harbison authored
      This is a copy of the TortoiseHg configuration, but dropping the 3-way diff and
      dirdiff settings (since those aren't supported in core Mercurial), and swapping
      the 'parent1', 'parent2', and 'base' literals for `$labellocal`, `$labelother,
      and `$labelbase` respectively.  (That functionality was apparently never ported
      to TortoiseHg.)
      
      Additionally, the single quotes were removed from around these arguments, since
      none of the other configs have them.
      
      Differential Revision: https://phab.mercurial-scm.org/D9635
      dbc462e34e92
Loading