254 """ |
254 """ |
255 m = copy.copy(match) |
255 m = copy.copy(match) |
256 m.bad = badfn |
256 m.bad = badfn |
257 return m |
257 return m |
258 |
258 |
259 def _donormalize(patterns, default, root, cwd, auditor, warn): |
259 def _donormalize(patterns, default, root, cwd, auditor=None, warn=None): |
260 '''Convert 'kind:pat' from the patterns list to tuples with kind and |
260 '''Convert 'kind:pat' from the patterns list to tuples with kind and |
261 normalized and rooted patterns and with listfiles expanded.''' |
261 normalized and rooted patterns and with listfiles expanded.''' |
262 kindpats = [] |
262 kindpats = [] |
263 for kind, pat in [_patsplit(p, default) for p in patterns]: |
263 for kind, pat in [_patsplit(p, default) for p in patterns]: |
264 if kind in cwdrelativepatternkinds: |
264 if kind in cwdrelativepatternkinds: |
265 pat = pathutil.canonpath(root, cwd, pat, auditor) |
265 pat = pathutil.canonpath(root, cwd, pat, auditor=auditor) |
266 elif kind in ('relglob', 'path', 'rootfilesin', 'rootglob'): |
266 elif kind in ('relglob', 'path', 'rootfilesin', 'rootglob'): |
267 pat = util.normpath(pat) |
267 pat = util.normpath(pat) |
268 elif kind in ('listfile', 'listfile0'): |
268 elif kind in ('listfile', 'listfile0'): |
269 try: |
269 try: |
270 files = util.readfile(pat) |
270 files = util.readfile(pat) |