/util/hg_templates: ca601aae21da: Merge
datallah at rock.pidgin.im
datallah at rock.pidgin.im
Mon Jun 22 23:49:29 EDT 2015
Changeset: ca601aae21dad718f8cd8514db26780a3a82b437
Author: datallah
Date: 2015-06-22 23:47 -0400
Branch: default
URL: https://hg.pidgin.im/util/hg_templates/rev/ca601aae21da
Description:
Merge
diffstat:
atom/bookmarkentry.tmpl | 4 +-
atom/bookmarks.tmpl | 6 +-
atom/branchentry.tmpl | 8 +
atom/branches.tmpl | 11 +
atom/changelog.tmpl | 6 +-
atom/changelogentry.tmpl | 39 +-
atom/error.tmpl | 6 +-
atom/filelog.tmpl | 4 +-
atom/map | 6 +
atom/tagentry.tmpl | 4 +-
atom/tags.tmpl | 6 +-
coal/header.tmpl | 6 +-
coal/map | 83 ++-
gitweb/bookmarks.tmpl | 25 +-
gitweb/branches.tmpl | 25 +-
gitweb/changelog.tmpl | 27 +-
gitweb/changelogentry.tmpl | 6 +-
gitweb/changeset.tmpl | 35 +-
gitweb/error.tmpl | 25 +-
gitweb/fileannotate.tmpl | 44 +-
gitweb/filecomparison.tmpl | 73 +++
gitweb/filediff.tmpl | 43 +-
gitweb/filelog.tmpl | 34 +-
gitweb/filerevision.tmpl | 44 +-
gitweb/footer.tmpl | 4 +-
gitweb/graph.tmpl | 78 +-
gitweb/header.tmpl | 6 +-
gitweb/help.tmpl | 31 +-
gitweb/helptopics.tmpl | 25 +-
gitweb/index.tmpl | 2 +-
gitweb/manifest.tmpl | 29 +-
gitweb/map | 171 ++++--
gitweb/notfound.tmpl | 2 +-
gitweb/search.tmpl | 29 +-
gitweb/shortlog.tmpl | 44 +-
gitweb/summary.tmpl | 44 +-
gitweb/tags.tmpl | 25 +-
map-cmdline.phases | 25 +
monoblue/bookmarks.tmpl | 24 +-
monoblue/branches.tmpl | 24 +-
monoblue/changelog.tmpl | 24 +-
monoblue/changelogentry.tmpl | 4 +-
monoblue/changeset.tmpl | 32 +-
monoblue/error.tmpl | 24 +-
monoblue/fileannotate.tmpl | 39 +-
monoblue/filecomparison.tmpl | 72 +++
monoblue/filediff.tmpl | 37 +-
monoblue/filelog.tmpl | 35 +-
monoblue/filerevision.tmpl | 39 +-
monoblue/footer.tmpl | 6 +-
monoblue/graph.tmpl | 69 +-
monoblue/header.tmpl | 6 +-
monoblue/help.tmpl | 30 +-
monoblue/helptopics.tmpl | 24 +-
monoblue/index.tmpl | 4 +-
monoblue/manifest.tmpl | 28 +-
monoblue/map | 157 ++++--
monoblue/notfound.tmpl | 26 +-
monoblue/search.tmpl | 26 +-
monoblue/shortlog.tmpl | 41 +-
monoblue/summary.tmpl | 36 +-
monoblue/tags.tmpl | 24 +-
paper/bookmarks.tmpl | 31 +-
paper/branches.tmpl | 44 +-
paper/changeset.tmpl | 39 +-
paper/diffstat.tmpl | 2 +-
paper/error.tmpl | 23 +-
paper/fileannotate.tmpl | 43 +-
paper/filecomparison.tmpl | 91 ++++
paper/filediff.tmpl | 45 +-
paper/filelog.tmpl | 53 +-
paper/filelogentry.tmpl | 4 +-
paper/filerevision.tmpl | 41 +-
paper/graph.tmpl | 86 +--
paper/header.tmpl | 6 +-
paper/help.tmpl | 31 +-
paper/helptopics.tmpl | 23 +-
paper/index.tmpl | 7 +-
paper/manifest.tmpl | 29 +-
paper/map | 127 +++--
paper/notfound.tmpl | 2 +-
paper/search.tmpl | 41 +-
paper/shortlog.tmpl | 60 +-
paper/shortlogentry.tmpl | 4 +-
paper/tags.tmpl | 30 +-
raw/changelog.tmpl | 5 +
raw/graph.tmpl | 6 +
raw/graphedge.tmpl | 1 +
raw/graphnode.tmpl | 7 +
raw/logentry.tmpl | 6 +
raw/map | 12 +
raw/search.tmpl | 7 +
rss/bookmarkentry.tmpl | 2 +-
rss/branchentry.tmpl | 6 +
rss/branches.tmpl | 6 +
rss/changelogentry.tmpl | 39 +-
rss/filelogentry.tmpl | 4 +-
rss/header.tmpl | 2 +-
rss/map | 6 +
rss/tagentry.tmpl | 2 +-
spartan/branches.tmpl | 22 +-
spartan/changelog.tmpl | 26 +-
spartan/changelogentry.tmpl | 6 +-
spartan/changeset.tmpl | 22 +-
spartan/fileannotate.tmpl | 28 +-
spartan/filediff.tmpl | 26 +-
spartan/filelog.tmpl | 26 +-
spartan/filelogentry.tmpl | 10 +-
spartan/filerevision.tmpl | 28 +-
spartan/footer.tmpl | 2 +-
spartan/graph.tmpl | 52 +-
spartan/header.tmpl | 8 +-
spartan/index.tmpl | 2 +-
spartan/manifest.tmpl | 18 +-
spartan/map | 59 +-
spartan/notfound.tmpl | 2 +-
spartan/search.tmpl | 14 +-
spartan/shortlog.tmpl | 26 +-
spartan/shortlogentry.tmpl | 2 +-
spartan/tags.tmpl | 22 +-
static/excanvas.js | 943 ++++++++++++++++++++++++++++++++++++++++++-
static/feed-icon-14x14.png | Bin
static/mercurial.js | 322 +++++++++++--
static/style-coal.css | 78 +++-
static/style-gitweb.css | 67 +++-
static/style-monoblue.css | 79 +++-
static/style-paper.css | 139 ++++++-
static/style.css | 5 +-
template-vars.txt | 42 -
129 files changed, 3486 insertions(+), 1479 deletions(-)
diffs (truncated from 8305 to 300 lines):
diff --git a/atom/bookmarkentry.tmpl b/atom/bookmarkentry.tmpl
--- a/atom/bookmarkentry.tmpl
+++ b/atom/bookmarkentry.tmpl
@@ -1,7 +1,7 @@
<entry>
<title>{bookmark|escape}</title>
- <link rel="alternate" href="{urlbase}{url}rev/{node|short}"/>
- <id>{urlbase}{url}#bookmark-{node}</id>
+ <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>
+ <id>{urlbase}{url|urlescape}#bookmark-{node}</id>
<updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
<content type="text">{bookmark|strip|escape}</content>
diff --git a/atom/bookmarks.tmpl b/atom/bookmarks.tmpl
--- a/atom/bookmarks.tmpl
+++ b/atom/bookmarks.tmpl
@@ -1,7 +1,7 @@
{header}
- <id>{urlbase}{url}</id>
- <link rel="self" href="{urlbase}{url}atom-bookmarks"/>
- <link rel="alternate" href="{urlbase}{url}bookmarks"/>
+ <id>{urlbase}{url|urlescape}</id>
+ <link rel="self" href="{urlbase}{url|urlescape}atom-bookmarks"/>
+ <link rel="alternate" href="{urlbase}{url|urlescape}bookmarks"/>
<title>{repo|escape}: bookmarks</title>
<summary>{repo|escape} bookmark history</summary>
<author><name>Mercurial SCM</name></author>
diff --git a/atom/branchentry.tmpl b/atom/branchentry.tmpl
new file mode 100644
--- /dev/null
+++ b/atom/branchentry.tmpl
@@ -0,0 +1,8 @@
+ <entry>
+ <title>{branch|escape}</title>
+ <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>
+ <id>{urlbase}{url|urlescape}#branch-{node}</id>
+ <updated>{date|rfc3339date}</updated>
+ <published>{date|rfc3339date}</published>
+ <content type="text"><![CDATA[{branch|strip|escape|addbreaks}]]></content>
+ </entry>
diff --git a/atom/branches.tmpl b/atom/branches.tmpl
new file mode 100644
--- /dev/null
+++ b/atom/branches.tmpl
@@ -0,0 +1,11 @@
+{header}
+ <id>{urlbase}{url|urlescape}</id>
+ <link rel="self" href="{urlbase}{url|urlescape}atom-tags"/>
+ <link rel="alternate" href="{urlbase}{url|urlescape}tags"/>
+ <title>{repo|escape}: branches</title>
+ <summary>{repo|escape} branch history</summary>
+ <author><name>Mercurial SCM</name></author>
+ {latestentry%feedupdated}
+
+ {entries%branchentry}
+</feed>
diff --git a/atom/changelog.tmpl b/atom/changelog.tmpl
--- a/atom/changelog.tmpl
+++ b/atom/changelog.tmpl
@@ -1,8 +1,8 @@
{header}
<!-- Changelog -->
- <id>{urlbase}{url}</id>
- <link rel="self" href="{urlbase}{url}atom-log"/>
- <link rel="alternate" href="{urlbase}{url}"/>
+ <id>{urlbase}{url|urlescape}</id>
+ <link rel="self" href="{urlbase}{url|urlescape}atom-log"/>
+ <link rel="alternate" href="{urlbase}{url|urlescape}"/>
<title>{repo|escape} Changelog</title>
{latestentry%feedupdated}
diff --git a/atom/changelogentry.tmpl b/atom/changelogentry.tmpl
--- a/atom/changelogentry.tmpl
+++ b/atom/changelogentry.tmpl
@@ -1,7 +1,7 @@
<entry>
- <title>{desc|strip|firstline|strip|escape|nonempty}</title>
- <id>{urlbase}{url}#changeset-{node}</id>
- <link href="{urlbase}{url}rev/{node|short}"/>
+ <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty}</title>
+ <id>{urlbase}{url|urlescape}#changeset-{node}</id>
+ <link href="{urlbase}{url|urlescape}rev/{node|short}"/>
<author>
<name>{author|person|escape}</name>
<email>{author|email|obfuscate}</email>
@@ -9,8 +9,35 @@
<updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
<content type="xhtml">
- <div xmlns="http://www.w3.org/1999/xhtml">
- <pre xml:space="preserve">{desc|escape|nonempty}</pre>
- </div>
+ <table xmlns="http://www.w3.org/1999/xhtml">
+ <tr>
+ <th style="text-align:left;">changeset</th>
+ <td>{node|short}</td>
+ </tr>
+ <tr>
+ <th style="text-align:left;">branch</th>
+ <td>{inbranch%"{name|escape}"}{branches%"{name|escape}"}</td>
+ </tr>
+ <tr>
+ <th style="text-align:left;">bookmark</th>
+ <td>{bookmarks%"{name|escape}"}</td>
+ </tr>
+ <tr>
+ <th style="text-align:left;">tag</th>
+ <td>{tags%"{name|escape}"}</td>
+ </tr>
+ <tr>
+ <th style="text-align:left;">user</th>
+ <td>{author|obfuscate}</td>
+ </tr>
+ <tr>
+ <th style="text-align:left;vertical-align:top;">description</th>
+ <td>{desc|strip|escape|websub|addbreaks|nonempty}</td>
+ </tr>
+ <tr>
+ <th style="text-align:left;vertical-align:top;">files</th>
+ <td>{files}</td>
+ </tr>
+ </table>
</content>
</entry>
diff --git a/atom/error.tmpl b/atom/error.tmpl
--- a/atom/error.tmpl
+++ b/atom/error.tmpl
@@ -1,8 +1,8 @@
{header}
<!-- Error -->
- <id>{urlbase}{url}</id>
- <link rel="self" href="{urlbase}{url}atom-log"/>
- <link rel="alternate" href="{urlbase}{url}"/>
+ <id>{urlbase}{url|urlescape}</id>
+ <link rel="self" href="{urlbase}{url|urlescape}atom-log"/>
+ <link rel="alternate" href="{urlbase}{url|urlescape}"/>
<title>Error</title>
<updated>1970-01-01T00:00:00+00:00</updated>
<entry>
diff --git a/atom/filelog.tmpl b/atom/filelog.tmpl
--- a/atom/filelog.tmpl
+++ b/atom/filelog.tmpl
@@ -1,6 +1,6 @@
{header}
- <id>{urlbase}{url}atom-log/tip/{file|escape}</id>
- <link rel="self" href="{urlbase}{url}atom-log/tip/{file|urlescape}"/>
+ <id>{urlbase}{url|urlescape}atom-log/tip/{file|escape}</id>
+ <link rel="self" href="{urlbase}{url|urlescape}atom-log/tip/{file|urlescape}"/>
<title>{repo|escape}: {file|escape} history</title>
{latestentry%feedupdated}
diff --git a/atom/map b/atom/map
--- a/atom/map
+++ b/atom/map
@@ -10,4 +10,10 @@ tags = tags.tmpl
tagentry = tagentry.tmpl
bookmarks = bookmarks.tmpl
bookmarkentry = bookmarkentry.tmpl
+branches = branches.tmpl
+branchentry = branchentry.tmpl
error = error.tmpl
+filedifflink = '{file|escape}<br />'
+fileellipses = '{file|escape}<br />'
+filenodelink = '{file|escape}<br />'
+filenolink = '{file|escape}<br />'
diff --git a/atom/tagentry.tmpl b/atom/tagentry.tmpl
--- a/atom/tagentry.tmpl
+++ b/atom/tagentry.tmpl
@@ -1,7 +1,7 @@
<entry>
<title>{tag|escape}</title>
- <link rel="alternate" href="{urlbase}{url}rev/{node|short}"/>
- <id>{urlbase}{url}#tag-{node}</id>
+ <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>
+ <id>{urlbase}{url|urlescape}#tag-{node}</id>
<updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
<content type="text">{tag|strip|escape}</content>
diff --git a/atom/tags.tmpl b/atom/tags.tmpl
--- a/atom/tags.tmpl
+++ b/atom/tags.tmpl
@@ -1,7 +1,7 @@
{header}
- <id>{urlbase}{url}</id>
- <link rel="self" href="{urlbase}{url}atom-tags"/>
- <link rel="alternate" href="{urlbase}{url}tags"/>
+ <id>{urlbase}{url|urlescape}</id>
+ <link rel="self" href="{urlbase}{url|urlescape}atom-tags"/>
+ <link rel="alternate" href="{urlbase}{url|urlescape}tags"/>
<title>{repo|escape}: tags</title>
<summary>{repo|escape} tag history</summary>
<author><name>Mercurial SCM</name></author>
diff --git a/coal/header.tmpl b/coal/header.tmpl
--- a/coal/header.tmpl
+++ b/coal/header.tmpl
@@ -1,7 +1,7 @@
<!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="{staticurl}hgicon.png" type="image/png" />
+<link rel="icon" href="{staticurl|urlescape}hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
-<link rel="stylesheet" href="{staticurl}style-coal.css" type="text/css" />
-<script type="text/javascript" src="{staticurl}mercurial.js"></script>
+<link rel="stylesheet" href="{staticurl|urlescape}style-coal.css" type="text/css" />
+<script type="text/javascript" src="{staticurl|urlescape}mercurial.js"></script>
diff --git a/coal/map b/coal/map
--- a/coal/map
+++ b/coal/map
@@ -13,14 +13,21 @@ graph = ../paper/graph.tmpl
help = ../paper/help.tmpl
helptopics = ../paper/helptopics.tmpl
-helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>'
+helpentry = '
+ <tr><td>
+ <a href="{url|urlescape}help/{topic|escape}{sessionvars%urlparameter}">
+ {topic|escape}
+ </a>
+ </td><td>
+ {summary|escape}
+ </td></tr>'
-naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
-navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
-navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
-filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
-filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
-filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
+naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
+navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
+navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
+filenaventry = '<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
+filedifflink = '<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
+filenodelink = '<a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
filenolink = '{file|escape} '
fileellipses = '...'
diffstatlink = ../paper/diffstat.tmpl
@@ -38,10 +45,10 @@ filenav = '{before%filenaventry}{after%f
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 href="{url|urlescape}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">
+ <img src="{staticurl|urlescape}coal-folder.png" alt="dir."/> {basename|escape}/
</a>
- <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">
+ <a href="{url|urlescape}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">
{emptydirs|escape}
</a>
</td>
@@ -52,8 +59,8 @@ direntry = '
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 href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+ <img src="{staticurl|urlescape}coal-file.png" alt="file"/> {basename|escape}
</a>
</td>
<td class="size">{size}</td>
@@ -63,6 +70,7 @@ fileentry = '
filerevision = ../paper/filerevision.tmpl
fileannotate = ../paper/fileannotate.tmpl
filediff = ../paper/filediff.tmpl
+filecomparison = ../paper/filecomparison.tmpl
filelog = ../paper/filelog.tmpl
fileline = '
<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
@@ -71,7 +79,7 @@ filelogentry = ../paper/filelogentry.tmp
annotateline = '
<tr class="parity{parity}">
<td class="annotate">
- <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}"
+ <a href="{url|urlescape}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>
@@ -83,22 +91,32 @@ difflineminus = '<a href="#{lineid}" id=
difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
+comparisonblock ='
+ <tbody class="block">
+ {lines}
+ </tbody>'
+comparisonline = '
+ <tr>
+ <td class="source {type}"><a href="#{lineid}" id="{lineid}">{leftlinenumber}</a> {leftline|escape}</td>
+ <td class="source {type}"><a href="#{lineid}" id="{lineid}">{rightlinenumber}</a> {rightline|escape}</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>
+ <td class="parent"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
</tr>'
More information about the Commits
mailing list