From patchwork Wed May  7 06:48:06 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: hgweb: apply websub filter to the changeset description in rss and
 atom feeds
From: Steven Brown <stevengbrown@gmail.com>
X-Patchwork-Id: 4654
Message-Id: <171396ccd63139e6427e.1399445286@steve-debian.home>
To: mercurial-devel@selenic.com
Date: Wed, 07 May 2014 14:48:06 +0800

# HG changeset patch
# User Steven Brown <StevenGBrown@gmail.com>
# Date 1399444707 -28800
#      Wed May 07 14:38:27 2014 +0800
# Node ID 171396ccd63139e6427ec6da2400e8bda3c803c7
# Parent  0768cda8b5799dc803dc0ee27a832cd64e05f28a
hgweb: apply websub filter to the changeset description in rss and atom feeds

For example, this is useful for linking from the feed reader to a bug tracker.

This follows the existing pattern used within the hgweb templates. All usages
of the "desc" keyword are now followed by either the "firstline" filter or the
"websub" filter. When "websub" is used, it always follows the "escape" filter.

diff --git a/mercurial/templates/atom/changelogentry.tmpl b/mercurial/templates/atom/changelogentry.tmpl
--- a/mercurial/templates/atom/changelogentry.tmpl
+++ b/mercurial/templates/atom/changelogentry.tmpl
@@ -32,7 +32,7 @@
 	</tr>
 	<tr>
 		<th style="text-align:left;vertical-align:top;">description</th>
-		<td>{desc|strip|escape|addbreaks|nonempty}</td>
+		<td>{desc|strip|escape|websub|addbreaks|nonempty}</td>
 	</tr>
 	<tr>
 		<th style="text-align:left;vertical-align:top;">files</th>
diff --git a/mercurial/templates/rss/changelogentry.tmpl b/mercurial/templates/rss/changelogentry.tmpl
--- a/mercurial/templates/rss/changelogentry.tmpl
+++ b/mercurial/templates/rss/changelogentry.tmpl
@@ -27,7 +27,7 @@
 	</tr>
 	<tr>
 		<th style="text-align:left;vertical-align:top;">description</th>
-		<td>{desc|strip|escape|addbreaks|nonempty}</td>
+		<td>{desc|strip|escape|websub|addbreaks|nonempty}</td>
 	</tr>
 	<tr>
 		<th style="text-align:left;vertical-align:top;">files</th>
diff --git a/mercurial/templates/rss/filelogentry.tmpl b/mercurial/templates/rss/filelogentry.tmpl
--- a/mercurial/templates/rss/filelogentry.tmpl
+++ b/mercurial/templates/rss/filelogentry.tmpl
@@ -1,7 +1,7 @@
 <item>
     <title>{desc|strip|firstline|strip|escape}</title>
     <link>{urlbase}{url|urlescape}log{node|short}/{file|urlescape}</link>
-    <description><![CDATA[{desc|strip|escape|addbreaks|nonempty}]]></description>
+    <description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>
     <author>{author|obfuscate}</author>
     <pubDate>{date|rfc822date}</pubDate>
 </item>