util._matcher: speed up regexp matching. In 4babaa52badf, Benoit made a change that substantially slows matching when a big .hgignore file is in play, because it calls into the regexp matching engine potentially hundreds of times per file to be matched. I've partly rolled back his change, so that we only call into the matcher once per file, but preserved the ability to report a meaningful error message if there's a syntax error in the regexp.

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

     7

mkdir a

     8

echo foo > a/a

     9

echo bar > a/b

    10

    11

hg add a

    12

hg ci -m "0" -d "0 0"

    13

    14

hg co -C 0

    15

hg mv a b

    16

hg ci -m "1 mv a/ b/" -d "0 0"

    17

    18

hg co -C 0

    19

echo baz > a/c

    20

hg add a/c

    21

hg ci -m "2 add a/c" -d "0 0"

    22

    23

hg merge --debug 1

    24

echo a/* b/*

    25

hg st -C

    26

hg ci -m "3 merge 2+1" -d "0 0"

    27

    28

hg co -C 1

    29

hg merge --debug 2

    30

echo a/* b/*

    31

hg st -C

    32

hg ci -m "4 merge 1+2" -d "0 0"