diff mercurial/util.py @ 2480:519a1011db91

fix -I/-X when relative paths used or in subdir

--- a/mercurial/util.py	Wed Jun 21 17:09:29 2006 -0700
+++ b/mercurial/util.py	Wed Jun 21 17:30:31 2006 -0700
@@ -356,10 +356,12 @@
     filematch = matchfn(files, '(?:/|$)') or always
     incmatch = always
     if inc:
-        incmatch = matchfn(map(patkind, inc), '(?:/|$)')
+        inckinds = [patkind(canonpath(canonroot, cwd, i)) for i in inc]
+        incmatch = matchfn(inckinds, '(?:/|$)')
     excmatch = lambda fn: False
     if exc:
-        excmatch = matchfn(map(patkind, exc), '(?:/|$)')
+        exckinds = [patkind(canonpath(canonroot, cwd, x)) for x in exc]
+        excmatch = matchfn(exckinds, '(?:/|$)')
 
     return (roots,
             lambda fn: (incmatch(fn) and not excmatch(fn) and