test-remove: make it pass on Mac OS X 10.5

tests/test-remove

@@ -1,109 +1,110 b''
 #!/bin/sh
 
 remove() {
     hg rm $@
     hg st
-    ls -R
+    # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5
+    find . ! -regex '.*/\.hg.*' -a -type f
     hg up -C
 }
 
 hg init a
 cd a
 echo a > foo
 
 echo % file not managed
 remove foo
 
 hg add foo
 hg commit -m1
 
 # the table cases
 
 echo % 00 state added, options none
 echo b > bar
 hg add bar
 remove bar
 
 echo % 01 state clean, options none
 remove foo
 
 echo % 02 state modified, options none
 echo b >> foo
 remove foo
 
 echo % 03 state missing, options none
 rm foo
 remove foo
 
 echo % 10 state added, options -f
 echo b > bar
 hg add bar
 remove -f bar
 rm bar
 
 echo % 11 state clean, options -f
 remove -f foo
 
 echo % 12 state modified, options -f
 echo b >> foo
 remove -f foo
 
 echo % 13 state missing, options -f
 rm foo
 remove -f foo
 
 echo % 20 state added, options -A
 echo b > bar
 hg add bar
 remove -A bar
 
 echo % 21 state clean, options -A
 remove -A foo
 
 echo % 22 state modified, options -A
 echo b >> foo
 remove -A foo
 
 echo % 23 state missing, options -A
 rm foo
 remove -A foo
 
 echo % 30 state added, options -Af
 echo b > bar
 hg add bar
 remove -Af bar
 rm bar
 
 echo % 31 state clean, options -Af
 remove -Af foo
 
 echo % 32 state modified, options -Af
 echo b >> foo
 remove -Af foo
 
 echo % 33 state missing, options -Af
 rm foo
 remove -Af foo
 
 # test some directory stuff
 
 mkdir test
 echo a > test/foo
 echo b > test/bar
 hg ci -Am2
 
 echo % dir, options none
 rm test/bar
 remove test
 
 echo % dir, options -f
 rm test/bar
 remove -f test
 
 echo % dir, options -A
 rm test/bar
 remove -A test
 
 echo % dir, options -Af
 rm test/bar
 remove -Af test

tests/test-remove.out

@@ -1,127 +1,100 b''
 % file not managed
 ? foo
-.:
-foo
+./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 00 state added, options none
 not removing bar: file has been marked for add (use -f to force removal)
 A bar
-.:
-bar
-foo
+./bar
+./foo
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % 01 state clean, options none
 R foo
-.:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 02 state modified, options none
 not removing foo: file is modified (use -f to force removal)
 M foo
-.:
-foo
+./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 03 state missing, options none
 R foo
-.:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 10 state added, options -f
 ? bar
-.:
-bar
-foo
+./bar
+./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 11 state clean, options -f
 R foo
-.:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 12 state modified, options -f
 R foo
-.:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 13 state missing, options -f
 R foo
-.:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 20 state added, options -A
 not removing bar: file still exists (use -f to force removal)
 A bar
-.:
-bar
-foo
+./bar
+./foo
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % 21 state clean, options -A
 not removing foo: file still exists (use -f to force removal)
-.:
-foo
+./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 22 state modified, options -A
 not removing foo: file still exists (use -f to force removal)
 M foo
-.:
-foo
+./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 23 state missing, options -A
 R foo
-.:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 30 state added, options -Af
 ? bar
-.:
-bar
-foo
+./bar
+./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 31 state clean, options -Af
 R foo
-.:
-foo
+./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 32 state modified, options -Af
 R foo
-.:
-foo
+./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 33 state missing, options -Af
 R foo
-.:
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding test/bar
 adding test/foo
 % dir, options none
 removing test/foo
 removing test/bar
 R test/bar
 R test/foo
-.:
-foo
+./foo
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % dir, options -f
 removing test/foo
 removing test/bar
 R test/bar
 R test/foo
-.:
-foo
+./foo
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % dir, options -A
 not removing test/foo: file still exists (use -f to force removal)
 removing test/bar
 R test/bar
-.:
-foo
-test
-
-./test:
-foo
+./foo
+./test/foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % dir, options -Af
 removing test/foo
 removing test/bar
 R test/bar
 R test/foo
-.:
-foo
-test
-
-./test:
-foo
+./foo
+./test/foo
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved