perf: clear vfs audit_cache before each run When generating a stream clone, we spend a large amount of time auditing path. Before this changes, the first run was warming the vfs cache for the other runs, leading to a large runtime difference and a "faulty" reported timing for the operation. We now clear this important cache between run to get a more realistic timing. Below are some example of median time change when clearing these cases. The maximum time for a run did not changed significantly. ### data-env-vars.name = mozilla-central-2018-08-01-zstd-sparse-revlog # benchmark.name = hg.perf.exchange.stream.generate # bin-env-vars.hg.flavor = default # bin-env-vars.hg.py-re2-module = default # benchmark.variants.version = latest no-clearing: 17.289905 cache-clearing: 21.587965 (+24.86%, +4.30) ## data-env-vars.name = mozilla-central-2024-03-22-zstd-sparse-revlog no-clearing: 32.670748 cache-clearing: 40.467095 (+23.86%, +7.80) ## data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog no-clearing: 37.838858 cache-clearing: 46.072749 (+21.76%, +8.23) ## data-env-vars.name = mozilla-unified-2024-03-22-zstd-sparse-revlog no-clearing: 32.969395 cache-clearing: 39.646209 (+20.25%, +6.68) In addition, this significantly reduce the timing difference between the performance command, from the perf extensions and a `real `hg bundle` call producing a stream bundle. Some significant differences remain especially on the "mozilla-try" repositories, but they are now smaller. Note that some of that difference will actually not be attributable to the stream generation (like maybe phases or branch map computation). Below are some benchmarks done on a currently draft changeset fixing some unrelated slowness in `hg bundle` (34a78972af409d1ff37c29e60f6ca811ad1a457d) ### data-env-vars.name = mozilla-central-2018-08-01-zstd-sparse-revlog # bin-env-vars.hg.flavor = default # bin-env-vars.hg.py-re2-module = default hg.perf.exchange.stream.generate: 21.587965 hg.command.bundle: 24.301799 (+12.57%, +2.71) ## data-env-vars.name = mozilla-central-2024-03-22-zstd-sparse-revlog hg.perf.exchange.stream.generate: 40.467095 hg.command.bundle: 44.831317 (+10.78%, +4.36) ## data-env-vars.name = mozilla-unified-2024-03-22-zstd-sparse-revlog hg.perf.exchange.stream.generate: 39.646209 hg.command.bundle: 45.395258 (+14.50%, +5.75) ## data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog hg.perf.exchange.stream.generate: 46.072749 hg.command.bundle: 55.882608 (+21.29%, +9.81) ## data-env-vars.name = mozilla-try-2023-03-22-zlib-general-delta hg.perf.exchange.stream.generate: 334.716708 hg.command.bundle: 377.856767 (+12.89%, +43.14) ## data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog hg.perf.exchange.stream.generate: 302.972301 hg.command.bundle: 326.098755 (+7.63%, +23.13)

     1

Testing recorded "modified" files for merge commit

     2

==================================================

     3

     4

#require execbit

     5

     6

This file shows what hg says are "modified" files for a merge commit

     7

(hg log -T {files}), somewhat exhaustively.

     8

     9

This test file shows merges that involves executable bit changing, check test-merge-combination-exec-bytes.t

    10

    11

For merges that involve files contents changing, check test-merge-combination-file-content.t

    12

    13

For testing of multiple corner case, check test-merge-combination-misc.t

    14

    15

Case with multiple or zero merge ancestors, copies/renames, and identical file contents

    16

with different filelog revisions are not currently covered.

    17

    18

  $ . $TESTDIR/testlib/merge-combination-util.sh

    19

    20

All the merges of executable bit.

    21

    22

  $ range () {

    23

  >   max=a

    24

  >   for i in $@; do

    25

  >     if [ $i = - ]; then continue; fi

    26

  >     if [ $i > $max ]; then max=$i; fi

    27

  >   done

    28

  >   if [ $max = a ]; then echo f; else echo f x; fi

    29

  > }

    30

  $ isgood () { case $line in *f*x*) true;; *) false;; esac; }

    31

  $ createfile () {

    32

  >   if [ -f a ] && (([ -x a ] && [ $v = x ]) || (! [ -x a ] && [ $v != x ]))

    33

  >   then touch $file

    34

  >   else touch a; if [ $v = x ]; then chmod +x a; else chmod -x a; fi

    35

  >   fi

    36

  > }

    37

    38

  $ genmerges

    39

  fffx  : agree on "a"

    40

  ffxf  : agree on "a"

    41

  ffxx  : agree on ""

    42

  ffx-  : agree on "a"

    43

  ff-x  : hg said "", expected "a"

    44

  fxff  : hg said "", expected "a"

    45

  fxfx  : hg said "a", expected ""

    46

  fxf-  : agree on "a"

    47

  fxxf  : agree on "a"

    48

  fxxx  : agree on ""

    49

  fxx-  : agree on "a"

    50

  fx-f  : hg said "", expected "a"

    51

  fx-x  : hg said "", expected "a"

    52

  fx--  : hg said "", expected "a"

    53

  f-fx  : agree on "a"

    54

  f-xf  : agree on "a"

    55

  f-xx  : hg said "", expected "a"

    56

  f-x-  : agree on "a"

    57

  f--x  : agree on "a"

    58

  -ffx  : agree on "a"

    59

  -fxf C: agree on "a"

    60

  -fxx C: hg said "", expected "a"

    61

  -fx- C: agree on "a"

    62

  -f-x  : hg said "", expected "a"

    63

  --fx  : agree on "a"