Show More
@@ -166,11 +166,11 b' def _globprefix(pat):' | |||||
166 | root.append(p) |
|
166 | root.append(p) | |
167 | return '/'.join(root) or '.' |
|
167 | return '/'.join(root) or '.' | |
168 |
|
168 | |||
169 |
def _normalize |
|
169 | def _normalize(names, default, root, cwd): | |
170 | pats = [] |
|
170 | pats = [] | |
171 | for kind, name in [_patsplit(p, default) for p in names]: |
|
171 | for kind, name in [_patsplit(p, default) for p in names]: | |
172 | if kind in ('glob', 'relpath'): |
|
172 | if kind in ('glob', 'relpath'): | |
173 |
name = util.canonpath( |
|
173 | name = util.canonpath(root, cwd, name) | |
174 | elif kind in ('relglob', 'path'): |
|
174 | elif kind in ('relglob', 'path'): | |
175 | name = util.normpath(name) |
|
175 | name = util.normpath(name) | |
176 |
|
176 | |||
@@ -226,14 +226,14 b" def _matcher(root, cwd='', names=[], inc" | |||||
226 | anypats = bool(inc or exc) |
|
226 | anypats = bool(inc or exc) | |
227 |
|
227 | |||
228 | if names: |
|
228 | if names: | |
229 |
pats = _normalize |
|
229 | pats = _normalize(names, dflt_pat, root, cwd) | |
230 | roots = _roots(pats) |
|
230 | roots = _roots(pats) | |
231 | anypats = anypats or _anypats(pats) |
|
231 | anypats = anypats or _anypats(pats) | |
232 | patmatch = _matchfn(pats, '$') |
|
232 | patmatch = _matchfn(pats, '$') | |
233 | if inc: |
|
233 | if inc: | |
234 |
incmatch = _matchfn(_normalize |
|
234 | incmatch = _matchfn(_normalize(inc, 'glob', root, cwd), '(?:/|$)') | |
235 | if exc: |
|
235 | if exc: | |
236 |
excmatch = _matchfn(_normalize |
|
236 | excmatch = _matchfn(_normalize(exc, 'glob', root, cwd), '(?:/|$)') | |
237 |
|
237 | |||
238 | if names: |
|
238 | if names: | |
239 | if inc: |
|
239 | if inc: |
General Comments 0
You need to be logged in to leave comments.
Login now