Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

tests/test-backwards-remove

@@ -1,12 +1,12 b''
-#!/bin/sh -x
+#!/bin/sh
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 ls
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 hg co 0
 # B should disappear
 ls

tests/test-bad-pull

@@ -1,28 +1,25 b''
-#!/bin/sh -x
+#!/bin/sh
 
 hg clone http://localhost:20059/ copy
 echo $?
 ls copy
 
 cat > dumb.py <<EOF
 import BaseHTTPServer, SimpleHTTPServer, signal
 
 def run(server_class=BaseHTTPServer.HTTPServer,
         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
     server_address = ('localhost', 20059)
     httpd = server_class(server_address, handler_class)
     httpd.serve_forever()
 
 signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
 run()
 EOF
 
-set +x # backgrounding sometimes disturbs the order of command tracing
 python dumb.py 2>/dev/null &
-set -x
 
 hg clone http://localhost:20059/foo copy2
 echo $?
 
-set +x
 kill $!

tests/test-basic

@@ -1,13 +1,12 b''
 #!/bin/sh
 
-set -x
 mkdir t
 cd t
 hg init
 echo a > a
 hg add a
 hg commit -m test -d "0 0"
 hg history
 hg manifest
 hg cat a
 hg verify

tests/test-clone

@@ -1,28 +1,27 b''
 #!/bin/bash
 
-set -x
 mkdir a
 cd a
 hg init
 echo a > a
 hg add a
 hg commit -m test -d '0 0'
 
 # Default operation
 hg clone . ../b
 cd ../b
 cat a
 hg verify
 
 # No update
 hg clone -U . ../c
 cd ../c
 cat a
 hg verify
 
 # Default destination
 mkdir ../d
 cd ../d
 hg clone ../a
 cd a
 hg cat a

tests/test-clone-failure

@@ -1,43 +1,41 b''
 #!/bin/bash
 
-set -x
-
 # No local source
 hg clone a b
 echo $?
 
 # No remote source
 hg clone http://127.0.0.1:3121/a b
 echo $?
 rm -rf b # work around bug with http clone
 
 # Inaccessible source
 mkdir a
 chmod 000 a
 hg clone a b
 echo $?
 
 # Inaccessible destination
 mkdir b
 cd b
 hg init
 hg clone . ../a
 echo $?
 cd ..
 chmod 700 a
 rm -rf a b
 
 # Source of wrong type
 mkfifo a
 hg clone a b
 echo $?
 rm a
 
 # Default destination, same directory
 mkdir q
 cd q
 hg init
 cd ..
 hg clone q
 
 true

tests/test-conflict

@@ -1,17 +1,16 b''
 #!/bin/sh
 
-set -x
 hg init
 echo "nothing" > a
 hg add a
 hg commit -m ancestor -d "0 0"
 echo "something" > a
 hg commit -m branch1 -d "0 0"
 hg co 0
 echo "something else" > a
 hg commit -m branch2 -d "0 0"
-export HGMERGE=merge
+HGMERGE=merge; export HGMERGE
 hg up -m 1
 hg id
 grep -Ev ">>>|<<<" a
 hg status

tests/test-copy

@@ -1,20 +1,19 b''
 #!/bin/sh
 
-set -x
 hg init
 echo a > a
 hg add a
 hg commit -m "1" -d "0 0"
 hg status
 cp a b
 hg copy a b
 hg status
 hg --debug commit -m "2" -d "0 0"
 hg history
 hg log a
-hexdump -C .hg/data/b.d
+md5sum .hg/data/b.d
 hg cat b > bsum
 md5sum bsum
 hg cat a > asum
 md5sum asum
 hg verify

tests/test-diffdir

@@ -1,12 +1,12 b''
 #!/bin/sh
 
 hg init
 touch a
 hg add a
 hg ci -m "a" -d "0 0"
 
 echo 123 > b
 hg add b
-hg diff | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/"
+hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"
 
-hg diff -r tip | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/"
+hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"

tests/test-flags

@@ -1,34 +1,34 b''
-#!/bin/sh -ex
+#!/bin/sh -e
 
 umask 027
 mkdir test1
 cd test1
 
 hg init
 touch a b
 hg add a b
 hg ci -m "added a b" -d "0 0"
 
 cd ..
 mkdir test2
 cd test2
 
 hg init
 hg pull ../test1
 hg co
 chmod +x a
 hg ci -m "chmod +x a" -d "0 0"
 
 cd ../test1
 echo 123 >>a
 hg ci -m "a updated" -d "0 0"
 
 hg pull ../test2
 hg heads
 hg history
 
 hg -v co -m
 
 ls -l ../test[12]/a > foo
 cut -b 0-10 < foo
 

tests/test-hook

@@ -1,9 +1,9 b''
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo "[hooks]" > .hg/hgrc
 echo 'precommit = echo precommit hook' >> .hg/hgrc
 echo 'commit = echo commit hook: $NODE' >> .hg/hgrc
 echo a > a
 hg add a
 hg commit -m "test" -d "0 0"

tests/test-merge-revert

@@ -1,45 +1,45 b''
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "added file1" > file1
 echo "added file2" > file2
 hg add file1 file2
 hg commit -m "added file1 and file2" -d "0 0" -u user
 echo "changed file1" >> file1
 hg commit -m "changed file1" -d "0 0" -u user
 hg -q log
 hg id
 hg update -C 0
 hg id
 echo "changed file1" >> file1
 hg id
 hg revert
 hg diff
 hg status
 hg id
 hg update
 hg diff
 hg status
 hg id
 hg update -C 0
 echo "changed file1" >> file1
 HGMERGE=merge hg update
 hg diff
 hg status
 hg id
 hg revert
 hg diff
 hg status
 hg id
 hg revert -r tip
 hg diff
 hg status
 hg id
 hg update -C
 hg diff
 hg status
 hg id
 cd ..; /bin/rm -rf t
 

tests/test-merge-revert2

@@ -1,45 +1,45 b''
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "added file1" > file1
 echo "added file2" > file2
 hg add file1 file2
 hg commit -m "added file1 and file2" -d "0 0" -u user
 echo "changed file1" >> file1
 hg commit -m "changed file1" -d "0 0" -u user
 hg -q log
 hg id
 hg update -C 0
 hg id
 echo "changed file1" >> file1
 hg id
 hg revert
 hg diff
 hg status
 hg id
 hg update
 hg diff
 hg status
 hg id
 hg update -C 0
 echo "changed file1 different" >> file1
 HGMERGE=merge hg update
-hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
+hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
 hg status
 hg id
 hg revert
 hg diff
 hg status
 hg id
 hg revert -r tip
 hg diff
 hg status
 hg id
 hg update -C
 hg diff
 hg status
 hg id
 cd ..; /bin/rm -rf t
 

tests/test-merge1

@@ -1,86 +1,86 b''
-#!/bin/sh -x
+#!/bin/sh
 
 cat <<'EOF' > merge
 #!/bin/sh
 echo merging for `basename $1`
 EOF
 chmod +x merge
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #2" -d "0 0"
 echo This is file b1 > b
 env HGMERGE=../merge hg update -m 1
 # no merges expected
 cd ..; /bin/rm -rf t
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #2" -d "0 0"
 echo This is file b2 > b
 env HGMERGE=../merge hg update -m 1
 # merge of b expected
 cd ..; /bin/rm -rf t
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 echo This is file b22 > b
 hg commit -m "commit #2" -d "0 0"
 hg update 1
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #3" -d "0 0"
 cat b
 echo This is file b22 > b
 env HGMERGE=../merge hg update -m 2
 # merge expected!
 cd ..; /bin/rm -rf t
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 echo This is file b22 > b
 hg commit -m "commit #2" -d "0 0"
 hg update 1
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #3" -d "0 0"
 echo This is file b33 > b
 env HGMERGE=../merge hg update -m 2
 # merge of b expected
 cd ..; /bin/rm -rf t

tests/test-merge2

@@ -1,48 +1,48 b''
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 rm b
 hg update 0
 echo This is file b2 > b
 hg add b
 hg commit -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 rm b
 hg update 0
 echo This is file b2 > b
 hg commit -A -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 rm b
 hg remove b
 hg update 0
 echo This is file b2 > b
 hg commit -A -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t

tests/test-merge3

@@ -1,10 +1,10 b''
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 touch b
 hg add b
 rm b
 hg commit -A -m"comment #1" -d "0 0"

tests/test-merge4

@@ -1,17 +1,17 b''
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "0 0"
 hg update 0
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #2" -d "0 0"
 hg update -m 1
 rm b
 echo This is file c22 > c
 hg commit -m "commit #3" -d "0 0"

tests/test-merge5

@@ -1,21 +1,21 b''
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 echo This is file b1 > b
 hg add a b
 hg commit -m "commit #0" -d "0 0"
 echo This is file b22 > b
 hg commit -m"comment #1" -d "0 0"
 hg update 0
 rm b
 hg commit -A -m"comment #2" -d "0 0"
 # in theory, we shouldn't need the "yes k" below, but it prevents
 # this test from hanging when "hg update" erroneously prompts the
 # user for "keep or delete"
 yes k | hg update 1
 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing
 # us to fail this test
 exit 0

tests/test-merge6

@@ -1,46 +1,46 b''
-#!/bin/sh -x
+#!/bin/sh
 
 cat <<'EOF' > merge
 #!/bin/sh
 echo merging for `basename $1`
 EOF
 chmod +x merge
-export HGMERGE=./merge
+HGMERGE=./merge; export HGMERGE
 
 mkdir A1
 cd A1
 hg init
 echo This is file foo1 > foo
 echo This is file bar1 > bar
 hg add foo bar
 hg commit -m "commit text" -d "0 0"
 
 cd ..
 hg clone A1 B1
 
 cd A1
 rm bar
 hg remove bar
 hg commit -m "commit test" -d "0 0"
 
 cd ../B1
 echo This is file foo22 > foo
 hg commit -m "commit test" -d "0 0"
 
 cd ..
 hg clone A1 A2
 hg clone B1 B2
 
 cd A1
 hg pull ../B1
 hg update -m
 hg commit -m "commit test" -d "0 0"
 echo bar should remain deleted.
 hg manifest
 
 cd ../B2
 hg pull ../A2
 hg update -m
 hg commit -m "commit test" -d "0 0"
 echo bar should remain deleted.
 hg manifest

tests/test-rawcommit1

@@ -1,33 +1,33 b''
-#!/bin/sh -x
+#!/bin/sh
 hg --debug init
 echo this is a1 > a
 hg add a
 hg commit -m0 -d "0 0" 
 echo this is b1 > b
 hg add b
 hg commit -m1 -d "0 0" 
 hg manifest 1
 echo this is c1 > c
 hg rawcommit -p 1 -d "0 0" -m2 c
 hg manifest 2
 hg parents
 rm b
 hg rawcommit -p 2 -d "0 0" -m3 b
 hg manifest 3
 hg parents
 echo this is a22 > a
 hg rawcommit -p 3 -d "0 0" -m4 a
 hg manifest 4
 hg parents
 echo this is c22 > c
 hg rawcommit -p 1 -d "0 0" -m5 c
 hg manifest 5
 hg parents
 # merge, but no files changed
 hg rawcommit -p 4 -p 5 -d "0 0" -m6
 hg manifest 6
 hg parents
 # no changes what-so-ever
 hg rawcommit -p 6 -d "0 0" -m7
 hg manifest 7
 hg parents

tests/test-simple-update

@@ -1,24 +1,24 b''
 #!/bin/sh
 
-set -ex
+set -e
 
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -m "1"
 hg verify
 
 hg clone . ../branch
 cd ../branch
 hg co
 echo bar>>foo
 hg commit -m "2"
 
 cd ../test
 hg pull ../branch
 hg verify
 hg co
 cat foo
 hg manifest

tests/test-tag

@@ -1,13 +1,13 b''
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo a > a
 hg add a
 hg commit -m "test" -d "0 0"
 hg history
 hg tag -d "0 0" "bleah" 
 hg history
 
 echo foo >> .hgtags
 hg tag -d "0 0" "bleah2" || echo "failed" 
 

tests/test-tags

@@ -1,34 +1,33 b''
 #!/bin/sh
 
-set -x
 mkdir t
 cd t
 hg init
 hg id
 echo a > a
 hg add a
 hg commit -m "test" -d "0 0"
 hg co
 hg identify
 T=`hg -q tip | cut -d : -f 2`
 echo "$T first" > .hgtags
 cat .hgtags
 hg add .hgtags
 hg commit -m "add tags" -d "0 0"
 hg tags
 hg identify
 echo bb > a
 hg status
 hg identify
 hg co first
 hg id
 hg -v id
 hg status
 echo 1 > b
 hg add b
 hg commit -m "branch" -d "0 0"
 hg id
 hg co -m 1
 hg id
 hg status
 

tests/test-undo

@@ -1,16 +1,15 b''
 #!/bin/sh
 
-set -x
 mkdir t
 cd t
 hg init
 echo a > a
 hg add a
 hg commit -m "test" -d "0 0"
 hg verify
 hg parents
 hg status
 hg undo
 hg verify
 hg parents
 hg status

tests/test-up-local-change

@@ -1,33 +1,33 b''
 #!/bin/sh
 
-set -ex
+set -e
 mkdir r1
 cd r1
 hg init
 echo a > a
 hg addremove
 hg commit -m "1" -d "0 0"
 
 hg clone . ../r2
 cd ../r2
 hg up
 echo abc > a
 hg diff > ../d
-sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
+sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
 
 cd ../r1
 echo b > b
 echo a2 > a
 hg addremove
 hg commit -m "2" -d "0 0"
 
 cd ../r2
 hg -q pull ../r1
 hg status
 hg --debug up
 hg --debug up -m
 hg parents
 hg -v history
 hg diff > ../d
-sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
+sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d