mercurial/cmdutil.py
changeset 24955 1df233bcb7f6
parent 24947 a02d293a1079
child 24986 fb9b7b937b3e
equal deleted inserted replaced
24954:e47feee55bf7 24955:1df233bcb7f6
  2334             for subpath in wctx.substate:
  2334             for subpath in wctx.substate:
  2335                 if f.startswith(subpath):
  2335                 if f.startswith(subpath):
  2336                     return True
  2336                     return True
  2337             return False
  2337             return False
  2338 
  2338 
  2339         isdir = f in deleteddirs or f in wctx.dirs()
  2339         isdir = f in deleteddirs or wctx.hasdir(f)
  2340         if f in repo.dirstate or isdir or f == '.' or insubrepo():
  2340         if f in repo.dirstate or isdir or f == '.' or insubrepo():
  2341             continue
  2341             continue
  2342 
  2342 
  2343         if repo.wvfs.exists(f):
  2343         if repo.wvfs.exists(f):
  2344             if repo.wvfs.isdir(f):
  2344             if repo.wvfs.isdir(f):