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 t

     4

cd t

     5

hg init

     6

echo a > a

     7

hg ci -Ama -d '1000000000 0'

     8

echo b > b

     9

hg branch b

    10

hg ci -Amb -d '1000000000 0'

    11

hg co -C 0

    12

    13

echo fast-forward

    14

hg merge b

    15

hg ci -Ammerge -d '1000000000 0'

    16

    17

echo bogus fast-forward should fail

    18

hg merge b

    19

    20

echo done