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

hg init

     4

echo a > a

     5

hg commit -A -ma

     6

     7

echo a >> a

     8

hg commit -mb

     9

    10

echo a >> a

    11

hg commit -mc

    12

    13

hg up 1

    14

echo a >> a

    15

hg commit -md

    16

    17

hg up 1

    18

echo a >> a

    19

hg commit -me

    20

    21

hg up 1

    22

echo % should fail because not at a head

    23

hg merge

    24

    25

hg up

    26

echo % should fail because \> 2 heads

    27

hg merge

    28

    29

echo % should succeed

    30

hg merge 2

    31

hg commit -mm1

    32

    33

echo % should succeed - 2 heads

    34

hg merge

    35

hg commit -mm2

    36

    37

echo % should fail because 1 head

    38

hg merge

    39

    40

true