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

adding a

     2

marked working directory as branch b

     3

adding b

     4

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

     5

fast-forward

     6

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

     7

(branch merge, don't forget to commit)

     8

bogus fast-forward should fail

     9

abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'

    10

done