upstream/mercurial-mirror Commit - r17290:7a9246ab

hgweb: make paper:error consistent with template...

Ross Lagerwall -

r17290:7a9246ab stable

parent child

mercurial/templates/paper/error.tmpl

0 +2 0

             {header}
             <title>{repo|escape}: error</title>
             </head>
             <body>
             <div class="container">
             <div class="menu">
             <div class="logo">
             <a href="{logourl}">
             <img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <ul>
             <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
             <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
+            </ul>
+            <ul>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
             </ul>
             </div>
             <div class="main">
             <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
             <h3>error</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             <div id="hint">find changesets by author, revision,
             files, or words in the commit message</div>
             </form>
             <div class="description">
             <p>
             An error occurred while processing your request:
             </p>
             <p>
             {error|escape}
             </p>
             </div>
             </div>
             </div>
             {footer}

tests/test-hgweb-filelog.t

0 +2 0

               $ "$TESTDIR/hghave" serve || exit 80
               $ hg init test
               $ cd test
               $ echo b > b
               $ hg ci -Am "b"
               adding b
               $ echo a > a
               $ hg ci -Am "first a"
               adding a
               $ hg rm a
               $ hg ci -m "del a"
               $ echo b > a
               $ hg ci -Am "second a"
               adding a
               $ hg rm a
               $ hg ci -m "del2 a"
               $ hg mv b c
               $ hg ci -m "mv b"
               $ echo c >> c
               $ hg ci -m "change c"
               $ hg log -p
               changeset:   6:b7682196df1c
               tag:         tip
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               summary:     change c
               diff -r 1a6696706df2 -r b7682196df1c c
               --- a/c	Thu Jan 01 00:00:00 1970 +0000
               +++ b/c	Thu Jan 01 00:00:00 1970 +0000
               @@ -1,1 +1,2 @@
                b
               +c
               changeset:   5:1a6696706df2
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               summary:     mv b
               diff -r 52e848cdcd88 -r 1a6696706df2 b
               --- a/b	Thu Jan 01 00:00:00 1970 +0000
               +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
               @@ -1,1 +0,0 @@
               -b
               diff -r 52e848cdcd88 -r 1a6696706df2 c
               --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
               +++ b/c	Thu Jan 01 00:00:00 1970 +0000
               @@ -0,0 +1,1 @@
               +b
               changeset:   4:52e848cdcd88
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               summary:     del2 a
               diff -r 01de2d66a28d -r 52e848cdcd88 a
               --- a/a	Thu Jan 01 00:00:00 1970 +0000
               +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
               @@ -1,1 +0,0 @@
               -b
               changeset:   3:01de2d66a28d
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               summary:     second a
               diff -r be3ebcc91739 -r 01de2d66a28d a
               --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
               +++ b/a	Thu Jan 01 00:00:00 1970 +0000
               @@ -0,0 +1,1 @@
               +b
               changeset:   2:be3ebcc91739
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               summary:     del a
               diff -r 5ed941583260 -r be3ebcc91739 a
               --- a/a	Thu Jan 01 00:00:00 1970 +0000
               +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
               @@ -1,1 +0,0 @@
               -a
               changeset:   1:5ed941583260
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               summary:     first a
               diff -r 6563da9dcf87 -r 5ed941583260 a
               --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
               +++ b/a	Thu Jan 01 00:00:00 1970 +0000
               @@ -0,0 +1,1 @@
               +a
               changeset:   0:6563da9dcf87
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               summary:     b
               diff -r 000000000000 -r 6563da9dcf87 b
               --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
               +++ b/b	Thu Jan 01 00:00:00 1970 +0000
               @@ -0,0 +1,1 @@
               +b
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
             tip - two revisions
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/tip/a')
 Script output follows
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: a history</title>
               <link rel="alternate" type="application/atom+xml"
                  href="/atom-log/tip/a" title="Atom feed for test:a" />
               <link rel="alternate" type="application/rss+xml"
                  href="/rss-log/tip/a" title="RSS feed for test:a" />
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog/01de2d66a28d">log</a></li>
               <li><a href="/graph/01de2d66a28d">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/rev/01de2d66a28d">changeset</a></li>
               <li><a href="/file/01de2d66a28d">browse</a></li>
               </ul>
               <ul>
               <li><a href="/file/01de2d66a28d/a">file</a></li>
               <li><a href="/diff/01de2d66a28d/a">diff</a></li>
               <li><a href="/comparison/01de2d66a28d/a">comparison</a></li>
               <li><a href="/annotate/01de2d66a28d/a">annotate</a></li>
               <li class="active">file log</li>
               <li><a href="/raw-file/01de2d66a28d/a">raw</a></li>
               </ul>
               <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>log a</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" /></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <div class="navigate">
               <a href="/log/01de2d66a28d/a?revcount=30">less</a>
               <a href="/log/01de2d66a28d/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
               <table class="bigtable">
                <tr>
                 <th class="age">age</th>
                 <th class="author">author</th>
                 <th class="description">description</th>
                </tr>
                <tr class="parity0">
                 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
                 <td class="author">test</td>
                 <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
                </tr>
                <tr class="parity1">
                 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
                 <td class="author">test</td>
                 <td class="description"><a href="/rev/5ed941583260">first a</a></td>
                </tr>
               </table>
               <div class="navigate">
               <a href="/log/01de2d66a28d/a?revcount=30">less</a>
               <a href="/log/01de2d66a28d/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
               </div>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
             second version - two revisions
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/3/a')
 Script output follows
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: a history</title>
               <link rel="alternate" type="application/atom+xml"
                  href="/atom-log/tip/a" title="Atom feed for test:a" />
               <link rel="alternate" type="application/rss+xml"
                  href="/rss-log/tip/a" title="RSS feed for test:a" />
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog/01de2d66a28d">log</a></li>
               <li><a href="/graph/01de2d66a28d">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/rev/01de2d66a28d">changeset</a></li>
               <li><a href="/file/01de2d66a28d">browse</a></li>
               </ul>
               <ul>
               <li><a href="/file/01de2d66a28d/a">file</a></li>
               <li><a href="/diff/01de2d66a28d/a">diff</a></li>
               <li><a href="/comparison/01de2d66a28d/a">comparison</a></li>
               <li><a href="/annotate/01de2d66a28d/a">annotate</a></li>
               <li class="active">file log</li>
               <li><a href="/raw-file/01de2d66a28d/a">raw</a></li>
               </ul>
               <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>log a</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" /></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <div class="navigate">
               <a href="/log/01de2d66a28d/a?revcount=30">less</a>
               <a href="/log/01de2d66a28d/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
               <table class="bigtable">
                <tr>
                 <th class="age">age</th>
                 <th class="author">author</th>
                 <th class="description">description</th>
                </tr>
                <tr class="parity0">
                 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
                 <td class="author">test</td>
                 <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
                </tr>
                <tr class="parity1">
                 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
                 <td class="author">test</td>
                 <td class="description"><a href="/rev/5ed941583260">first a</a></td>
                </tr>
               </table>
               <div class="navigate">
               <a href="/log/01de2d66a28d/a?revcount=30">less</a>
               <a href="/log/01de2d66a28d/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
               </div>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
             first deleted - one revision
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/2/a')
 Script output follows
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: a history</title>
               <link rel="alternate" type="application/atom+xml"
                  href="/atom-log/tip/a" title="Atom feed for test:a" />
               <link rel="alternate" type="application/rss+xml"
                  href="/rss-log/tip/a" title="RSS feed for test:a" />
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog/5ed941583260">log</a></li>
               <li><a href="/graph/5ed941583260">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/rev/5ed941583260">changeset</a></li>
               <li><a href="/file/5ed941583260">browse</a></li>
               </ul>
               <ul>
               <li><a href="/file/5ed941583260/a">file</a></li>
               <li><a href="/diff/5ed941583260/a">diff</a></li>
               <li><a href="/comparison/5ed941583260/a">comparison</a></li>
               <li><a href="/annotate/5ed941583260/a">annotate</a></li>
               <li class="active">file log</li>
               <li><a href="/raw-file/5ed941583260/a">raw</a></li>
               </ul>
               <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>log a</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" /></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <div class="navigate">
               <a href="/log/5ed941583260/a?revcount=30">less</a>
               <a href="/log/5ed941583260/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
               <table class="bigtable">
                <tr>
                 <th class="age">age</th>
                 <th class="author">author</th>
                 <th class="description">description</th>
                </tr>
                <tr class="parity0">
                 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
                 <td class="author">test</td>
                 <td class="description"><a href="/rev/5ed941583260">first a</a></td>
                </tr>
               </table>
               <div class="navigate">
               <a href="/log/5ed941583260/a?revcount=30">less</a>
               <a href="/log/5ed941583260/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
               </div>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
             first version - one revision
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/1/a')
 Script output follows
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: a history</title>
               <link rel="alternate" type="application/atom+xml"
                  href="/atom-log/tip/a" title="Atom feed for test:a" />
               <link rel="alternate" type="application/rss+xml"
                  href="/rss-log/tip/a" title="RSS feed for test:a" />
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog/5ed941583260">log</a></li>
               <li><a href="/graph/5ed941583260">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/rev/5ed941583260">changeset</a></li>
               <li><a href="/file/5ed941583260">browse</a></li>
               </ul>
               <ul>
               <li><a href="/file/5ed941583260/a">file</a></li>
               <li><a href="/diff/5ed941583260/a">diff</a></li>
               <li><a href="/comparison/5ed941583260/a">comparison</a></li>
               <li><a href="/annotate/5ed941583260/a">annotate</a></li>
               <li class="active">file log</li>
               <li><a href="/raw-file/5ed941583260/a">raw</a></li>
               </ul>
               <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>log a</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" /></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <div class="navigate">
               <a href="/log/5ed941583260/a?revcount=30">less</a>
               <a href="/log/5ed941583260/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
               <table class="bigtable">
                <tr>
                 <th class="age">age</th>
                 <th class="author">author</th>
                 <th class="description">description</th>
                </tr>
                <tr class="parity0">
                 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
                 <td class="author">test</td>
                 <td class="description"><a href="/rev/5ed941583260">first a</a></td>
                </tr>
               </table>
               <div class="navigate">
               <a href="/log/5ed941583260/a?revcount=30">less</a>
               <a href="/log/5ed941583260/a?revcount=120">more</a>
               | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
               </div>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
             before addition - error
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/0/a')
 Not Found
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: error</title>
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
+              </ul>
+              <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>error</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30"></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <div class="description">
               <p>
               An error occurred while processing your request:
               </p>
               <p>
               a@6563da9dcf87: not found in manifest
               </p>
               </div>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
               [1]
             should show base link, use spartan because it shows it
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/tip/c?style=spartan')
 Script output follows
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
               <html>
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png">
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: c history</title>
               <link rel="alternate" type="application/atom+xml"
                  href="/atom-log/tip/c" title="Atom feed for test:c">
               <link rel="alternate" type="application/rss+xml"
                  href="/rss-log/tip/c" title="RSS feed for test:c">
               </head>
               <body>
               <div class="buttons">
               <a href="/log?style=spartan">changelog</a>
               <a href="/shortlog?style=spartan">shortlog</a>
               <a href="/graph?style=spartan">graph</a>
               <a href="/tags?style=spartan">tags</a>
               <a href="/branches?style=spartan">branches</a>
               <a href="/file/b7682196df1c/c?style=spartan">file</a>
               <a href="/annotate/b7682196df1c/c?style=spartan">annotate</a>
               <a href="/help?style=spartan">help</a>
               <a type="application/rss+xml" href="/rss-log/tip/c">rss</a>
               <a type="application/atom+xml" href="/atom-log/tip/c" title="Atom feed for test:c">atom</a>
               </div>
               <h2>c revision history</h2>
               <p>navigate: <small class="navigate"><a href="/log/1a6696706df2/c?style=spartan">(0)</a> <a href="/log/tip/c?style=spartan">tip</a> </small></p>
               <table class="logEntry parity0">
                <tr>
                 <th><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>:</th>
                 <th class="firstline"><a href="/rev/b7682196df1c?style=spartan">change c</a></th>
                </tr>
                <tr>
                 <th class="revision">revision 1:</td>
                 <td class="node">
                  <a href="/file/b7682196df1c/c?style=spartan">b7682196df1c</a>
                  <a href="/diff/b7682196df1c/c?style=spartan">(diff)</a>
                  <a href="/annotate/b7682196df1c/c?style=spartan">(annotate)</a>
                 </td>
                </tr>
                <tr>
                 <th class="author">author:</th>
                 <td class="author">&#116;&#101;&#115;&#116;</td>
                </tr>
                <tr>
                 <th class="date">date:</th>
                 <td class="date">Thu, 01 Jan 1970 00:00:00 +0000</td>
                </tr>
               </table>
               <table class="logEntry parity1">
                <tr>
                 <th><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>:</th>
                 <th class="firstline"><a href="/rev/1a6696706df2?style=spartan">mv b</a></th>
                </tr>
                <tr>
                 <th class="revision">revision 0:</td>
                 <td class="node">
                  <a href="/file/1a6696706df2/c?style=spartan">1a6696706df2</a>
                  <a href="/diff/1a6696706df2/c?style=spartan">(diff)</a>
                  <a href="/annotate/1a6696706df2/c?style=spartan">(annotate)</a>
                 </td>
                </tr>
               <tr>
               <th>base:</th>
               <td>
               <a href="/file/1e88685f5dde/b?style=spartan">
               b@1e88685f5dde
               </a>
               </td>
               </tr>
                <tr>
                 <th class="author">author:</th>
                 <td class="author">&#116;&#101;&#115;&#116;</td>
                </tr>
                <tr>
                 <th class="date">date:</th>
                 <td class="date">Thu, 01 Jan 1970 00:00:00 +0000</td>
                </tr>
               </table>
               <script type="text/javascript">process_dates()</script>
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
               </div>
               </body>
               </html>
             rss log
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'rss-log/tip/a')
 Script output follows
               <?xml version="1.0" encoding="ascii"?>
               <rss version="2.0">
                 <channel>
                   <link>http://*:$HGPORT/</link> (glob)
                   <language>en-us</language>
                   <title>test: a history</title>
                   <description>a revision history</description>
                   <item>
                   <title>second a</title>
                   <link>http://*:$HGPORT/log01de2d66a28d/a</link> (glob)
                   <description><![CDATA[second a]]></description>
                   <author>&#116;&#101;&#115;&#116;</author>
                   <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
               </item>
               <item>
                   <title>first a</title>
                   <link>http://*:$HGPORT/log5ed941583260/a</link> (glob)
                   <description><![CDATA[first a]]></description>
                   <author>&#116;&#101;&#115;&#116;</author>
                   <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
               </item>
                 </channel>
               </rss>
             atom log
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'atom-log/tip/a')
 Script output follows
               <?xml version="1.0" encoding="ascii"?>
               <feed xmlns="http://www.w3.org/2005/Atom">
                <id>http://*:$HGPORT/atom-log/tip/a</id> (glob)
                <link rel="self" href="http://*:$HGPORT/atom-log/tip/a"/> (glob)
                <title>test: a history</title>
                <updated>1970-01-01T00:00:00+00:00</updated>
                <entry>
                 <title>second a</title>
                 <id>http://*:$HGPORT/#changeset-01de2d66a28df5549090991dccda788726948517</id> (glob)
                 <link href="http://*:$HGPORT/rev/01de2d66a28d"/> (glob)
                 <author>
                  <name>test</name>
                  <email>&#116;&#101;&#115;&#116;</email>
                 </author>
                 <updated>1970-01-01T00:00:00+00:00</updated>
                 <published>1970-01-01T00:00:00+00:00</published>
                 <content type="xhtml">
                  <div xmlns="http://www.w3.org/1999/xhtml">
                   <pre xml:space="preserve">second a</pre>
                  </div>
                 </content>
                </entry>
                <entry>
                 <title>first a</title>
                 <id>http://*:$HGPORT/#changeset-5ed941583260248620985524192fdc382ef57c36</id> (glob)
                 <link href="http://*:$HGPORT/rev/5ed941583260"/> (glob)
                 <author>
                  <name>test</name>
                  <email>&#116;&#101;&#115;&#116;</email>
                 </author>
                 <updated>1970-01-01T00:00:00+00:00</updated>
                 <published>1970-01-01T00:00:00+00:00</published>
                 <content type="xhtml">
                  <div xmlns="http://www.w3.org/1999/xhtml">
                   <pre xml:space="preserve">first a</pre>
                  </div>
                 </content>
                </entry>
               </feed>
             errors
               $ cat errors.log
               $ cd ..

tests/test-hgweb.t

0 +4 0

               $ "$TESTDIR/hghave" serve || exit 80
             Some tests for hgweb. Tests static files, plain files and different 404's.
               $ hg init test
               $ cd test
               $ mkdir da
               $ echo foo > da/foo
               $ echo foo > foo
               $ hg ci -Ambase
               adding da/foo
               adding foo
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
             manifest
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/?style=raw')
 Script output follows
               drwxr-xr-x da
               -rw-r--r-- 4 foo
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/da?style=raw')
 Script output follows
               -rw-r--r-- 4 foo
             plain file
               $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/foo?style=raw'
 Script output follows
               foo
             should give a 404 - static file that does not exist
               $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'static/bogus'
 Not Found
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: error</title>
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
+              </ul>
+              <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>error</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30"></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <div class="description">
               <p>
               An error occurred while processing your request:
               </p>
               <p>
               Not Found
               </p>
               </div>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
               [1]
             should give a 404 - bad revision
               $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/spam/foo?style=raw'
 Not Found
               error: revision not found: spam
               [1]
             should give a 400 - bad command
               $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/foo?cmd=spam&style=raw'
 * (glob)
               error: no such method: spam
               [1]
             should give a 404 - file does not exist
               $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/bork?style=raw'
 Not Found
               error: bork@2ef0ac749a14: not found in manifest
               [1]
               $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/bork'
 Not Found
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: error</title>
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
+              </ul>
+              <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>error</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30"></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <div class="description">
               <p>
               An error occurred while processing your request:
               </p>
               <p>
               bork@2ef0ac749a14: not found in manifest
               </p>
               </div>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
               [1]
               $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'diff/tip/bork?style=raw'
 Not Found
               error: bork@2ef0ac749a14: not found in manifest
               [1]
             try bad style
               $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/?style=foobar')
 Script output follows
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: 2ef0ac749a14 /</title>
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="http://mercurial.selenic.com/">
               <img src="/static/hglogo.png" alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog/2ef0ac749a14">log</a></li>
               <li><a href="/graph/2ef0ac749a14">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/rev/2ef0ac749a14">changeset</a></li>
               <li class="active">browse</li>
               </ul>
               <ul>
               </ul>
               <ul>
                <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2><a href="/">test</a></h2>
               <h3>directory / @ 0:2ef0ac749a14 <span class="tag">tip</span> </h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" /></p>
               <div id="hint">find changesets by author, revision,
               files, or words in the commit message</div>
               </form>
               <table class="bigtable">
               <tr>
                 <th class="name">name</th>
                 <th class="size">size</th>
                 <th class="permissions">permissions</th>
               </tr>
               <tr class="fileline parity0">
                 <td class="name"><a href="/file/2ef0ac749a14/">[up]</a></td>
                 <td class="size"></td>
                 <td class="permissions">drwxr-xr-x</td>
               </tr>
               <tr class="fileline parity1">
               <td class="name">
               <a href="/file/2ef0ac749a14/da">
               <img src="/static/coal-folder.png" alt="dir."/> da/
               </a>
               <a href="/file/2ef0ac749a14/da/">
               </a>
               </td>
               <td class="size"></td>
               <td class="permissions">drwxr-xr-x</td>
               </tr>
               <tr class="fileline parity0">
               <td class="filename">
               <a href="/file/2ef0ac749a14/foo">
               <img src="/static/coal-file.png" alt="file"/> foo
               </a>
               </td>
               <td class="size">4</td>
               <td class="permissions">-rw-r--r--</td>
               </tr>
               </table>
               </div>
               </div>
               <script type="text/javascript">process_dates()</script>
               </body>
               </html>
             stop and restart
               $ "$TESTDIR/killdaemons.py"
               $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log
               $ cat hg.pid >> $DAEMON_PIDS
             Test the access/error files are opened in append mode
               $ python -c "print len(file('access.log').readlines()), 'log lines written'"
 log lines written
             static file
               $ "$TESTDIR/get-with-headers.py" --twice localhost:$HGPORT 'static/style-gitweb.css'
 Script output follows
               body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
               a { color:#0000cc; }
               a:hover, a:visited, a:active { color:#880000; }
               div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
               div.page_header a:visited { color:#0000cc; }
               div.page_header a:hover { color:#880000; }
               div.page_nav { padding:8px; }
               div.page_nav a:visited { color:#0000cc; }
               div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
               div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
               div.page_footer_text { float:left; color:#555555; font-style:italic; }
               div.page_body { padding:8px; }
               div.title, a.title {
               	display:block; padding:6px 8px;
               	font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
               }
               a.title:hover { background-color: #d9d8d1; }
               div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
               div.log_body { padding:8px 8px 8px 150px; }
               .age { white-space:nowrap; }
               span.age { position:relative; float:left; width:142px; font-style:italic; }
               div.log_link {
               	padding:0px 8px;
               	font-size:10px; font-family:sans-serif; font-style:normal;
               	position:relative; float:left; width:136px;
               }
               div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
               a.list { text-decoration:none; color:#000000; }
               a.list:hover { text-decoration:underline; color:#880000; }
               table { padding:8px 4px; }
               th { padding:2px 5px; font-size:12px; text-align:left; }
               tr.light:hover, .parity0:hover { background-color:#edece6; }
               tr.dark, .parity1 { background-color:#f6f6f0; }
               tr.dark:hover, .parity1:hover { background-color:#edece6; }
               td { padding:2px 5px; font-size:12px; vertical-align:top; }
               td.closed { background-color: #99f; }
               td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
               td.indexlinks { white-space: nowrap; }
               td.indexlinks a {
                 padding: 2px 5px; line-height: 10px;
                 border: 1px solid;
                 color: #ffffff; background-color: #7777bb;
                 border-color: #aaaadd #333366 #333366 #aaaadd;
                 font-weight: bold;  text-align: center; text-decoration: none;
                 font-size: 10px;
               }
               td.indexlinks a:hover { background-color: #6666aa; }
               div.pre { font-family:monospace; font-size:12px; white-space:pre; }
               div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
               div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
               div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
               .linenr { color:#999999; text-decoration:none }
               div.rss_logo { float: right; white-space: nowrap; }
               div.rss_logo a {
               	padding:3px 6px; line-height:10px;
               	border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
               	color:#ffffff; background-color:#ff6600;
               	font-weight:bold; font-family:sans-serif; font-size:10px;
               	text-align:center; text-decoration:none;
               }
               div.rss_logo a:hover { background-color:#ee5500; }
               pre { margin: 0; }
               span.logtags span {
               	padding: 0px 4px;
               	font-size: 10px;
               	font-weight: normal;
               	border: 1px solid;
               	background-color: #ffaaff;
               	border-color: #ffccff #ff00ee #ff00ee #ffccff;
               }
               span.logtags span.tagtag {
               	background-color: #ffffaa;
               	border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
               }
               span.logtags span.branchtag {
               	background-color: #aaffaa;
               	border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
               }
               span.logtags span.inbranchtag {
               	background-color: #d5dde6;
               	border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
               }
               span.logtags span.bookmarktag {
               	background-color: #afdffa;
               	border-color: #ccecff #46ace6 #46ace6 #ccecff;
               }
               /* Graph */
               div#wrapper {
               	position: relative;
               	margin: 0;
               	padding: 0;
               	margin-top: 3px;
               }
               canvas {
               	position: absolute;
               	z-index: 5;
               	top: -0.9em;
               	margin: 0;
               }
               ul#nodebgs {
               	list-style: none inside none;
               	padding: 0;
               	margin: 0;
               	top: -0.7em;
               }
               ul#graphnodes li, ul#nodebgs li {
               	height: 39px;
               }
               ul#graphnodes {
               	position: absolute;
               	z-index: 10;
               	top: -0.8em;
               	list-style: none inside none;
               	padding: 0;
               }
               ul#graphnodes li .info {
               	display: block;
               	font-size: 100%;
               	position: relative;
               	top: -3px;
               	font-style: italic;
               }
               /* Comparison */
               .legend {
                   padding: 1.5% 0 1.5% 0;
               }
               .legendinfo {
                   border: 1px solid #d9d8d1;
                   font-size: 80%;
                   text-align: center;
                   padding: 0.5%;
               }
               .equal {
                   background-color: #ffffff;
               }
               .delete {
                   background-color: #faa;
                   color: #333;
               }
               .insert {
                   background-color: #ffa;
               }
               .replace {
                   background-color: #e8e8e8;
               }
               .comparison {
                   overflow-x: auto;
               }
               .header th {
                   text-align: center;
               }
               .block {
                   border-top: 1px solid #d9d8d1;
               }
 Not Modified
             errors
               $ cat errors.log
               $ cd ..

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages