copies: calculate mergecopies() based on pathcopies() When copies are stored in changesets, we need a changeset-centric version of mergecopies() just like we have a changeset-centric version of pathcopies(). I think the natural way of thinking about mergecopies() is in terms of pathcopies() from the base to each of the commits. So if we can rewrite mergecopies() based on two such pathcopies() calls, we'll get the changeset-centric version for free. That's what this patch does. A nice bonus is that it ends up being a lot simpler. mergecopies() has accumulated a lot of technical debt over time. One good example is the code for dealing with grafts (the "partial/incomplete/dirty" stuff). Since pathcopies() already deals with backwards renames and ping-pong renames, we get that for free. I've run tests with hard-coded debug logging for "fullcopy" and while I haven't looked at every difference it produces, all the ones I have looked at seemed reasonable to me. I'm a little surprised that no more tests fail when run with '--extra-config-opt experimental.copies.read-from=compatibility' compared to before this patch. This patch also fixes the broken cases in test-annotate.t and test-fastannotate.t. It also enables the part of test-copies.t that was previously disabled exactly because mergecopies() needed to get a changeset-centric version. One drawback of the rewritten code is that we may now make remotefilelog prefetch more files. We used to prefetch files that were unique to either side of the merge compared to the other. We now prefetch files that are unique to either side of the merge compared to the base. This means that if you added the same file to each side, we would not prefetch it before, but we would now. Such cases are probably quite rare, but one likely scenario where they happen is when moving from a commit to its successor (or the other way around). The user will probably already have the files in the cache in such cases, so it's probably not a big deal. Some timings for calculating mergecopies between two revisions (revisions shown on each line, all using the common ancestor as base): In the hg repo: 4.8 4.9: 0.21s -> 0.21s 4.0 4.8: 0.35s -> 0.63s In and old copy of the mozilla-unified repo: FIREFOX_BETA_60_BASE^ FIREFOX_BETA_60_BASE: 0.82s -> 0.82s FIREFOX_NIGHTLY_59_END FIREFOX_BETA_60_BASE: 2.5s -> 2.6s FIREFOX_BETA_59_END FIREFOX_BETA_60_BASE: 3.9s -> 4.1s FIREFOX_AURORA_50_BASE FIREFOX_BETA_60_BASE: 31s -> 33s So it's measurably slower in most cases. The most significant difference is in the hg repo between revisions 4.0 and 4.8. In that case it seems to come from the fact that pathcopies() uses fctx.isintroducedafter() (in _tracefile), while the old mergecopies() used fctx.linkrev() (in _checkcopies()). That results in a single call to filectx._adjustlinkrev(), which is responsible for the entire difference in time (in my repo). So we pay a performance penalty but we get more correct code (see change in test-mv-cp-st-diff.t). Deleting the "== f.filenode()" in _tracefile() recovers the lost performance in the hg repo. There were are few other optimizations in _checkcopies() that I could not measure any impact from. One was from the "seen" set. Another was from a "continue" when the file was not in the destination manifest (corresponding to "am" in _tracefile). Also note that merge copies are not calculated when updating with a clean working copy, which is probably the most common case. I therefore think the much simpler code is worth the slowdown. Differential Revision: https://phab.mercurial-scm.org/D6255

     1

#require no-windows

     2

     3

  $ . "$TESTDIR/remotefilelog-library.sh"

     4

     5

  $ hg init master

     6

  $ cd master

     7

  $ cat >> .hg/hgrc <<EOF

     8

  > [remotefilelog]

     9

  > server=True

    10

  > EOF

    11

  $ echo x > x

    12

  $ hg commit -qAm x

    13

    14

  $ cd ..

    15

    16

  $ hgcloneshallow ssh://user@dummy/master shallow -q

    17

  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

    18

    19

  $ cd master

    20

  $ echo xx > x

    21

  $ hg commit -qAm x2

    22

  $ cd ..

    23

    24

# Test cache misses with read only permissions on server

    25

    26

  $ chmod -R a-w master/.hg/remotefilelogcache

    27

  $ cd shallow

    28

  $ hg pull -q

    29

  $ hg update

    30

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    31

  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

    32

  $ cd ..

    33

    34

  $ chmod -R u+w master/.hg/remotefilelogcache

    35

    36

# Test setting up shared cache with the right permissions

    37

# (this is hard to test in a cross platform way, so we just make sure nothing

    38

# crashes)

    39

    40

  $ rm -rf $CACHEDIR

    41

  $ umask 002

    42

  $ mkdir $CACHEDIR

    43

  $ hg -q clone --shallow ssh://user@dummy/master shallow2 --config remotefilelog.cachegroup="`id -g -n`"

    44

  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)

    45

  $ ls -ld $CACHEDIR/11

    46

  drwxrws* $TESTTMP/hgcache/11 (glob)