##// END OF EJS Templates
templatekw: make {file_*} compare to both merge parents (issue4292)...
templatekw: make {file_*} compare to both merge parents (issue4292) This redefines the {file_adds}, {file_dels}, {file_mods} template keywords by getting the lists from the recently introduced context methods instead of getting them from status compared to p1. As mentioned before, these are better defined on merge commits. The total number of files from the three lists now always add up to the number of files in {files}. I timed this command: hg log -r 4.0::5.0 -T '{rev}\n {file_mods}\n {file_adds}\n {file_dels}\n' It went from 7.6s to 5.6s with this patch. So it's actually faster than before. Note that the "files:" field in the bazaar test log output was using "{file_mods}" (not "{files}" as one might think based on the label). Differential Revision: https://phab.mercurial-scm.org/D6369

File last commit:

r37849:82ae4f47 @22 stable
r42597:0c72eddb default
Show More
changeset.tmpl
95 lines | 2.6 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: {node|short}</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="{logourl}">
<img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
</div>
<ul>
<li><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
<li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
</ul>
<ul>
<li class="active">changeset</li>
<li><a href="{url|urlescape}raw-rev/{symrev}{sessionvars%urlparameter}">raw</a></li>
<li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">browse</a></li>
</ul>
<ul>
{archives%archiveentry}
</ul>
<ul>
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
</ul>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<h3>
changeset {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
{alltags}
</h3>
{searchform}
<div class="description">{desc|strip|escape|websub|nonempty}</div>
<table id="changesetEntry">
<tr>
<th class="author">author</th>
<td class="author">{author|obfuscate}</td>
</tr>
<tr>
<th class="date">date</th>
<td class="date age">{date|rfc822date}</td>
</tr>
{if(obsolete, '<tr>
<th>obsolete</th>
<td>{join(succsandmarkers%obsfateentry, '<br>\n')}</td>
</tr>')}
{if(instabilities, '<tr>
<th>unstable</th>
<td>{join(whyunstable%whyunstableentry, '<br>\n')}</td>
</tr>')}
<tr>
<th class="author">parents</th>
<td class="author">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>
</tr>
<tr>
<th class="author">children</th>
<td class="author">{child%changesetchild}</td>
</tr>
<tr>
<th class="files">files</th>
<td class="files">{files}</td>
</tr>
<tr>
<th class="diffstat">diffstat</th>
<td class="diffstat">
{diffsummary}
<a id="diffstatexpand" class="diffstattoggle" href="#">[<tt>+</tt>]</a>
<div id="diffstatdetails" style="display:none;">
<a class="diffstattoggle" href="#">[<tt>-</tt>]</a>
<table class="diffstat-table stripes2">{diffstat}</table>
</div>
</td>
</tr>
</table>
<div class="overflow">
<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div>
<div class="sourcefirst"> line diff</div>
<div class="stripes2 diffblocks">
{diff}
</div>
</div>
</div>
</div>
{footer}