tests: add more testing for webdir nesting

tests/test-hgwebdir

@@ -1,84 +1,91 b''
 #!/bin/sh
 # Tests some basic hgwebdir functionality. Tests setting up paths and
 # collection, different forms of 404s and the subdirectory support.
 
 mkdir webdir
 cd webdir
 
 hg init a
 echo a > a/a
 hg --cwd a ci -Ama -d'1 0'
 
 hg init b
 echo b > b/b
 hg --cwd b ci -Amb -d'2 0'
 
 hg init c
 echo c > c/c
 hg --cwd c ci -Amc -d'3 0'
+
+cd b
+hg init d
+echo d > d/d
+hg --cwd d ci -Amd
+cd ..
+
 root=`pwd`
-
 cd ..
 
 cat > paths.conf <<EOF
 [paths]
 a=$root/a
 b=$root/b
 EOF
 
 hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf paths.conf \
     -A access-paths.log -E error-paths-1.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % should give a 404 - file does not exist
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/file/tip/bork?style=raw'
 
 echo % should succeed
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/file/tip/a?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/b/file/tip/b?style=raw'
 
 echo % should give a 404 - repo is not published
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/c/file/tip/c?style=raw'
 
 cat > paths.conf <<EOF
 [paths]
 t/a/=$root/a
 b=$root/b
 EOF
 
 hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
     -A access-paths.log -E error-paths-2.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % should succeed, slashy names
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a?style=atom' \
 	| sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a/?style=atom' \
 	| sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a/file/tip/a?style=raw'
 
 cat > collections.conf <<EOF
 [collections]
 $root=$root
 EOF
 
 hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections.conf \
     -A access-collections.log -E error-collections.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % should succeed
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/file/tip/a?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/b/file/tip/b?style=raw'
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/c/file/tip/c?style=raw'
+"$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/b/d/rev/tip/?style=raw'
 
 echo % paths errors 1
 cat error-paths-1.log
 echo % paths errors 2
 cat error-paths-2.log
 echo % collections errors
 cat error-collections.log

tests/test-hgwebdir.out

@@ -1,124 +1,141 b''
 adding a
 adding b
 adding c
+adding d
 % should give a 404 - file does not exist
 404 Not Found
 
 
 error: bork@8580ff50825a: not found in manifest
 % should succeed
 200 Script output follows
 
 
 /a/
 /b/
 
 200 Script output follows
 
 a
 200 Script output follows
 
 b
 % should give a 404 - repo is not published
 404 Not Found
 
 
 error: repository c not found
 % should succeed, slashy names
 200 Script output follows
 
 
 /b/
 /t/a/
 
 200 Script output follows
 
 
 /t/a/
 
 200 Script output follows
 
 
 /t/a/
 
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://127.0.0.1/2005/Atom">
  <!-- Changelog -->
  <id>http://127.0.0.1/t/a/</id>
  <link rel="self" href="http://127.0.0.1/t/a/atom-log"/>
  <link rel="alternate" href="http://127.0.0.1/t/a/"/>
  <title>t/a Changelog</title>
  <updated>1970-01-01T00:00:01+00:00</updated>
 
  <entry>
   <title>a</title>
   <id>http://127.0.0.1/mercurial/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
   <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:01+00:00</updated>
   <published>1970-01-01T00:00:01+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">a</pre>
    </div>
   </content>
  </entry>
 
 </feed>
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://127.0.0.1/2005/Atom">
  <!-- Changelog -->
  <id>http://127.0.0.1/t/a/</id>
  <link rel="self" href="http://127.0.0.1/t/a/atom-log"/>
  <link rel="alternate" href="http://127.0.0.1/t/a/"/>
  <title>t/a Changelog</title>
  <updated>1970-01-01T00:00:01+00:00</updated>
 
  <entry>
   <title>a</title>
   <id>http://127.0.0.1/mercurial/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
   <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:01+00:00</updated>
   <published>1970-01-01T00:00:01+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">a</pre>
    </div>
   </content>
  </entry>
 
 </feed>
 200 Script output follows
 
 a
 % should succeed
 200 Script output follows
 
 
 /a/
 /b/
+/b/d/
 /c/
 
 200 Script output follows
 
 a
 200 Script output follows
 
 b
 200 Script output follows
 
 c
+200 Script output follows
+
+
+# HG changeset patch
+# User test
+# Date 0 0
+# Node ID 43cb50608b2ae8635a62e2e8730adefc32a274ee
+
+d
+
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/d	Thu Jan 01 00:00:00 1970 +0000
+@@ -0,0 +1,1 @@
++d
+
 % paths errors 1
 % paths errors 2
 % collections errors