# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2013-05-07 16:31:00
# Node ID c6cea2e2031be1ca3c4a132fd4490af7f03cfaec
# Parent  252de7b77cfd41f125faad841ce038348821404b

dirstate.walk: pull skipstep3 out of the explicit walk code

This is a move towards factoring out this code into a separate function.

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -620,7 +620,6 @@ class dirstate(object):
                 st = lstat(join(nf))
                 kind = getkind(st.st_mode)
                 if kind == dirkind:
-                    skipstep3 = False
                     if nf in dmap:
                         #file deleted on disk but still in dirstate
                         results[nf] = None
@@ -643,11 +642,11 @@ class dirstate(object):
                             if matchedir:
                                 matchedir(nf)
                             dirsnotfound.append(nf)
-                            skipstep3 = False
                             break
                     else:
                         badfn(ff, inst.strerror)
 
+        skipstep3 = skipstep3 and not (work or dirsnotfound)
         work = [d for d in work if not dirignore(d)]
         wadd = work.append