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

# lock.py - simple locking scheme for mercurial

     2

#

     3

# Copyright 2005 Matt Mackall <mpm@selenic.com>

     4

#

     5

# This software may be used and distributed according to the terms

     6

# of the GNU General Public License, incorporated herein by reference.

     7

     8

import os, time

     9

import util

    10

    11

class LockHeld(Exception):

    12

    pass

    13

    14

class lock:

    15

    def __init__(self, file, wait=1):

    16

        self.f = file

    17

        self.held = 0

    18

        self.wait = wait

    19

        self.lock()

    20

    21

    def __del__(self):

    22

        self.release()

    23

    24

    def lock(self):

    25

        while 1:

    26

            try:

    27

                self.trylock()

    28

                return 1

    29

            except LockHeld, inst:

    30

                if self.wait:

    31

                    time.sleep(1)

    32

                    continue

    33

                raise inst

    34

    35

    def trylock(self):

    36

        pid = os.getpid()

    37

        try:

    38

            util.makelock(str(pid), self.f)

    39

            self.held = 1

    40

        except (OSError, IOError):

    41

            raise LockHeld(util.readlock(self.f))

    42

    43

    def release(self):

    44

        if self.held:

    45

            self.held = 0

    46

            try:

    47

                os.unlink(self.f)

    48

            except: pass

    49