--- a/templates/paper/map Wed May 13 13:30:28 2009 -0700
+++ b/templates/paper/map Wed May 13 22:40:49 2009 +0200
@@ -23,8 +23,30 @@
changeset = changeset.tmpl
manifest = manifest.tmpl
-direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png" alt="dir."/> {basename|escape}/</a> <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
-fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png" alt="file"/> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
+direntry = '
+ <tr class="fileline parity{parity}">
+ <td class="name">
+ <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">
+ <img src="{staticurl}coal-folder.png" alt="dir."/> {basename|escape}/
+ </a>
+ <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">
+ {emptydirs|escape}
+ </a>
+ </td>
+ <td class="size"></td>
+ <td class="permissions">drwxr-xr-x</td>
+ </tr>'
+
+fileentry = '
+ <tr class="fileline parity{parity}">
+ <td class="filename">
+ <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+ <img src="{staticurl}coal-file.png" alt="file"/> {basename|escape}
+ </a>
+ </td>
+ <td class="size">{size}</td>
+ <td class="permissions">{permissions|permissions}</td>
+ </tr>'
filerevision = filerevision.tmpl
fileannotate = fileannotate.tmpl
@@ -33,7 +55,14 @@
fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
filelogentry = filelogentry.tmpl
-annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td><td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</td></tr>'
+annotateline = '
+ <tr class="parity{parity}">
+ <td class="annotate">
+ <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}"
+ title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>
+ </td>
+ <td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</td>
+ </tr>'
diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
@@ -41,7 +70,11 @@
difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
-changelogparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
+changelogparent = '
+ <tr>
+ <th class="parent">parent {rev}:</th>
+ <td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
+ </tr>'
changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
@@ -49,27 +82,108 @@
filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
filerename = '{file|escape}@'
-filelogrename = '<tr><th>base:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}@{node|short}</a></td></tr>'
-fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
+filelogrename = '
+ <tr>
+ <th>base:</th>
+ <td>
+ <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+ {file|escape}@{node|short}
+ </a>
+ </td>
+ </tr>'
+fileannotateparent = '
+ <tr>
+ <td class="metatag">parent:</td>
+ <td>
+ <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+ {rename%filerename}{node|short}
+ </a>
+ </td>
+ </tr>'
changesetchild = ' <a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
-changelogchild = '<tr><th class="child">child</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
-fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
+changelogchild = '
+ <tr>
+ <th class="child">child</th>
+ <td class="child">
+ <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
+ {node|short}
+ </a>
+ </td>
+ </tr>'
+fileannotatechild = '
+ <tr>
+ <td class="metatag">child:</td>
+ <td>
+ <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+ {node|short}
+ </a>
+ </td>
+ </tr>'
tags = tags.tmpl
-tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>'
+tagentry = '
+ <tr class="tagEntry parity{parity}">
+ <td>
+ <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
+ {tag|escape}
+ </a>
+ </td>
+ <td class="node">
+ {node|short}
+ </td>
+ </tr>'
branches = branches.tmpl
-branchentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{branch|escape}</a></td><td class="node">{node|short}</td></tr>'
+branchentry = '
+ <tr class="tagEntry parity{parity}">
+ <td>
+ <a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">
+ {branch|escape}
+ </a>
+ </td>
+ <td class="node">
+ {node|short}
+ </td>
+ </tr>'
changelogtag = '<span class="tag">{name|escape}</span> '
changesettag = '<span class="tag">{tag|escape}</span> '
changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
changelogbranchname = '<span class="branchname">{name|escape}</span> '
-filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
-filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
-filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
-filelogchild = '<tr><th>child {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
-indexentry = '<tr class="parity{parity}"><td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td><td>{description}</td><td>{contact|obfuscate}</td><td class="age">{lastchange|age} ago</td><td class="indexlinks">{archives%indexarchiveentry}</td></tr>\n'
+
+filediffparent = '
+ <tr>
+ <th class="parent">parent {rev}:</th>
+ <td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
+ </tr>'
+filelogparent = '
+ <tr>
+ <th>parent {rev}:</th>
+ <td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
+ </tr>'
+filediffchild = '
+ <tr>
+ <th class="child">child {rev}:</th>
+ <td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
+ </td>
+ </tr>'
+filelogchild = '
+ <tr>
+ <th>child {rev}:</th>
+ <td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
+ </tr>'
+
+indexentry = '
+ <tr class="parity{parity}">
+ <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
+ <td>{description}</td>
+ <td>{contact|obfuscate}</td>
+ <td class="age">{lastchange|age} ago</td>
+ <td class="indexlinks">{archives%indexarchiveentry}</td>
+ </tr>\n'
indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}"> ↓{type|escape}</a>'
index = index.tmpl
-archiveentry = '<li><a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a></li>'
+archiveentry = '
+ <li>
+ <a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a>
+ </li>'
notfound = notfound.tmpl
error = error.tmpl
urlparameter = '{separator}{name}={value|urlescape}'
--- a/tests/test-hgweb-descend-empties.out Wed May 13 13:30:28 2009 -0700
+++ b/tests/test-hgweb-descend-empties.out Wed May 13 22:40:49 2009 +0200
@@ -61,7 +61,43 @@
<td class="size"></td>
<td class="permissions">drwxr-xr-x</td>
</tr>
-<tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/a1"><img src="/static/coal-folder.png" alt="dir."/> a1/</a> <a href="/file/9087c84a0f5d/a1/a2/a3/a4">a2/a3/a4</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity0"><td class="name"><a href="/file/9087c84a0f5d/b1"><img src="/static/coal-folder.png" alt="dir."/> b1/</a> <a href="/file/9087c84a0f5d/b1/b2">b2</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/d1"><img src="/static/coal-folder.png" alt="dir."/> d1/</a> <a href="/file/9087c84a0f5d/d1/d2">d2</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>
+
+<tr class="fileline parity1">
+<td class="name">
+<a href="/file/9087c84a0f5d/a1">
+<img src="/static/coal-folder.png" alt="dir."/> a1/
+</a>
+<a href="/file/9087c84a0f5d/a1/a2/a3/a4">
+a2/a3/a4
+</a>
+</td>
+<td class="size"></td>
+<td class="permissions">drwxr-xr-x</td>
+</tr>
+<tr class="fileline parity0">
+<td class="name">
+<a href="/file/9087c84a0f5d/b1">
+<img src="/static/coal-folder.png" alt="dir."/> b1/
+</a>
+<a href="/file/9087c84a0f5d/b1/b2">
+b2
+</a>
+</td>
+<td class="size"></td>
+<td class="permissions">drwxr-xr-x</td>
+</tr>
+<tr class="fileline parity1">
+<td class="name">
+<a href="/file/9087c84a0f5d/d1">
+<img src="/static/coal-folder.png" alt="dir."/> d1/
+</a>
+<a href="/file/9087c84a0f5d/d1/d2">
+d2
+</a>
+</td>
+<td class="size"></td>
+<td class="permissions">drwxr-xr-x</td>
+</tr>
</table>
</div>
--- a/tests/test-hgwebdir.out Wed May 13 13:30:28 2009 -0700
+++ b/tests/test-hgwebdir.out Wed May 13 22:40:49 2009 +0200
@@ -70,17 +70,94 @@
<th><a href="?sort=lastchange">Last change</a></th>
<th> </th>
</tr>
- <tr class="parity0"><td><a href="/b/?style=paper">b</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity1"><td><a href="/coll/a/?style=paper">coll/a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity0"><td><a href="/coll/a/.hg/patches/?style=paper">coll/a/.hg/patches</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity1"><td><a href="/coll/b/?style=paper">coll/b</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity0"><td><a href="/coll/c/?style=paper">coll/c</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity1"><td><a href="/rcoll/a/?style=paper">rcoll/a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity0"><td><a href="/rcoll/a/.hg/patches/?style=paper">rcoll/a/.hg/patches</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity1"><td><a href="/rcoll/b/?style=paper">rcoll/b</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity0"><td><a href="/rcoll/b/d/?style=paper">rcoll/b/d</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity1"><td><a href="/rcoll/c/?style=paper">rcoll/c</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
-<tr class="parity0"><td><a href="/t/a/?style=paper">t/a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
+
+<tr class="parity0">
+<td><a href="/b/?style=paper">b</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity1">
+<td><a href="/coll/a/?style=paper">coll/a</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity0">
+<td><a href="/coll/a/.hg/patches/?style=paper">coll/a/.hg/patches</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity1">
+<td><a href="/coll/b/?style=paper">coll/b</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity0">
+<td><a href="/coll/c/?style=paper">coll/c</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity1">
+<td><a href="/rcoll/a/?style=paper">rcoll/a</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity0">
+<td><a href="/rcoll/a/.hg/patches/?style=paper">rcoll/a/.hg/patches</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity1">
+<td><a href="/rcoll/b/?style=paper">rcoll/b</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity0">
+<td><a href="/rcoll/b/d/?style=paper">rcoll/b/d</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity1">
+<td><a href="/rcoll/c/?style=paper">rcoll/c</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
+
+<tr class="parity0">
+<td><a href="/t/a/?style=paper">t/a</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
</table>
</div>
@@ -129,7 +206,14 @@
<th><a href="?sort=lastchange">Last change</a></th>
<th> </th>
</tr>
- <tr class="parity0"><td><a href="/t/a/?style=paper">a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>
+
+<tr class="parity0">
+<td><a href="/t/a/?style=paper">a</a></td>
+<td>unknown</td>
+<td>Foo Bar <foo.bar@example.com></td>
+<td class="age">seconds ago</td>
+<td class="indexlinks"></td>
+</tr>
</table>
</div>