621                 if kind == dirkind:

   621                 if kind == dirkind:

   622                     skipstep3 = False

   622                     skipstep3 = False

   623                     if nf in dmap:

   623                     if nf in dmap:

   624                         #file deleted on disk but still in dirstate

   624                         #file deleted on disk but still in dirstate

   625                         results[nf] = None

   625                         results[nf] = None

   627                     if not dirignore(nf):

   628                     if not dirignore(nf):

   628                         wadd(nf)

   629                         wadd(nf)

   629                 elif kind == regkind or kind == lnkkind:

   630                 elif kind == regkind or kind == lnkkind:

   630                     results[nf] = st

   631                     results[nf] = st

   631                 else:

   632                 else:

   637                     results[nf] = None

   638                     results[nf] = None

   638                 else: # does it match a directory?

   639                 else: # does it match a directory?

   639                     prefix = nf + "/"

   640                     prefix = nf + "/"

   640                     for fn in dmap:

   641                     for fn in dmap:

   641                         if fn.startswith(prefix):

   642                         if fn.startswith(prefix):

   643                             skipstep3 = False

   645                             skipstep3 = False

   644                             break

   646                             break

   645                     else:

   647                     else:

   646                         badfn(ff, inst.strerror)

   648                         badfn(ff, inst.strerror)

   647 

   649 

   666                 else:

   668                 else:

   667                     nf = nd and (nd + "/" + f) or f

   669                     nf = nd and (nd + "/" + f) or f

   668                 if nf not in results:

   670                 if nf not in results:

   669                     if kind == dirkind:

   671                     if kind == dirkind:

   670                         if not ignore(nf):

   672                         if not ignore(nf):

   672                             wadd(nf)

   675                             wadd(nf)

   673                         if nf in dmap and (matchalways or matchfn(nf)):

   676                         if nf in dmap and (matchalways or matchfn(nf)):

   674                             results[nf] = None

   677                             results[nf] = None

   675                     elif kind == regkind or kind == lnkkind:

   678                     elif kind == regkind or kind == lnkkind:

   676                         if nf in dmap:

   679                         if nf in dmap: