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

     1

# copies.py - copy detection for Mercurial

     2

#

     3

# Copyright 2008 Matt Mackall <mpm@selenic.com>

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

from __future__ import absolute_import

     9

    10

import collections

    11

import os

    12

    13

from .i18n import _

    14

    15

    16

from . import (

    17

    match as matchmod,

    18

    node,

    19

    pathutil,

    20

    pycompat,

    21

    util,

    22

)

    23

    24

    25

from .utils import stringutil

    26

    27

from .revlogutils import flagutil

    28

    29

    30

def _filter(src, dst, t):

    31

    """filters out invalid copies after chaining"""

    32

    33

    # When _chain()'ing copies in 'a' (from 'src' via some other commit 'mid')

    34

    # with copies in 'b' (from 'mid' to 'dst'), we can get the different cases

    35

    # in the following table (not including trivial cases). For example, case 2

    36

    # is where a file existed in 'src' and remained under that name in 'mid' and

    37

    # then was renamed between 'mid' and 'dst'.

    38

    #

    39

    # case src mid dst result

    40

    #   1   x   y   -    -

    41

    #   2   x   y   y   x->y

    42

    #   3   x   y   x    -

    43

    #   4   x   y   z   x->z

    44

    #   5   -   x   y    -

    45

    #   6   x   x   y   x->y

    46

    #

    47

    # _chain() takes care of chaining the copies in 'a' and 'b', but it

    48

    # cannot tell the difference between cases 1 and 2, between 3 and 4, or

    49

    # between 5 and 6, so it includes all cases in its result.

    50

    # Cases 1, 3, and 5 are then removed by _filter().

    51

    52

    for k, v in list(t.items()):

    53

        # remove copies from files that didn't exist

    54

        if v not in src:

    55

            del t[k]

    56

        # remove criss-crossed copies

    57

        elif k in src and v in dst:

    58

            del t[k]

    59

        # remove copies to files that were then removed

    60

        elif k not in dst:

    61

            del t[k]

    62

    63

    64

def _chain(prefix, suffix):

    65

    """chain two sets of copies 'prefix' and 'suffix'"""

    66

    result = prefix.copy()

    67

    for key, value in pycompat.iteritems(suffix):

    68

        result[key] = prefix.get(value, value)

    69

    return result

    70

    71

    72

def _tracefile(fctx, am, basemf):

    73

    """return file context that is the ancestor of fctx present in ancestor

    74

    manifest am

    75

    76

    Note: we used to try and stop after a given limit, however checking if that

    77

    limit is reached turned out to be very expensive. we are better off

    78

    disabling that feature."""

    79

    80

    for f in fctx.ancestors():

    81

        path = f.path()

    82

        if am.get(path, None) == f.filenode():

    83

            return path

    84

        if basemf and basemf.get(path, None) == f.filenode():

    85

            return path

    86

    87

    88

def _dirstatecopies(repo, match=None):

    89

    ds = repo.dirstate

    90

    c = ds.copies().copy()

    91

    for k in list(c):

    92

        if ds[k] not in b'anm' or (match and not match(k)):

    93

            del c[k]

    94

    return c

    95

    96

    97

def _computeforwardmissing(a, b, match=None):

    98

    """Computes which files are in b but not a.

    99

    This is its own function so extensions can easily wrap this call to see what

   100

    files _forwardcopies is about to process.

   101

    """

   102

    ma = a.manifest()

   103

    mb = b.manifest()

   104

    return mb.filesnotin(ma, match=match)

   105

   106

   107

def usechangesetcentricalgo(repo):

   108

    """Checks if we should use changeset-centric copy algorithms"""

   109

    if repo.filecopiesmode == b'changeset-sidedata':

   110

        return True

   111

    readfrom = repo.ui.config(b'experimental', b'copies.read-from')

   112

    changesetsource = (b'changeset-only', b'compatibility')

   113

    return readfrom in changesetsource

   114

   115

   116

def _committedforwardcopies(a, b, base, match):

   117

    """Like _forwardcopies(), but b.rev() cannot be None (working copy)"""

   118

    # files might have to be traced back to the fctx parent of the last

   119

    # one-side-only changeset, but not further back than that

   120

    repo = a._repo

   121

   122

    if usechangesetcentricalgo(repo):

   123

        return _changesetforwardcopies(a, b, match)

   124

   125

    debug = repo.ui.debugflag and repo.ui.configbool(b'devel', b'debug.copies')

   126

    dbg = repo.ui.debug

   127

    if debug:

   128

        dbg(b'debug.copies:    looking into rename from %s to %s\n' % (a, b))

   129

    am = a.manifest()

   130

    basemf = None if base is None else base.manifest()

   131

   132

    # find where new files came from

   133

    # we currently don't try to find where old files went, too expensive

   134

    # this means we can miss a case like 'hg rm b; hg cp a b'

   135

    cm = {}

   136

   137

    # Computing the forward missing is quite expensive on large manifests, since

   138

    # it compares the entire manifests. We can optimize it in the common use

   139

    # case of computing what copies are in a commit versus its parent (like

   140

    # during a rebase or histedit). Note, we exclude merge commits from this

   141

    # optimization, since the ctx.files() for a merge commit is not correct for

   142

    # this comparison.

   143

    forwardmissingmatch = match

   144

    if b.p1() == a and b.p2().node() == node.nullid:

   145

        filesmatcher = matchmod.exact(b.files())

   146

        forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher)

   147

    missing = _computeforwardmissing(a, b, match=forwardmissingmatch)

   148

   149

    ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True)

   150

   151

    if debug:

   152

        dbg(b'debug.copies:      missing files to search: %d\n' % len(missing))

   153

   154

    for f in sorted(missing):

   155

        if debug:

   156

            dbg(b'debug.copies:        tracing file: %s\n' % f)

   157

        fctx = b[f]

   158

        fctx._ancestrycontext = ancestrycontext

   159

   160

        if debug:

   161

            start = util.timer()

   162

        opath = _tracefile(fctx, am, basemf)

   163

        if opath:

   164

            if debug:

   165

                dbg(b'debug.copies:          rename of: %s\n' % opath)

   166

            cm[f] = opath

   167

        if debug:

   168

            dbg(

   169

                b'debug.copies:          time: %f seconds\n'

   170

                % (util.timer() - start)

   171

            )

   172

    return cm

   173

   174

   175

def _revinfo_getter(repo):

   176

    """returns a function that returns the following data given a <rev>"

   177

   178

    * p1: revision number of first parent

   179

    * p2: revision number of first parent

   180

    * changes: a ChangingFiles object

   181

    """

   182

    cl = repo.changelog

   183

    parents = cl.parentrevs

   184

    flags = cl.flags

   185

   186

    HASCOPIESINFO = flagutil.REVIDX_HASCOPIESINFO

   187

   188

    changelogrevision = cl.changelogrevision

   189

   190

    # A small cache to avoid doing the work twice for merges

   191

    #

   192

    # In the vast majority of cases, if we ask information for a revision

   193

    # about 1 parent, we'll later ask it for the other. So it make sense to

   194

    # keep the information around when reaching the first parent of a merge

   195

    # and dropping it after it was provided for the second parents.

   196

    #

   197

    # It exists cases were only one parent of the merge will be walked. It

   198

    # happens when the "destination" the copy tracing is descendant from a

   199

    # new root, not common with the "source". In that case, we will only walk

   200

    # through merge parents that are descendant of changesets common

   201

    # between "source" and "destination".

   202

    #

   203

    # With the current case implementation if such changesets have a copy

   204

    # information, we'll keep them in memory until the end of

   205

    # _changesetforwardcopies. We don't expect the case to be frequent

   206

    # enough to matters.

   207

    #

   208

    # In addition, it would be possible to reach pathological case, were

   209

    # many first parent are met before any second parent is reached. In

   210

    # that case the cache could grow. If this even become an issue one can

   211

    # safely introduce a maximum cache size. This would trade extra CPU/IO

   212

    # time to save memory.

   213

    merge_caches = {}

   214

   215

    def revinfo(rev):

   216

        p1, p2 = parents(rev)

   217

        value = None

   218

        e = merge_caches.pop(rev, None)

   219

        if e is not None:

   220

            return e

   221

        changes = None

   222

        if flags(rev) & HASCOPIESINFO:

   223

            changes = changelogrevision(rev).changes

   224

        value = (p1, p2, changes)

   225

        if p1 != node.nullrev and p2 != node.nullrev:

   226

            # XXX some case we over cache, IGNORE

   227

            merge_caches[rev] = value

   228

        return value

   229

   230

    return revinfo

   231

   232

   233

def cached_is_ancestor(is_ancestor):

   234

    """return a cached version of is_ancestor"""

   235

    cache = {}

   236

   237

    def _is_ancestor(anc, desc):

   238

        if anc > desc:

   239

            return False

   240

        elif anc == desc:

   241

            return True

   242

        key = (anc, desc)

   243

        ret = cache.get(key)

   244

        if ret is None:

   245

            ret = cache[key] = is_ancestor(anc, desc)

   246

        return ret

   247

   248

    return _is_ancestor

   249

   250

   251

def _changesetforwardcopies(a, b, match):

   252

    if a.rev() in (node.nullrev, b.rev()):

   253

        return {}

   254

   255

    repo = a.repo().unfiltered()

   256

    children = {}

   257

   258

    cl = repo.changelog

   259

    isancestor = cached_is_ancestor(cl.isancestorrev)

   260

    missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])

   261

    mrset = set(missingrevs)

   262

    roots = set()

   263

    for r in missingrevs:

   264

        for p in cl.parentrevs(r):

   265

            if p == node.nullrev:

   266

                continue

   267

            if p not in children:

   268

                children[p] = [r]

   269

            else:

   270

                children[p].append(r)

   271

            if p not in mrset:

   272

                roots.add(p)

   273

    if not roots:

   274

        # no common revision to track copies from

   275

        return {}

   276

    min_root = min(roots)

   277

   278

    from_head = set(

   279

        cl.reachableroots(min_root, [b.rev()], list(roots), includepath=True)

   280

    )

   281

   282

    iterrevs = set(from_head)

   283

    iterrevs &= mrset

   284

    iterrevs.update(roots)

   285

    iterrevs.remove(b.rev())

   286

    revs = sorted(iterrevs)

   287

   288

    if repo.filecopiesmode == b'changeset-sidedata':

   289

        revinfo = _revinfo_getter(repo)

   290

        return _combine_changeset_copies(

   291

            revs, children, b.rev(), revinfo, match, isancestor

   292

        )

   293

    else:

   294

        revinfo = _revinfo_getter_extra(repo)

   295

        return _combine_changeset_copies_extra(

   296

            revs, children, b.rev(), revinfo, match, isancestor

   297

        )

   298

   299

   300

def _combine_changeset_copies(

   301

    revs, children, targetrev, revinfo, match, isancestor

   302

):

   303

    """combine the copies information for each item of iterrevs

   304

   305

    revs: sorted iterable of revision to visit

   306

    children: a {parent: [children]} mapping.

   307

    targetrev: the final copies destination revision (not in iterrevs)

   308

    revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed)

   309

    match: a matcher

   310

   311

    It returns the aggregated copies information for `targetrev`.

   312

    """

   313

    all_copies = {}

   314

    alwaysmatch = match.always()

   315

    for r in revs:

   316

        copies = all_copies.pop(r, None)

   317

        if copies is None:

   318

            # this is a root

   319

            copies = {}

   320

        for i, c in enumerate(children[r]):

   321

            p1, p2, changes = revinfo(c)

   322

            childcopies = {}

   323

            if r == p1:

   324

                parent = 1

   325

                if changes is not None:

   326

                    childcopies = changes.copied_from_p1

   327

            else:

   328

                assert r == p2

   329

                parent = 2

   330

                if changes is not None:

   331

                    childcopies = changes.copied_from_p2

   332

            if not alwaysmatch:

   333

                childcopies = {

   334

                    dst: src for dst, src in childcopies.items() if match(dst)

   335

                }

   336

            newcopies = copies

   337

            if childcopies:

   338

                newcopies = copies.copy()

   339

                for dest, source in pycompat.iteritems(childcopies):

   340

                    prev = copies.get(source)

   341

                    if prev is not None and prev[1] is not None:

   342

                        source = prev[1]

   343

                    newcopies[dest] = (c, source)

   344

                assert newcopies is not copies

   345

            if changes is not None:

   346

                for f in changes.removed:

   347

                    if f in newcopies:

   348

                        if newcopies is copies:

   349

                            # copy on write to avoid affecting potential other

   350

                            # branches.  when there are no other branches, this

   351

                            # could be avoided.

   352

                            newcopies = copies.copy()

   353

                        newcopies[f] = (c, None)

   354

            othercopies = all_copies.get(c)

   355

            if othercopies is None:

   356

                all_copies[c] = newcopies

   357

            else:

   358

                # we are the second parent to work on c, we need to merge our

   359

                # work with the other.

   360

                #

   361

                # In case of conflict, parent 1 take precedence over parent 2.

   362

                # This is an arbitrary choice made anew when implementing

   363

                # changeset based copies. It was made without regards with

   364

                # potential filelog related behavior.

   365

                if parent == 1:

   366

                    _merge_copies_dict(

   367

                        othercopies, newcopies, isancestor, changes

   368

                    )

   369

                else:

   370

                    _merge_copies_dict(

   371

                        newcopies, othercopies, isancestor, changes

   372

                    )

   373

                    all_copies[c] = newcopies

   374

   375

    final_copies = {}

   376

    for dest, (tt, source) in all_copies[targetrev].items():

   377

        if source is not None:

   378

            final_copies[dest] = source

   379

    return final_copies

   380

   381

   382

def _merge_copies_dict(minor, major, isancestor, changes):

   383

    """merge two copies-mapping together, minor and major

   384

   385

    In case of conflict, value from "major" will be picked.

   386

   387

    - `isancestors(low_rev, high_rev)`: callable return True if `low_rev` is an

   388

                                        ancestors of `high_rev`,

   389

   390

    - `ismerged(path)`: callable return True if `path` have been merged in the

   391

                        current revision,

   392

    """

   393

    for dest, value in major.items():

   394

        other = minor.get(dest)

   395

        if other is None:

   396

            minor[dest] = value

   397

        else:

   398

            new_tt = value[0]

   399

            other_tt = other[0]

   400

            if value[1] == other[1]:

   401

                continue

   402

            # content from "major" wins, unless it is older

   403

            # than the branch point or there is a merge

   404

            if new_tt == other_tt:

   405

                minor[dest] = value

   406

            elif (

   407

                changes is not None

   408

                and value[1] is None

   409

                and dest in changes.salvaged

   410

            ):

   411

                pass

   412

            elif (

   413

                changes is not None

   414

                and other[1] is None

   415

                and dest in changes.salvaged

   416

            ):

   417

                minor[dest] = value

   418

            elif changes is not None and dest in changes.merged:

   419

                minor[dest] = value

   420

            elif not isancestor(new_tt, other_tt):

   421

                if value[1] is not None:

   422

                    minor[dest] = value

   423

                elif isancestor(other_tt, new_tt):

   424

                    minor[dest] = value

   425

   426

   427

def _revinfo_getter_extra(repo):

   428

    """return a function that return multiple data given a <rev>"i

   429

   430

    * p1: revision number of first parent

   431

    * p2: revision number of first parent

   432

    * p1copies: mapping of copies from p1

   433

    * p2copies: mapping of copies from p2

   434

    * removed: a list of removed files

   435

    * ismerged: a callback to know if file was merged in that revision

   436

    """

   437

    cl = repo.changelog

   438

    parents = cl.parentrevs

   439

   440

    def get_ismerged(rev):

   441

        ctx = repo[rev]

   442

   443

        def ismerged(path):

   444

            if path not in ctx.files():

   445

                return False

   446

            fctx = ctx[path]

   447

            parents = fctx._filelog.parents(fctx._filenode)

   448

            nb_parents = 0

   449

            for n in parents:

   450

                if n != node.nullid:

   451

                    nb_parents += 1

   452

            return nb_parents >= 2

   453

   454

        return ismerged

   455

   456

    def revinfo(rev):

   457

        p1, p2 = parents(rev)

   458

        ctx = repo[rev]

   459

        p1copies, p2copies = ctx._copies

   460

        removed = ctx.filesremoved()

   461

        return p1, p2, p1copies, p2copies, removed, get_ismerged(rev)

   462

   463

    return revinfo

   464

   465

   466

def _combine_changeset_copies_extra(

   467

    revs, children, targetrev, revinfo, match, isancestor

   468

):

   469

    """version of `_combine_changeset_copies` that works with the Google

   470

    specific "extra" based storage for copy information"""

   471

    all_copies = {}

   472

    alwaysmatch = match.always()

   473

    for r in revs:

   474

        copies = all_copies.pop(r, None)

   475

        if copies is None:

   476

            # this is a root

   477

            copies = {}

   478

        for i, c in enumerate(children[r]):

   479

            p1, p2, p1copies, p2copies, removed, ismerged = revinfo(c)

   480

            if r == p1:

   481

                parent = 1

   482

                childcopies = p1copies

   483

            else:

   484

                assert r == p2