##// END OF EJS Templates
dirstate.walk: fast path match-always case during traversal...
Siddharth Agarwal -
r18814:1413ba41 default
parent child Browse files
Show More
@@ -580,6 +580,7 b' class dirstate(object):'
580 dirignore = util.always
580 dirignore = util.always
581
581
582 matchfn = match.matchfn
582 matchfn = match.matchfn
583 matchalways = match.always()
583 badfn = match.bad
584 badfn = match.bad
584 dmap = self._map
585 dmap = self._map
585 normpath = util.normpath
586 normpath = util.normpath
@@ -687,15 +688,15 b' class dirstate(object):'
687 if not ignore(nf):
688 if not ignore(nf):
688 match.dir(nf)
689 match.dir(nf)
689 wadd(nf)
690 wadd(nf)
690 if nf in dmap and matchfn(nf):
691 if nf in dmap and (matchalways or matchfn(nf)):
691 results[nf] = None
692 results[nf] = None
692 elif kind == regkind or kind == lnkkind:
693 elif kind == regkind or kind == lnkkind:
693 if nf in dmap:
694 if nf in dmap:
694 if matchfn(nf):
695 if matchalways or matchfn(nf):
695 results[nf] = st
696 results[nf] = st
696 elif matchfn(nf) and not ignore(nf):
697 elif (matchalways or matchfn(nf)) and not ignore(nf):
697 results[nf] = st
698 results[nf] = st
698 elif nf in dmap and matchfn(nf):
699 elif nf in dmap and (matchalways or matchfn(nf)):
699 results[nf] = None
700 results[nf] = None
700
701
701 for s in subrepos:
702 for s in subrepos:
General Comments 0
You need to be logged in to leave comments. Login now