Mercurial > hg-stable

changeset 6177:673d8a6bc709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed "manifest" to "files" in web templates. manifest.tmpl is still used, so people having their own templates don't have to change them. "cmd=manifest" still works, new style URLs are not affected, because they already used "/file/".
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 26 Feb 2008 22:42:37 +0100
parents 99c25f4e00c7
children 81afdd016867
files templates/changelog.tmpl templates/changeset.tmpl templates/fileannotate.tmpl templates/filerevision.tmpl templates/gitweb/changelog.tmpl templates/gitweb/changeset.tmpl templates/gitweb/error.tmpl templates/gitweb/fileannotate.tmpl templates/gitweb/filediff.tmpl templates/gitweb/filerevision.tmpl templates/gitweb/manifest.tmpl templates/gitweb/map templates/gitweb/search.tmpl templates/gitweb/shortlog.tmpl templates/gitweb/summary.tmpl templates/gitweb/tags.tmpl templates/manifest.tmpl templates/map templates/raw/manifest.tmpl templates/raw/map templates/search.tmpl templates/shortlog.tmpl templates/tags.tmpl tests/test-hgweb-commands.out
diffstat 24 files changed, 36 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/templates/changelog.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/changelog.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -10,7 +10,7 @@
 <div class="buttons">
 <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>
 <a href="#url#tags{sessionvars%urlparameter}">tags</a>
-<a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a>
+<a href="#url#file/#node|short#{sessionvars%urlparameter}">files</a>
 #archives%archiveentry#
 <a type="application/rss+xml" href="#url#rss-log">rss</a>
 <a type="application/atom+xml" href="#url#atom-log" title="Atom feed for #repo|escape#">atom</a>
--- a/templates/changeset.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/changeset.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -7,7 +7,7 @@
 <a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>
 <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>
 <a href="#url#tags{sessionvars%urlparameter}">tags</a>
-<a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a>
+<a href="#url#file/#node|short#{sessionvars%urlparameter}">files</a>
 <a href="#url#raw-rev/#node|short#">raw</a>
 #archives%archiveentry#
 </div>
--- a/templates/fileannotate.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/fileannotate.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -8,7 +8,7 @@
 <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>
 <a href="#url#tags{sessionvars%urlparameter}">tags</a>
 <a href="#url#rev/#node|short#{sessionvars%urlparameter}">changeset</a>
-<a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a>
+<a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">files</a>
 <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a>
 <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a>
 <a href="#url#raw-annotate/#node|short#/#file|urlescape#">raw</a>
--- a/templates/filerevision.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/filerevision.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -8,7 +8,7 @@
 <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>
 <a href="#url#tags{sessionvars%urlparameter}">tags</a>
 <a href="#url#rev/#node|short#{sessionvars%urlparameter}">changeset</a>
-<a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a>
+<a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">files</a>
 <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a>
 <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a>
 <a href="#url#raw-file/#node|short#/#file|urlescape#">raw</a>
--- a/templates/gitweb/changelog.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/changelog.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -19,7 +19,7 @@
 </form>
 
 <div class="page_nav">
-<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> | changelog | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a>#archives%archiveentry#
+<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> | changelog | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>#archives%archiveentry#
 <br/>
 #changenav%naventry#<br/>
 </div>
--- a/templates/gitweb/changeset.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/changeset.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -12,7 +12,7 @@
 </div>
 
 <div class="page_nav">
-<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log/#rev#{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a> | changeset | <a href="{url}raw-rev/#node|short#">raw</a> #archives%archiveentry#<br/>
+<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log/#rev#{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a> | changeset | <a href="{url}raw-rev/#node|short#">raw</a> #archives%archiveentry#<br/>
 </div>
 
 <div>
--- a/templates/gitweb/error.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/error.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -12,7 +12,7 @@
 </div>
 
 <div class="page_nav">
-<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a><br/>
+<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a><br/>
 </div>
 
 <div class="page_body">
--- a/templates/gitweb/fileannotate.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/fileannotate.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -16,7 +16,7 @@
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-<a href="{url}file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a> |
+<a href="{url}file/#node|short##path|urlescape#{sessionvars%urlparameter}">files</a> |
 <a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> |
 <a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">file</a> |
 <a href="{url}log/{node|short}/#file|urlescape#{sessionvars%urlparameter}">revisions</a> |
--- a/templates/gitweb/filediff.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/filediff.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -16,7 +16,7 @@
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-<a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">manifest</a> |
+<a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
--- a/templates/gitweb/filerevision.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/filerevision.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -16,7 +16,7 @@
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-<a href="{url}file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a> |
+<a href="{url}file/#node|short##path|urlescape#{sessionvars%urlparameter}">files</a> |
 <a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> |
 file |
 <a href="{url}log/{node|short}/#file|urlescape#{sessionvars%urlparameter}">revisions</a> |
--- a/templates/gitweb/manifest.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/manifest.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -1,5 +1,5 @@
 #header#
-<title>#repo|escape#: Manifest</title>
+<title>#repo|escape#: files</title>
 <link rel="alternate" type="application/atom+xml"
    href="{url}atom-log" title="Atom feed for #repo|escape#"/>
 <link rel="alternate" type="application/rss+xml"
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / manifest
+<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / files
 </div>
 
 <div class="page_nav">
@@ -16,7 +16,7 @@
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-manifest |
+files |
 <a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> #archives%archiveentry#<br/>
 </div>
 
@@ -29,8 +29,8 @@
 <td><a href="{url}file/#node|short##up|urlescape#{sessionvars%urlparameter}">[up]</a></td>
 <td class="link">&nbsp;</td>
 </tr>
-#dentries%manifestdirentry#
-#fentries%manifestfileentry#
+#dentries%direntry#
+#fentries%fileentry#
 </table>
 
 #footer#
--- a/templates/gitweb/map	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/map	Tue Feb 26 22:42:37 2008 +0100
@@ -17,8 +17,8 @@
 searchentry = changelogentry.tmpl
 changeset = changeset.tmpl
 manifest = manifest.tmpl
-manifestdirentry = '<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td style="font-family:monospace"></td><td style="font-family:monospace"></td><td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#</a></td><td class="link"><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a></td></tr>'
-manifestfileentry = '<tr class="parity#parity#"><td style="font-family:monospace">#permissions|permissions#</td><td style="font-family:monospace" align=right>#date|isodate#</td><td style="font-family:monospace" align=right>#size#</td><td class="list"><a class="list" href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a></td><td class="link"><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a> | <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a></td></tr>'
+direntry = '<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td style="font-family:monospace"></td><td style="font-family:monospace"></td><td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#</a></td><td class="link"><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">files</a></td></tr>'
+fileentry = '<tr class="parity#parity#"><td style="font-family:monospace">#permissions|permissions#</td><td style="font-family:monospace" align=right>#date|isodate#</td><td style="font-family:monospace" align=right>#size#</td><td class="list"><a class="list" href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a></td><td class="link"><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a> | <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a></td></tr>'
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
@@ -40,8 +40,8 @@
 filerevchild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 fileannotatechild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 tags = tags.tmpl
-tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>#tag|escape#</b></a></td><td class="link"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}log/#node|short#{sessionvars%urlparameter}">changelog</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>'
-branchentry = '<tr class="parity{parity}"><td class="age"><i>{date|age} ago</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td><td>{branch|escape}</td><td class="link"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">manifest</a></td></tr>'
+tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>#tag|escape#</b></a></td><td class="link"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}log/#node|short#{sessionvars%urlparameter}">changelog</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a></td></tr>'
+branchentry = '<tr class="parity{parity}"><td class="age"><i>{date|age} ago</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td><td>{branch|escape}</td><td class="link"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td></tr>'
 diffblock = '<pre>#lines#</pre>'
 filediffparent = '<tr><td>parent {rev}</td><td style="font-family:monospace"><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogparent = '<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
@@ -50,7 +50,7 @@
 shortlog = shortlog.tmpl
 tagtag = '<span class="tagtag" title="{name}">{name}</span> '
 branchtag = '<span class="branchtag" title="{name}">{name}</span> '
-shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author|person#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b> <span class="logtags">{branches%branchtag}{tags%tagtag}</span></a></td><td class="link" nowrap><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>'
+shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author|person#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b> <span class="logtags">{branches%branchtag}{tags%tagtag}</span></a></td><td class="link" nowrap><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a></td></tr>'
 filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a>&nbsp;|&nbsp;<a href="{url}diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a>&nbsp;|&nbsp;<a href="{url}annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> #rename%filelogrename#</td></tr>'
 archiveentry = ' | <a href="{url}archive/{node|short}{extension}">#type|escape#</a> '
 indexentry = '<tr class="parity#parity#"><td><a class="list" href="#url#{sessionvars%urlparameter}"><b>#name|escape#</b></a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks">#archives%archiveentry#</td><td><a class="rss_logo" href="#url#rss-log">RSS</a> <a class="rss_logo" href="#url#atom-log">Atom</a></td></tr>'
--- a/templates/gitweb/search.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/search.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -23,7 +23,7 @@
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-<a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a>#archives%archiveentry#
+<a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>#archives%archiveentry#
 <br/>
 </div>
 
--- a/templates/gitweb/shortlog.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/shortlog.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -22,7 +22,7 @@
 shortlog |
 <a href="{url}log/#rev#{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-<a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a>#archives%archiveentry#
+<a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>#archives%archiveentry#
 <br/>
 #changenav%navshortentry#<br/>
 </div>
--- a/templates/gitweb/summary.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/summary.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -23,7 +23,7 @@
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-<a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a>#archives%archiveentry#
+<a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>#archives%archiveentry#
 <br/>
 </div>
 
--- a/templates/gitweb/tags.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/gitweb/tags.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -16,7 +16,7 @@
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 tags |
-<a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a>
+<a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>
 <br/>
 </div>
 
--- a/templates/manifest.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/manifest.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -1,5 +1,5 @@
 #header#
-<title>#repo|escape#: manifest for changeset #node|short#</title>
+<title>#repo|escape#: files for changeset #node|short#</title>
 </head>
 <body>
 
@@ -11,7 +11,7 @@
 #archives%archiveentry#
 </div>
 
-<h2>manifest for changeset #node|short#: #path|escape#</h2>
+<h2>files for changeset #node|short#: #path|escape#</h2>
 
 <table cellpadding="0" cellspacing="0">
 <tr class="parity#upparity#">
@@ -20,7 +20,7 @@
   <td>&nbsp;
   <td><a href="#url#file/#node|short##up|urlescape#{sessionvars%urlparameter}">[up]</a>
 </tr>
-#dentries%manifestdirentry#
-#fentries%manifestfileentry#
+#dentries%direntry#
+#fentries%fileentry#
 </table>
 #footer#
--- a/templates/map	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/map	Tue Feb 26 22:42:37 2008 +0100
@@ -16,8 +16,8 @@
 searchentry = changelogentry.tmpl
 changeset = changeset.tmpl
 manifest = manifest.tmpl
-manifestdirentry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td>&nbsp;<td>&nbsp;<td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#/</a>'
-manifestfileentry = '<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td align=right><tt class="date">#date|isodate#</tt>&nbsp;<td align=right><tt>#size#</tt>&nbsp;<td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a>'
+direntry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td>&nbsp;<td>&nbsp;<td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#/</a>'
+fileentry = '<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td align=right><tt class="date">#date|isodate#</tt>&nbsp;<td align=right><tt>#size#</tt>&nbsp;<td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a>'
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
--- a/templates/raw/manifest.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/raw/manifest.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -1,3 +1,3 @@
 {header}
-{dentries%manifestdirentry}{fentries%manifestfileentry}
+{dentries%direntry}{fentries%fileentry}
 {footer}
--- a/templates/raw/map	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/raw/map	Tue Feb 26 22:42:37 2008 +0100
@@ -15,8 +15,8 @@
 fileannotate = fileannotate.tmpl
 annotateline = '#author#@#rev#: #line#'
 manifest = manifest.tmpl
-manifestdirentry = 'drwxr-xr-x {basename}\n'
-manifestfileentry = '{permissions|permissions} {size} {basename}\n'
+direntry = 'drwxr-xr-x {basename}\n'
+fileentry = '{permissions|permissions} {size} {basename}\n'
 index = index.tmpl
 notfound = notfound.tmpl
 error = error.tmpl
--- a/templates/search.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/search.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -7,7 +7,7 @@
 <a href="#url#log{sessionvars%urlparameter}">changelog</a>
 <a href="#url#shortlog{sessionvars%urlparameter}">shortlog</a>
 <a href="#url#tags{sessionvars%urlparameter}">tags</a>
-<a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a>
+<a href="#url#file/#node|short#{sessionvars%urlparameter}">files</a>
 #archives%archiveentry#
 </div>
 
--- a/templates/shortlog.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/shortlog.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -10,7 +10,7 @@
 <div class="buttons">
 <a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>
 <a href="#url#tags{sessionvars%urlparameter}">tags</a>
-<a href="#url#file/#node|short#/{sessionvars%urlparameter}">manifest</a>
+<a href="#url#file/#node|short#/{sessionvars%urlparameter}">files</a>
 #archives%archiveentry#
 <a type="application/rss+xml" href="#url#rss-log">rss</a>
 <a type="application/rss+xml" href="#url#atom-log" title="Atom feed for #repo|escape#">atom</a>
--- a/templates/tags.tmpl	Tue Feb 26 22:21:34 2008 +0100
+++ b/templates/tags.tmpl	Tue Feb 26 22:42:37 2008 +0100
@@ -10,7 +10,7 @@
 <div class="buttons">
 <a href="#url#log{sessionvars%urlparameter}">changelog</a>
 <a href="#url#shortlog{sessionvars%urlparameter}">shortlog</a>
-<a href="#url#file/#node|short#/{sessionvars%urlparameter}">manifest</a>
+<a href="#url#file/#node|short#/{sessionvars%urlparameter}">files</a>
 <a type="application/rss+xml" href="#url#rss-tags">rss</a>
 <a type="application/atom+xml" href="#url#atom-tags">atom</a>
 </div>
Binary file tests/test-hgweb-commands.out has changed