test fixes for Solaris 2.6

Solaris 2.6's stock sed doesn't support alternatives in regular
expression. We workaround by breaking up the regexp.

tests/test-diffdir

@@ -1,12 +1,14 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/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"
+hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
+              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
-hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"
+hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
+                     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"

tests/test-merge-revert2

@@ -1,46 +1,47 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "added file1" > file1
 echo "another line of text" >> 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/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
+hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \
+              -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-up-local-change

@@ -1,33 +1,33 b''
 #!/bin/sh
 
 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/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
+hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
+              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 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/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
+hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
+              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"