# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1270819012 -7200
# Node ID 4775fc1e04a8c083a83d54336f8485b357cb4894
# Parent  29030b7f664a200869b556f2e8cdd869394e29c2# Parent  c63a6ddbbf9a5672aab09095af954f935abdb75b
merge with stable

diff -r 29030b7f664a -r 4775fc1e04a8 tests/test-hgwebdir
--- a/tests/test-hgwebdir	Fri Apr 09 15:16:31 2010 +0200
+++ b/tests/test-hgwebdir	Fri Apr 09 15:16:52 2010 +0200
@@ -53,11 +53,11 @@
 
 echo % atom-log without basedir
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/atom-log' \
-    | grep '<link' | sed 's|//[.a-zA-Z0-9\-_]*:[0-9][0-9]*/|//example.com:8080/|'
+    | grep '<link' | sed 's|//[.a-zA-Z0-9_-]*:[0-9][0-9]*/|//example.com:8080/|'
 
 echo % rss-log without basedir
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/rss-log' \
-    | grep '<guid' | sed 's|//[.a-zA-Z0-9\-_]*:[0-9][0-9]*/|//example.com:8080/|'
+    | grep '<guid' | sed 's|//[.a-zA-Z0-9_-]*:[0-9][0-9]*/|//example.com:8080/|'
 
 cat > paths.conf <<EOF
 [paths]
@@ -128,11 +128,11 @@
 
 echo % atom-log with basedir /
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/atom-log' \
-    | grep '<link' | sed 's|//[.a-zA-Z0-9\-_]*:[0-9][0-9]*/|//example.com:8080/|'
+    | grep '<link' | sed 's|//[.a-zA-Z0-9_-]*:[0-9][0-9]*/|//example.com:8080/|'
 
 echo % rss-log with basedir /
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/rss-log' \
-    | grep '<guid' | sed 's|//[.a-zA-Z0-9\-_]*:[0-9][0-9]*/|//example.com:8080/|'
+    | grep '<guid' | sed 's|//[.a-zA-Z0-9_-]*:[0-9][0-9]*/|//example.com:8080/|'
 
 "$TESTDIR/killdaemons.py"
 
@@ -143,11 +143,11 @@
 
 echo % atom-log with basedir /foo/
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/atom-log' \
-    | grep '<link' | sed 's|//[.a-zA-Z0-9\-_]*:[0-9][0-9]*/|//example.com:8080/|'
+    | grep '<link' | sed 's|//[.a-zA-Z0-9_-]*:[0-9][0-9]*/|//example.com:8080/|'
 
 echo % rss-log with basedir /foo/
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/rss-log' \
-    | grep '<guid' | sed 's|//[.a-zA-Z0-9\-_]*:[0-9][0-9]*/|//example.com:8080/|'
+    | grep '<guid' | sed 's|//[.a-zA-Z0-9_-]*:[0-9][0-9]*/|//example.com:8080/|'
 
 echo % paths errors 1
 cat error-paths-1.log