dirstate.walk: minor cleanups

- add dirkind
- simplify loop structure
- avoid pconvert and join on directory entries (big speed bump)
- remove redundant seen set in step 3

mercurial/dirstate.py

@@ -464,7 +464,8 b' class dirstate(object):'
         isdir = os.path.isdir
         pconvert = util.pconvert
         join = os.path.join
-        s_isdir = stat.S_ISDIR
+        isdir = stat.S_ISDIR
+        dirkind = stat.S_IFDIR
         supported = self._supported
         _join = self._join
         work = []
@@ -480,20 +481,7 b' class dirstate(object):'
 
             try:
                 st = lstat(_join(nf))
-            except OSError, inst:
-                keep = False
-                for fn in dmap:
-                    if nf == fn or (fn.startswith(nf) and fn[len(nf)] == '/'):
-                        keep = True
-                        break
-                if not keep:
-                    if inst.errno != errno.ENOENT:
-                        fwarn(ff, inst.strerror)
-                    elif badfn(ff, inst.strerror) and imatch(nf):
-                        yield nf, None
-                continue
-
-            if s_isdir(st.st_mode):
+                if isdir(st.st_mode):
                 if not dirignore(nf):
                     wadd(nf)
             else:
@@ -502,6 +490,18 b' class dirstate(object):'
                     yield nf, st
                 elif nf in dmap:
                     yield nf, None
+            except OSError, inst:
+                keep = False
+                prefix = nf + "/"
+                for fn in dmap:
+                    if nf == fn or fn.startswith(prefix):
+                        keep = True
+                        break
+                if not keep:
+                    if inst.errno != errno.ENOENT:
+                        fwarn(ff, inst.strerror)
+                    elif badfn(ff, inst.strerror) and imatch(nf):
+                        yield nf, None
 
         # step 2: visit subdirectories
         while work:
@@ -509,7 +509,6 b' class dirstate(object):'
             if hasattr(match, 'dir'):
                 match.dir(nd)
             entries = listdir(_join(nd), stat=True)
-            # nd is the top of the repository dir tree
             if nd == '.':
                 nd = ''
             else:
@@ -518,15 +517,13 b' class dirstate(object):'
                 # is good on big directory.
                 hg = bisect_left(entries, ('.hg'))
                 if hg < len(entries) and entries[hg][0] == '.hg' \
-                        and entries[hg][1] == stat.S_IFDIR:
+                        and entries[hg][1] == dirkind:
                         continue
             for f, kind, st in entries:
-                nf = normalize(pconvert(join(nd, f)))
-                if nf in seen:
-                    continue
+                nf = normalize(nd and (nd + "/" + f) or f)
+                if nf not in seen:
                 seen[nf] = 1
-                # don't trip over symlinks
-                if kind == stat.S_IFDIR:
+                    if kind == dirkind:
                     if not ignore(nf):
                         wadd(nf)
                     if nf in dmap and match(nf):
@@ -539,9 +536,7 b' class dirstate(object):'
 
         # step 3: report unseen items in the dmap hash
         for f in util.sort(dmap):
-            if f in seen or not match(f):
-                continue
-            seen[f] = 1
+            if f not in seen and match(f):
             try:
                 st = lstat(_join(f))
                 if supported(f, st.st_mode):