Mercurial > hg

changeset 13548:c2eda93961ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 06 Mar 2011 22:13:36 +0100
parents 0549cbfd1d3d (current diff) a2dc8819bb0d (diff)
children 22565ddb28e7
files
diffstat 4 files changed, 81 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/gitweb/filelog.tmpl	Sun Mar 06 19:38:00 2011 +0100
+++ b/mercurial/templates/gitweb/filelog.tmpl	Sun Mar 06 22:13:36 2011 +0100
@@ -22,7 +22,7 @@
 revisions |
 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
-<a href="{url}rss-log/{node|short}/{file|urlescape}">rss</a> |
+<a href="{url}rss-log/tip/{file|urlescape}">rss</a> |
 <a href="{url}help{sessionvars%urlparameter}">help</a>
 <br/>
 {nav%filenav}
--- a/mercurial/templates/monoblue/filelog.tmpl	Sun Mar 06 19:38:00 2011 +0100
+++ b/mercurial/templates/monoblue/filelog.tmpl	Sun Mar 06 22:13:36 2011 +0100
@@ -34,7 +34,7 @@
         <li class="current">revisions</li>
         <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
         <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
-        <li><a href="{url}rss-log/{node|short}/{file|urlescape}">rss</a></li>
+        <li><a href="{url}rss-log/tip/{file|urlescape}">rss</a></li>
     </ul>
 
     <h2 class="no-link no-border">{file|urlescape}</h2>
--- a/mercurial/templates/rss/filelogentry.tmpl	Sun Mar 06 19:38:00 2011 +0100
+++ b/mercurial/templates/rss/filelogentry.tmpl	Sun Mar 06 22:13:36 2011 +0100
@@ -1,6 +1,6 @@
 <item>
     <title>{desc|strip|firstline|strip|escape}</title>
-    <link>{urlbase}{url}log{{node|short}}/{file|urlescape}</link>
+    <link>{urlbase}{url}log{node|short}/{file|urlescape}</link>
     <description><![CDATA[{desc|strip|escape|addbreaks|nonempty}]]></description>
     <author>{author|obfuscate}</author>
     <pubDate>{date|rfc822date}</pubDate>
--- a/tests/test-hgweb-filelog.t	Sun Mar 06 19:38:00 2011 +0100
+++ b/tests/test-hgweb-filelog.t	Sun Mar 06 22:13:36 2011 +0100
@@ -656,6 +656,84 @@
   </html>
   
 
+rss log
+
+  $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rss-log/tip/a')
+  200 Script output follows
+  
+  <?xml version="1.0" encoding="ascii"?>
+  <rss version="2.0">
+    <channel>
+      <link>http://*:$HGPORT/</link> (glob)
+      <language>en-us</language>
+  
+      <title>test: a history</title>
+      <description>a revision history</description>
+      <item>
+      <title>second a</title>
+      <link>http://*:$HGPORT/log01de2d66a28d/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)
+      <description><![CDATA[first a]]></description>
+      <author>&#116;&#101;&#115;&#116;</author>
+      <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+  </item>
+  
+    </channel>
+  </rss>
+
+atom log
+
+  $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/atom-log/tip/a')
+  200 Script output follows
+  
+  <?xml version="1.0" encoding="ascii"?>
+  <feed xmlns="http://www.w3.org/2005/Atom">
+   <id>http://*:$HGPORT/atom-log/tip/a</id> (glob)
+   <link rel="self" href="http://*:$HGPORT/atom-log/tip/a"/> (glob)
+   <title>test: a history</title>
+   <updated>1970-01-01T00:00:00+00:00</updated>
+  
+   <entry>
+    <title>second a</title>
+    <id>http://*:$HGPORT/#changeset-01de2d66a28df5549090991dccda788726948517</id> (glob)
+    <link href="http://*:$HGPORT/rev/01de2d66a28d"/> (glob)
+    <author>
+     <name>test</name>
+     <email>&#116;&#101;&#115;&#116;</email>
+    </author>
+    <updated>1970-01-01T00:00:00+00:00</updated>
+    <published>1970-01-01T00:00:00+00:00</published>
+    <content type="xhtml">
+     <div xmlns="http://www.w3.org/1999/xhtml">
+      <pre xml:space="preserve">second a</pre>
+     </div>
+    </content>
+   </entry>
+   <entry>
+    <title>first a</title>
+    <id>http://*:$HGPORT/#changeset-5ed941583260248620985524192fdc382ef57c36</id> (glob)
+    <link href="http://*:$HGPORT/rev/5ed941583260"/> (glob)
+    <author>
+     <name>test</name>
+     <email>&#116;&#101;&#115;&#116;</email>
+    </author>
+    <updated>1970-01-01T00:00:00+00:00</updated>
+    <published>1970-01-01T00:00:00+00:00</published>
+    <content type="xhtml">
+     <div xmlns="http://www.w3.org/1999/xhtml">
+      <pre xml:space="preserve">first a</pre>
+     </div>
+    </content>
+   </entry>
+  
+  </feed>
+
 errors
 
   $ cat errors.log