Show More
@@ -561,6 +561,8 b' class dirstate(object):' | |||
|
561 | 561 | |
|
562 | 562 | matchfn = match.matchfn |
|
563 | 563 | matchalways = match.always() |
|
564 | matchedir = match.explicitdir | |
|
565 | matchtdir = match.traversedir | |
|
564 | 566 | badfn = match.bad |
|
565 | 567 | dmap = self._map |
|
566 | 568 | normpath = util.normpath |
@@ -621,7 +623,7 b' class dirstate(object):' | |||
|
621 | 623 | if nf in dmap: |
|
622 | 624 | #file deleted on disk but still in dirstate |
|
623 | 625 | results[nf] = None |
|
624 |
match |
|
|
626 | matchedir(nf) | |
|
625 | 627 | if not dirignore(nf): |
|
626 | 628 | wadd(nf) |
|
627 | 629 | elif kind == regkind or kind == lnkkind: |
@@ -637,7 +639,7 b' class dirstate(object):' | |||
|
637 | 639 | prefix = nf + "/" |
|
638 | 640 | for fn in dmap: |
|
639 | 641 | if fn.startswith(prefix): |
|
640 |
match |
|
|
642 | matchedir(nf) | |
|
641 | 643 | skipstep3 = False |
|
642 | 644 | break |
|
643 | 645 | else: |
@@ -666,7 +668,7 b' class dirstate(object):' | |||
|
666 | 668 | if nf not in results: |
|
667 | 669 | if kind == dirkind: |
|
668 | 670 | if not ignore(nf): |
|
669 |
match |
|
|
671 | matchtdir(nf) | |
|
670 | 672 | wadd(nf) |
|
671 | 673 | if nf in dmap and (matchalways or matchfn(nf)): |
|
672 | 674 | results[nf] = None |
General Comments 0
You need to be logged in to leave comments.
Login now