Show More
@@ -621,7 +621,7 b' class dirstate(object):' | |||||
621 | if nf in dmap: |
|
621 | if nf in dmap: | |
622 | #file deleted on disk but still in dirstate |
|
622 | #file deleted on disk but still in dirstate | |
623 | results[nf] = None |
|
623 | results[nf] = None | |
624 | match.dir(nf) |
|
624 | match.explicitdir(nf) | |
625 | if not dirignore(nf): |
|
625 | if not dirignore(nf): | |
626 | wadd(nf) |
|
626 | wadd(nf) | |
627 | elif kind == regkind or kind == lnkkind: |
|
627 | elif kind == regkind or kind == lnkkind: | |
@@ -637,7 +637,7 b' class dirstate(object):' | |||||
637 | prefix = nf + "/" |
|
637 | prefix = nf + "/" | |
638 | for fn in dmap: |
|
638 | for fn in dmap: | |
639 | if fn.startswith(prefix): |
|
639 | if fn.startswith(prefix): | |
640 | match.dir(nf) |
|
640 | match.explicitdir(nf) | |
641 | skipstep3 = False |
|
641 | skipstep3 = False | |
642 | break |
|
642 | break | |
643 | else: |
|
643 | else: | |
@@ -666,7 +666,7 b' class dirstate(object):' | |||||
666 | if nf not in results: |
|
666 | if nf not in results: | |
667 | if kind == dirkind: |
|
667 | if kind == dirkind: | |
668 | if not ignore(nf): |
|
668 | if not ignore(nf): | |
669 | match.dir(nf) |
|
669 | match.traversedir(nf) | |
670 | wadd(nf) |
|
670 | wadd(nf) | |
671 | if nf in dmap and (matchalways or matchfn(nf)): |
|
671 | if nf in dmap and (matchalways or matchfn(nf)): | |
672 | results[nf] = None |
|
672 | results[nf] = None |
General Comments 0
You need to be logged in to leave comments.
Login now