--- a/templates/fileannotate.tmpl Sat Oct 14 16:03:23 2006 -0700
+++ b/templates/fileannotate.tmpl Sat Oct 14 16:07:52 2006 -0700
@@ -20,7 +20,6 @@
<tr>
<td class="metatag">changeset #rev#:</td>
<td><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
-#rename%filerename#
#parent%fileannotateparent#
#child%fileannotatechild#
<tr>
--- a/templates/filerevision.tmpl Sat Oct 14 16:03:23 2006 -0700
+++ b/templates/filerevision.tmpl Sat Oct 14 16:07:52 2006 -0700
@@ -20,7 +20,6 @@
<tr>
<td class="metatag">changeset #rev#:</td>
<td><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
-#rename%filerename#
#parent%filerevparent#
#child%filerevchild#
<tr>
--- a/templates/gitweb/fileannotate.tmpl Sat Oct 14 16:03:23 2006 -0700
+++ b/templates/gitweb/fileannotate.tmpl Sat Oct 14 16:07:52 2006 -0700
@@ -30,7 +30,6 @@
<tr>
<td class="metatag">changeset #rev#:</td>
<td><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
-#rename%filerename#
#parent%fileannotateparent#
#child%fileannotatechild#
<tr>
--- a/templates/gitweb/filerevision.tmpl Sat Oct 14 16:03:23 2006 -0700
+++ b/templates/gitweb/filerevision.tmpl Sat Oct 14 16:07:52 2006 -0700
@@ -29,7 +29,6 @@
<tr>
<td class="metatag">changeset #rev#:</td>
<td><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
-#rename%filerename#
#parent%filerevparent#
#child%filerevchild#
<tr>
--- a/templates/gitweb/map Sat Oct 14 16:03:23 2006 -0700
+++ b/templates/gitweb/map Sat Oct 14 16:07:52 2006 -0700
@@ -28,10 +28,10 @@
diffline = '<div>#line|escape#</div>'
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 = '<tr><td>parent</td><td style="font-family:monospace"><a class="list" href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filerevparent = '<tr><td class="metatag">parent:</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filerename = '<tr><td class="metatag">parent:</td><td><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#@#node|short#</a></td></tr>'
+filerevparent = '<tr><td class="metatag">parent:</td><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
+filerename = '{file|escape}@'
filelogrename = '| <a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">base</a>'
-fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#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>'
changelogchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
changesetchild = '<tr><td>child</td><td style="font-family:monospace"><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
filerevchild = '<tr><td class="metatag">child:</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
--- a/templates/map Sat Oct 14 16:03:23 2006 -0700
+++ b/templates/map Sat Oct 14 16:07:52 2006 -0700
@@ -29,10 +29,10 @@
diffline = '#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>'
changesetparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filerevparent = '<tr><td class="metatag">parent:</td><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filerename = '<tr><td class="metatag">parent:</td><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#@#node|short#</a></td></tr>'
+filerevparent = '<tr><td class="metatag">parent:</td><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
+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}">#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 = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
changelogchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
filerevchild = '<tr><td class="metatag">child:</td><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'