changeset 30558:7817df5585db stable

hgweb: add missing slash to file log url in rss style
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 08 Dec 2016 23:59:36 +0800
parents 76e970c8f530
children 1914db1b7d9e
files mercurial/templates/rss/filelogentry.tmpl tests/test-hgweb-commands.t tests/test-hgweb-filelog.t
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/rss/filelogentry.tmpl	Thu Dec 01 14:13:28 2016 -0600
+++ b/mercurial/templates/rss/filelogentry.tmpl	Thu Dec 08 23:59:36 2016 +0800
@@ -1,6 +1,6 @@
 <item>
     <title>{desc|strip|firstline|strip|escape}</title>
-    <link>{urlbase}{url|urlescape}log{node|short}/{file|urlescape}</link>
+    <link>{urlbase}{url|urlescape}log/{node|short}/{file|urlescape}</link>
     <description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>
     <author>{author|obfuscate}</author>
     <pubDate>{date|rfc822date}</pubDate>
--- a/tests/test-hgweb-commands.t	Thu Dec 01 14:13:28 2016 -0600
+++ b/tests/test-hgweb-commands.t	Thu Dec 08 23:59:36 2016 +0800
@@ -686,7 +686,7 @@
       <description>foo revision history</description>
       <item>
       <title>base</title>
-      <link>http://*:$HGPORT/log2ef0ac749a14/foo</link> (glob)
+      <link>http://*:$HGPORT/log/2ef0ac749a14/foo</link> (glob)
       <description><![CDATA[base(websub)]]></description>
       <author>&#116;&#101;&#115;&#116;</author>
       <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
--- a/tests/test-hgweb-filelog.t	Thu Dec 01 14:13:28 2016 -0600
+++ b/tests/test-hgweb-filelog.t	Thu Dec 08 23:59:36 2016 +0800
@@ -783,14 +783,14 @@
       <description>a revision history</description>
       <item>
       <title>second a</title>
-      <link>http://*:$HGPORT/log3f41bc784e7e/a</link> (glob)
+      <link>http://*:$HGPORT/log/3f41bc784e7e/a</link> (glob)
       <description><![CDATA[second a]]></description>
       <author>&#116;&#101;&#115;&#116;</author>
       <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
   </item>
   <item>
       <title>first a</title>
-      <link>http://*:$HGPORT/log5ed941583260/a</link> (glob)
+      <link>http://*:$HGPORT/log/5ed941583260/a</link> (glob)
       <description><![CDATA[first a]]></description>
       <author>&#116;&#101;&#115;&#116;</author>
       <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>