Show More
@@ -486,6 +486,7 b' class dirstate(object):' | |||||
486 | if nf in dmap: |
|
486 | if nf in dmap: | |
487 | #file deleted on disk but still in dirstate |
|
487 | #file deleted on disk but still in dirstate | |
488 | results[nf] = None |
|
488 | results[nf] = None | |
|
489 | match.dir(nf) | |||
489 | if not dirignore(nf): |
|
490 | if not dirignore(nf): | |
490 | wadd(nf) |
|
491 | wadd(nf) | |
491 | elif kind == regkind or kind == lnkkind: |
|
492 | elif kind == regkind or kind == lnkkind: | |
@@ -501,6 +502,7 b' class dirstate(object):' | |||||
501 | prefix = nf + "/" |
|
502 | prefix = nf + "/" | |
502 | for fn in dmap: |
|
503 | for fn in dmap: | |
503 | if fn.startswith(prefix): |
|
504 | if fn.startswith(prefix): | |
|
505 | match.dir(nf) | |||
504 | skipstep3 = False |
|
506 | skipstep3 = False | |
505 | break |
|
507 | break | |
506 | else: |
|
508 | else: | |
@@ -509,8 +511,6 b' class dirstate(object):' | |||||
509 | # step 2: visit subdirectories |
|
511 | # step 2: visit subdirectories | |
510 | while work: |
|
512 | while work: | |
511 | nd = work.pop() |
|
513 | nd = work.pop() | |
512 | if hasattr(match, 'dir'): |
|
|||
513 | match.dir(nd) |
|
|||
514 | skip = None |
|
514 | skip = None | |
515 | if nd == '.': |
|
515 | if nd == '.': | |
516 | nd = '' |
|
516 | nd = '' | |
@@ -528,6 +528,7 b' class dirstate(object):' | |||||
528 | if nf not in results: |
|
528 | if nf not in results: | |
529 | if kind == dirkind: |
|
529 | if kind == dirkind: | |
530 | if not ignore(nf): |
|
530 | if not ignore(nf): | |
|
531 | match.dir(nf) | |||
531 | wadd(nf) |
|
532 | wadd(nf) | |
532 | if nf in dmap and matchfn(nf): |
|
533 | if nf in dmap and matchfn(nf): | |
533 | results[nf] = None |
|
534 | results[nf] = None |
General Comments 0
You need to be logged in to leave comments.
Login now