##// END OF EJS Templates
match: make explicitdir and traversedir None by default...
Siddharth Agarwal -
r19143:3cb94685 default
parent child Browse files
Show More
@@ -159,7 +159,8 b' class client(object):'
159 vdirs = cs.read(nbytes)
159 vdirs = cs.read(nbytes)
160 if vdirs:
160 if vdirs:
161 for vdir in vdirs.split('\0'):
161 for vdir in vdirs.split('\0'):
162 match.explicitdir(vdir)
162 if match.explicitdir:
163 match.explicitdir(vdir)
163
164
164 return results
165 return results
165
166
@@ -623,7 +623,8 b' class dirstate(object):'
623 if nf in dmap:
623 if nf in dmap:
624 #file deleted on disk but still in dirstate
624 #file deleted on disk but still in dirstate
625 results[nf] = None
625 results[nf] = None
626 matchedir(nf)
626 if matchedir:
627 matchedir(nf)
627 if not dirignore(nf):
628 if not dirignore(nf):
628 wadd(nf)
629 wadd(nf)
629 elif kind == regkind or kind == lnkkind:
630 elif kind == regkind or kind == lnkkind:
@@ -639,7 +640,8 b' class dirstate(object):'
639 prefix = nf + "/"
640 prefix = nf + "/"
640 for fn in dmap:
641 for fn in dmap:
641 if fn.startswith(prefix):
642 if fn.startswith(prefix):
642 matchedir(nf)
643 if matchedir:
644 matchedir(nf)
643 skipstep3 = False
645 skipstep3 = False
644 break
646 break
645 else:
647 else:
@@ -668,7 +670,8 b' class dirstate(object):'
668 if nf not in results:
670 if nf not in results:
669 if kind == dirkind:
671 if kind == dirkind:
670 if not ignore(nf):
672 if not ignore(nf):
671 matchtdir(nf)
673 if matchtdir:
674 matchtdir(nf)
672 wadd(nf)
675 wadd(nf)
673 if nf in dmap and (matchalways or matchfn(nf)):
676 if nf in dmap and (matchalways or matchfn(nf)):
674 results[nf] = None
677 results[nf] = None
@@ -119,10 +119,8 b' class match(object):'
119 found/accessed, with an error message
119 found/accessed, with an error message
120 '''
120 '''
121 pass
121 pass
122 def explicitdir(self, f):
122 explicitdir = None
123 pass
123 traversedir = None
124 def traversedir(self, f):
125 pass
126 def missing(self, f):
124 def missing(self, f):
127 pass
125 pass
128 def exact(self, f):
126 def exact(self, f):
General Comments 0
You need to be logged in to leave comments. Login now