##// END OF EJS Templates
largefiles: use the optional badfn argument when building a matcher...
Matt Harbison -
r25470:378a8e70 default
parent child Browse files
Show More
@@ -241,16 +241,18 b' def linktousercache(repo, hash):'
241 def getstandinmatcher(repo, rmatcher=None):
241 def getstandinmatcher(repo, rmatcher=None):
242 '''Return a match object that applies rmatcher to the standin directory'''
242 '''Return a match object that applies rmatcher to the standin directory'''
243 standindir = repo.wjoin(shortname)
243 standindir = repo.wjoin(shortname)
244
245 # no warnings about missing files or directories
246 badfn = lambda f, msg: None
247
244 if rmatcher and not rmatcher.always():
248 if rmatcher and not rmatcher.always():
245 pats = [os.path.join(standindir, pat) for pat in rmatcher.files()]
249 pats = [os.path.join(standindir, pat) for pat in rmatcher.files()]
246 match = scmutil.match(repo[None], pats)
250 match = scmutil.match(repo[None], pats, badfn=badfn)
247 # if pats is empty, it would incorrectly always match, so clear _always
251 # if pats is empty, it would incorrectly always match, so clear _always
248 match._always = False
252 match._always = False
249 else:
253 else:
250 # no patterns: relative to repo root
254 # no patterns: relative to repo root
251 match = scmutil.match(repo[None], [standindir])
255 match = scmutil.match(repo[None], [standindir], badfn=badfn)
252 # no warnings about missing files or directories
253 match.bad = lambda f, msg: None
254 return match
256 return match
255
257
256 def composestandinmatcher(repo, rmatcher):
258 def composestandinmatcher(repo, rmatcher):
General Comments 0
You need to be logged in to leave comments. Login now