upstream/mercurial-mirror Commit - r1668:586b5029

[hgweb] Added rename information to gitweb templates & misc cleanups...

Josef "Jeff" Sipek -

r1668:586b5029 default

parent child

templates/fileannotate-gitweb.tmpl

0 +1 0

             #header#
             <title>#repo|escape#: Annotate</title>
             <link rel="alternate" type="application/rss+xml"
                href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#">
             </head>
             <body>
             <div class="page_header">
             <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / annotate
             </div>
             <div class="page_nav">
             <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | annotate<br/>
             </div>
             <div class="title">#file|escape#</div>
             <table>
             <tr>
              <td class="metatag">changeset #rev#:</td>
              <td><a href="?cs=#node|short#;style=gitweb">#node|short#</a></td></tr>
+            #rename%filerename#
             #parent%fileannotateparent#
             #child%fileannotatechild#
             <tr>
              <td class="metatag">manifest:</td>
              <td><a href="?mf=#manifest|short#;path=/;style=gitweb">#manifest|short#</a></td></tr>
             <tr>
              <td class="metatag">author:</td>
              <td>#author|obfuscate#</td></tr>
             <tr>
              <td class="metatag">date:</td>
              <td>#date|date# (#date|age# ago)</td></tr>
             <tr>
              <td class="metatag">permissions:</td>
              <td>#permissions|permissions#</td></tr>
             </table>
             <div class="page_body">
             <table>
             #annotate%annotateline#
             </table>
             </div>
             #footer#

templates/filelog-gitweb.tmpl

0 +2 -2

             #header#
-            <title>#repo|escape#: Manifest</title>
+            <title>#repo|escape#: File revisions</title>
             <link rel="alternate" type="application/rss+xml"
                href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#">
             </head>
             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / manifest
+            <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / file revisions
             </div>
             <div class="page_nav">
             <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | revisions | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?fl=#filenode|short#;file=#file|urlescape#;style=rss">rss</a><br/>
             </div>
             <table>
             #entries%filelogentry#
             </table>
             #footer#

templates/filerevision-gitweb.tmpl

0 +1 0

             #header#
             <title>#repo|escape#: File revision</title>
             <link rel="alternate" type="application/rss+xml"
                href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#">
             </head>
             <body>
             <div class="page_header">
             <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / file revision
             </div>
             <div class="page_nav">
             <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | file | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
             </div>
             <div class="title">#file|escape#</div>
             <table>
             <tr>
              <td class="metatag">changeset #rev#:</td>
              <td><a href="?cs=#node|short#;style=gitweb">#node|short#</a></td></tr>
+            #rename%filerename#
             #parent%fileannotateparent#
             #child%fileannotatechild#
             <tr>
              <td class="metatag">manifest:</td>
              <td><a href="?mf=#manifest|short#;path=/;style=gitweb">#manifest|short#</a></td></tr>
             <tr>
              <td class="metatag">author:</td>
              <td>#author|obfuscate#</td></tr>
             <tr>
              <td class="metatag">date:</td>
              <td>#date|date# (#date|age# ago)</td></tr>
             <tr>
              <td class="metatag">permissions:</td>
              <td>#permissions|permissions#</td></tr>
             </table>
             <div class="page_body">
             #text%fileline#
             </div>
             #footer#

templates/map-gitweb

0 +3 -2

             default = "summary"
             header = header-gitweb.tmpl
             footer = footer-gitweb.tmpl
             search = search-gitweb.tmpl
             changelog = changelog-gitweb.tmpl
             summary = summary-gitweb.tmpl
             error = error-gitweb.tmpl
             naventry = "<a href="?cmd=changelog;rev=#rev#;style=gitweb">#label|escape#</a> "
             navshortentry = "<a href="?cmd=shortlog;rev=#rev#;style=gitweb">#label|escape#</a> "
             filedifflink = "<a href="?cmd=filediff;node=#node#;file=#file|urlescape#;style=gitweb">#file|escape#</a> "
             filenodelink = "<tr class="light"><td><a class="list" href="">#file|escape#</a></td><td></td><td class="link"><a href="?cmd=file;filenode=#filenode#;file=#file|urlescape#;style=gitweb">file</a> | <!-- FIXME: <a href="?fd=#filenode|short#;file=#file|urlescape#;style=gitweb">diff</a> | --> <a href="?cmd=filelog;filenode=#filenode|short#;file=#file|urlescape#;style=gitweb">revisions</a></td></tr>"
             fileellipses = "..."
             changelogentry = changelogentry-gitweb.tmpl
             searchentry = changelogentry-gitweb.tmpl
             changeset = changeset-gitweb.tmpl
             manifest = manifest-gitweb.tmpl
             manifestdirentry = "<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td><a href="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">#basename|escape#/</a></td><td class="link"><a href="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">manifest</a></td></tr>"
             manifestfileentry = "<tr class="parity#parity#"><td style="font-family:monospace">#permissions|permissions#</td><td class="list"><a class="list" href="?f=#filenode|short#;file=#file|urlescape#;style=gitweb">#basename|escape#</a></td><td class="link"><a href="?f=#filenode|short#;file=#file|urlescape#;style=gitweb">file</a> | <a href="?fl=#filenode|short#;file=#file|urlescape#;style=gitweb">revisions</a> | <a href="?fa=#filenode|short#;file=#file|urlescape#;style=gitweb">annotate</a></td></tr>"
             filerevision = filerevision-gitweb.tmpl
             fileannotate = fileannotate-gitweb.tmpl
             filelog = filelog-gitweb.tmpl
             fileline = "<div style="font-family:monospace; white-space: pre;" class="parity#parity#"><span class="linenr">   #linenumber#</span> #line|escape#</div>"
-            filelogentry = filelogentry-gitweb.tmpl
             annotateline = "<tr style="font-family:monospace; white-space: pre;" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="?cs=#node|short#;style=gitweb">#author|obfuscate#@#rev#</a></td><td>#line|escape#</td></tr>"
             difflineplus = "<div class="pre" style="color:#008800;">#line|escape#</div>"
             difflineminus = "<div class="pre" style="color:#cc0000;">#line|escape#</div>"
             difflineat = "<div class="pre" style="color:#990099;">#line|escape#</div>"
             diffline = "<div class="pre">#line|escape#</div>"
             changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>"
             changesetparent = "<tr><td>parent</td><td style="font-family:monospace"><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb">#node|short#</a></td></tr>"
             filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>"
+            filerename = "<tr><td class="metatag">parent:</td><td><a href="?f=#node|short#;file=#file|urlescape#;style=gitweb">#file|escape#@#node|short#</a></td></tr>"
+            filelogrename = "| <a href="?f=#node|short#;file=#file|urlescape#;style=gitweb">base</a>"
             fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>"
             changelogchild = "<tr><th class="child">child #rev#:</th><td class="child"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>"
             changesetchild = "<tr><td>child</td><td style="font-family:monospace"><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb">#node|short#</a></td></tr>"
             filerevchild = "<tr><td class="metatag">child:</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>"
             fileannotatechild = "<tr><td class="metatag">child:</td><td><a href="?cmd=annotate;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>"
             tags = tags-gitweb.tmpl
             tagentry = "<tr class="parity#parity#"><td><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#tag|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=changelog;rev=#node|short#;style=gitweb">changelog</a> |  <a href="?mf=#tagmanifest|short#;path=/;style=gitweb">manifest</a></td></tr>"
             diffblock = "#lines#"
             changelogtag = "<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>"
             changesettag = "<tr><td>tag</td><td>#tag|escape#</td></tr>"
             filediffparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>"
             filelogparent = "<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>"
             filediffchild = "<tr><th class="child">child #rev#:</th><td class="child"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>"
             filelogchild = "<tr><td align="right">child #rev#:&nbsp;</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>"
             shortlog = shortlog-gitweb.tmpl
             shortlogentry = "<tr class="parity#parity#"><td><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|firstline|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> |  <a href="?cmd=manifest;manifest=#manifest|short#;path=/;style=gitweb">manifest</a></td></tr>"
-            filelogentry = "<tr class="parity#parity#"><td><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|firstline|escape#</b></a></td><td class="link"><!-- FIXME: <a href="?fd=#node|short#;file=#file|urlescape#;style=gitweb">diff</a> | --> <a href="?fa=#filenode|short#;file=#file|urlescape#;style=gitweb">annotate</a></td></tr>"
+            filelogentry = "<tr class="parity#parity#"><td><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|firstline|escape#</b></a></td><td class="link"><!-- FIXME: <a href="?fd=#node|short#;file=#file|urlescape#;style=gitweb">diff</a> | --> <a href="?fa=#filenode|short#;file=#file|urlescape#;style=gitweb">annotate</a> #rename%filelogrename#</td></tr>"
             archiveentry = " | <a href="?ca=#node|short#;type=#type|urlescape#">#type|escape#</a> "

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