--- 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
--- a/tests/test-locate Wed Jun 21 17:09:29 2006 -0700
+++ b/tests/test-locate Wed Jun 21 17:30:31 2006 -0700
@@ -5,6 +5,8 @@
hg init
echo 0 > a
echo 0 > b
+mkdir t
+echo 0 > t/x
hg ci -A -m m -d "1000000 0"
touch nottracked
hg locate a
@@ -18,3 +20,7 @@
hg locate -r 0 a
hg locate -r 0 NONEXISTENT
hg locate -r 0
+echo % -I/-X with relative path should work
+cd t
+hg locate
+hg locate -I ../t
--- a/tests/test-locate.out Wed Jun 21 17:09:29 2006 -0700
+++ b/tests/test-locate.out Wed Jun 21 17:30:31 2006 -0700
@@ -1,13 +1,21 @@
adding a
adding b
+adding t/x
a
NONEXISTENT: No such file or directory
a
b
+t/x
a: No such file or directory
NONEXISTENT: No such file or directory
b
+t/x
a
-NONEXISTENT: No such file in rev 14467d15ef43
+NONEXISTENT: No such file in rev 9449ae447738
a
+t/x
b
+% -I/-X with relative path should work
+b
+t/x
+t/x