--- a/tests/test-locate	Fri Mar 16 22:48:21 2007 -0300
+++ b/tests/test-locate	Fri Mar 16 22:48:22 2007 -0300
@@ -17,6 +17,8 @@
 echo 0 > t.h
 mkdir t
 echo 0 > t/x
+echo 0 > t/b
+echo 0 > t/e.h
 hg ci -A -m m -d "1000000 0"
 touch nottracked
 hglocate a && echo locate succeeded || echo locate failed
@@ -38,3 +40,13 @@
 cd ..
 rm -r t
 hglocate t
+mkdir otherdir
+cd otherdir
+hglocate b
+hglocate '*.h'
+hglocate path:t/x
+hglocate 're:.*\.h'
+hglocate -r 0 b
+hglocate -r 0 '*.h'
+hglocate -r 0 path:t/x
+hglocate -r 0 're:.*\.h'

--- a/tests/test-locate.out	Fri Mar 16 22:48:21 2007 -0300
+++ b/tests/test-locate.out	Fri Mar 16 22:48:22 2007 -0300
@@ -1,6 +1,8 @@
 adding a
 adding b
 adding t.h
+adding t/b
+adding t/e.h
 adding t/x
 hg locate a
 a
@@ -13,6 +15,8 @@
 a
 b
 t.h
+t/b
+t/e.h
 t/x
 
 hg locate a
@@ -22,6 +26,8 @@
 hg locate 
 b
 t.h
+t/b
+t/e.h
 t/x
 
 hg locate -r 0 a
@@ -33,17 +39,55 @@
 a
 b
 t.h
+t/b
+t/e.h
 t/x
 
 % -I/-X with relative path should work
 hg locate 
 b
 t.h
+t/b
+t/e.h
 t/x
 
 hg locate -I ../t
+t/b
+t/e.h
 t/x
 
 hg locate t
+t/b
+t/e.h
 t/x
 
+hg locate b
+../b
+../t/b
+
+hg locate *.h
+../t.h
+../t/e.h
+
+hg locate path:t/x
+../t/x
+
+hg locate re:.*\.h
+../t.h
+../t/e.h
+
+hg locate -r 0 b
+../b
+../t/b
+
+hg locate -r 0 *.h
+../t.h
+../t/e.h
+
+hg locate -r 0 path:t/x
+../t/x
+
+hg locate -r 0 re:.*\.h
+../t.h
+../t/e.h
+