Optimize dirstate walking This generally cuts the time for hg status/diff in half, from 2s down to 1s. The main parts I'm trying to optimize are: 1) os.walk stats every file. dirstate.changes then stats every file again. 2) os.walk yields every file and subdir to dirstate.traverse who yields every file and everything in the dirstate map. dirstate.walk then filters this mass and yields every file to the caller. There should be fewer steps in here, and fewer duplicate strings yielded. 3) dirstate.walk runs util.unique on the results from dirstate.traverse, even though it is also passing things through dirstate.seen to look for duplicates. I've turned os.walk into something hg specific that takes all the dirstate ignore and matching rules into account. The new function also takes an function arg (statmatch()) the caller supplies to help filter out files it doesn't care about. dirstate.changes uses this to update state for each file, avoiding the second stat call. dirstate.walk is changed to turn the match function it is passed into a statmatch function. The only real difference is that a statmatch function takes the stat data as a second parameter. It now calls dirstate.walkhelper, who requires a statmatch function to be passed. This fails test-walk, but right now I think this is from a sorting error fixed by this patch. Index: crew/mercurial/dirstate.py ===================================================================

     1

import getopt

     2

     3

def fancyopts(args, options, state):

     4

    long=[]

     5

    short=''

     6

    map={}

     7

    dt={}

     8

     9

    for s, l, d, c in options:

    10

        pl = l.replace('-', '_')

    11

        map['-'+s] = map['--'+l] = pl

    12

        state[pl] = d

    13

        dt[pl] = type(d)

    14

        if not d is None and not callable(d):

    15

            if s: s += ':'

    16

            if l: l += '='

    17

        if s: short = short + s

    18

        if l: long.append(l)

    19

    20

    opts, args = getopt.getopt(args, short, long)

    21

    22

    for opt, arg in opts:

    23

        if dt[map[opt]] is type(fancyopts): state[map[opt]](state,map[opt],arg)

    24

        elif dt[map[opt]] is type(1): state[map[opt]] = int(arg)

    25

        elif dt[map[opt]] is type(''): state[map[opt]] = arg

    26

        elif dt[map[opt]] is type([]): state[map[opt]].append(arg)

    27

        elif dt[map[opt]] is type(None): state[map[opt]] = 1

    28

    29

    return args

    30