Mercurial > hg
changeset 29436:849b8e84487e
hgweb: reindent rss/changelogentry.tmpl
It was mixing tabs and spaces, and not in a good way.
Indent style of other rss entries seems to be 4 spaces per level, so let's
apply it here as well.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 29 Jun 2016 20:19:04 +0800 |
| parents | b8ede1f79126 |
| children | 6ab3465d9991 |
| files | mercurial/templates/rss/changelogentry.tmpl tests/test-hgweb-commands.t |
| diffstat | 2 files changed, 238 insertions(+), 231 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/rss/changelogentry.tmpl Wed Jun 29 19:40:04 2016 +0800 +++ b/mercurial/templates/rss/changelogentry.tmpl Wed Jun 29 20:19:04 2016 +0800 @@ -1,40 +1,41 @@ <item> <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape}</title> <guid isPermaLink="true">{urlbase}{url|urlescape}rev/{node|short}</guid> - <link>{urlbase}{url|urlescape}rev/{node|short}</link> + <link>{urlbase}{url|urlescape}rev/{node|short}</link> <description> - <![CDATA[ - <table> - <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;vertical-align:top;">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> - ]]></description> + <![CDATA[ + <table> + <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;vertical-align:top;">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> + ]]> + </description> <author>{author|obfuscate}</author> <pubDate>{date|rfc822date}</pubDate> </item>
--- a/tests/test-hgweb-commands.t Wed Jun 29 19:40:04 2016 +0800 +++ b/tests/test-hgweb-commands.t Wed Jun 29 20:19:04 2016 +0800 @@ -258,160 +258,164 @@ <item> <title>[unstable] branch commit with null character: </title> <guid isPermaLink="true">http://*:$HGPORT/rev/cad8025a2e87</guid> (glob) - <link>http://*:$HGPORT/rev/cad8025a2e87</link> (glob) + <link>http://*:$HGPORT/rev/cad8025a2e87</link> (glob) <description> - <![CDATA[ - <table> - <tr> - <th style="text-align:left;">changeset</th> - <td>cad8025a2e87</td> - </tr> - <tr> - <th style="text-align:left;">branch</th> - <td>unstable</td> - </tr> - <tr> - <th style="text-align:left;">bookmark</th> - <td>something</td> - </tr> - <tr> - <th style="text-align:left;">tag</th> - <td>tip</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">user</th> - <td>test</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">description</th> - <td>branch commit with null character: (websub)</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">files</th> - <td></td> - </tr> - </table> - ]]></description> + <![CDATA[ + <table> + <tr> + <th style="text-align:left;">changeset</th> + <td>cad8025a2e87</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>unstable</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>something</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>tip</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>branch commit with null character: (websub)</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td></td> + </tr> + </table> + ]]> + </description> <author>test</author> <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate> </item> <item> <title>[stable] branch</title> <guid isPermaLink="true">http://*:$HGPORT/rev/1d22e65f027e</guid> (glob) - <link>http://*:$HGPORT/rev/1d22e65f027e</link> (glob) + <link>http://*:$HGPORT/rev/1d22e65f027e</link> (glob) <description> - <![CDATA[ - <table> - <tr> - <th style="text-align:left;">changeset</th> - <td>1d22e65f027e</td> - </tr> - <tr> - <th style="text-align:left;">branch</th> - <td>stable</td> - </tr> - <tr> - <th style="text-align:left;">bookmark</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;">tag</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">user</th> - <td>test</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">description</th> - <td>branch(websub)</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">files</th> - <td>foo<br /></td> - </tr> - </table> - ]]></description> + <![CDATA[ + <table> + <tr> + <th style="text-align:left;">changeset</th> + <td>1d22e65f027e</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>stable</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>branch(websub)</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>foo<br /></td> + </tr> + </table> + ]]> + </description> <author>test</author> <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate> </item> <item> <title>[default] Added tag 1.0 for changeset 2ef0ac749a14</title> <guid isPermaLink="true">http://*:$HGPORT/rev/a4f92ed23982</guid> (glob) - <link>http://*:$HGPORT/rev/a4f92ed23982</link> (glob) + <link>http://*:$HGPORT/rev/a4f92ed23982</link> (glob) <description> - <![CDATA[ - <table> - <tr> - <th style="text-align:left;">changeset</th> - <td>a4f92ed23982</td> - </tr> - <tr> - <th style="text-align:left;">branch</th> - <td>default</td> - </tr> - <tr> - <th style="text-align:left;">bookmark</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;">tag</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">user</th> - <td>test</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">description</th> - <td>Added tag 1.0 for changeset 2ef0ac749a14(websub)</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">files</th> - <td>.hgtags<br /></td> - </tr> - </table> - ]]></description> + <![CDATA[ + <table> + <tr> + <th style="text-align:left;">changeset</th> + <td>a4f92ed23982</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>Added tag 1.0 for changeset 2ef0ac749a14(websub)</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>.hgtags<br /></td> + </tr> + </table> + ]]> + </description> <author>test</author> <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate> </item> <item> <title>base</title> <guid isPermaLink="true">http://*:$HGPORT/rev/2ef0ac749a14</guid> (glob) - <link>http://*:$HGPORT/rev/2ef0ac749a14</link> (glob) + <link>http://*:$HGPORT/rev/2ef0ac749a14</link> (glob) <description> - <![CDATA[ - <table> - <tr> - <th style="text-align:left;">changeset</th> - <td>2ef0ac749a14</td> - </tr> - <tr> - <th style="text-align:left;">branch</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;">bookmark</th> - <td>anotherthing</td> - </tr> - <tr> - <th style="text-align:left;">tag</th> - <td>1.0</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">user</th> - <td>test</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">description</th> - <td>base(websub)</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">files</th> - <td>da/foo<br />foo<br /></td> - </tr> - </table> - ]]></description> + <![CDATA[ + <table> + <tr> + <th style="text-align:left;">changeset</th> + <td>2ef0ac749a14</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>anotherthing</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>1.0</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>base(websub)</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>da/foo<br />foo<br /></td> + </tr> + </table> + ]]> + </description> <author>test</author> <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate> </item> @@ -532,80 +536,82 @@ <item> <title>[default] Added tag 1.0 for changeset 2ef0ac749a14</title> <guid isPermaLink="true">http://*:$HGPORT/rev/a4f92ed23982</guid> (glob) - <link>http://*:$HGPORT/rev/a4f92ed23982</link> (glob) + <link>http://*:$HGPORT/rev/a4f92ed23982</link> (glob) <description> - <![CDATA[ - <table> - <tr> - <th style="text-align:left;">changeset</th> - <td>a4f92ed23982</td> - </tr> - <tr> - <th style="text-align:left;">branch</th> - <td>default</td> - </tr> - <tr> - <th style="text-align:left;">bookmark</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;">tag</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">user</th> - <td>test</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">description</th> - <td>Added tag 1.0 for changeset 2ef0ac749a14(websub)</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">files</th> - <td>.hgtags<br /></td> - </tr> - </table> - ]]></description> + <![CDATA[ + <table> + <tr> + <th style="text-align:left;">changeset</th> + <td>a4f92ed23982</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>Added tag 1.0 for changeset 2ef0ac749a14(websub)</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>.hgtags<br /></td> + </tr> + </table> + ]]> + </description> <author>test</author> <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate> </item> <item> <title>base</title> <guid isPermaLink="true">http://*:$HGPORT/rev/2ef0ac749a14</guid> (glob) - <link>http://*:$HGPORT/rev/2ef0ac749a14</link> (glob) + <link>http://*:$HGPORT/rev/2ef0ac749a14</link> (glob) <description> - <![CDATA[ - <table> - <tr> - <th style="text-align:left;">changeset</th> - <td>2ef0ac749a14</td> - </tr> - <tr> - <th style="text-align:left;">branch</th> - <td></td> - </tr> - <tr> - <th style="text-align:left;">bookmark</th> - <td>anotherthing</td> - </tr> - <tr> - <th style="text-align:left;">tag</th> - <td>1.0</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">user</th> - <td>test</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">description</th> - <td>base(websub)</td> - </tr> - <tr> - <th style="text-align:left;vertical-align:top;">files</th> - <td>da/foo<br />foo<br /></td> - </tr> - </table> - ]]></description> + <![CDATA[ + <table> + <tr> + <th style="text-align:left;">changeset</th> + <td>2ef0ac749a14</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>anotherthing</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>1.0</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>base(websub)</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>da/foo<br />foo<br /></td> + </tr> + </table> + ]]> + </description> <author>test</author> <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate> </item>