##// END OF EJS Templates
merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816

File last commit:

r29439:c42a3fd5 default
r45835:0c849f01 default
Show More
changelogentry.tmpl
43 lines | 1.3 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <entry>
Aaron Jensen
hgweb: adding branch names from inbranch template to atom feed
r21117 <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <id>{urlbase}{url|urlescape}#changeset-{node}</id>
<link href="{urlbase}{url|urlescape}rev/{node|short}"/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <author>
<name>{author|person|escape}</name>
<email>{author|email|obfuscate}</email>
</author>
<updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
<content type="xhtml">
av6
hgweb: reindent atom/changelogentry.tmpl...
r29439 <table xmlns="http://www.w3.org/1999/xhtml">
<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;">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>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </content>
</entry>