path_auditor: cache names of audited directories We use a separate cache to avoid problems with audit = path_auditor(repo.root) audit("subrepo") audit("subrepo/file") whitelisting "subrepo" (which is fine) and then using the same whitelist with "subrepo/file" (which is not fine). Since we create a separate path_auditor for every path on the command line, a "hg add dir/a dir/b dir/c" will still lstat dir 3 times just to audit the paths.

     1

#!/bin/sh

     2

     3

mkdir r1

     4

cd r1

     5

hg init

     6

mkdir a

     7

echo foo > a/f

     8

hg add a

     9

hg ci -m "a/f == foo"

    10

cd ..

    11

    12

hg clone r1 r2

    13

cd r2

    14

hg mv a b

    15

echo foo1 > b/f

    16

hg ci -m" a -> b, b/f == foo1"

    17

cd ..

    18

    19

cd r1

    20

mkdir a/aa

    21

echo bar > a/aa/g

    22

hg add a/aa

    23

hg ci -m "a/aa/g"

    24

hg pull ../r2

    25

    26

hg merge

    27

    28

hg st -C