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