view mercurial/templates/rss/changelogentry.tmpl @ 26572:c7850af6bb75

filemerge._merge: drop no longer necessary 'if r:' check

Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.

<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>
    <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>