##// END OF EJS Templates
merge: return an attrs class from update() and applyupdates()...
merge: return an attrs class from update() and applyupdates() Previously, we returned a tuple containing counts. The result of an update is kind of complex and the use of tuples with nameless fields made the code a bit harder to read and constrained future expansion of the return value. Let's invent an attrs-defined class for representing the result of an update operation. We provide __getitem__ and __len__ implementations for backwards compatibility as a container type to minimize code churn. In (at least) Python 2, the % operator seems to insist on using tuples. So we had to update a consumer using the % operator. .. api:: merge.update() and merge.applyupdates() now return a class with named attributes instead of a tuple. Switch consumers to access elements by name instead of by offset. Differential Revision: https://phab.mercurial-scm.org/D2692

File last commit:

r37042:7c18798f default
r37125:71543b94 default
Show More
changeset.tmpl
58 lines | 1.7 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: changeset {node|short}</title>
</head>
<body>
<div class="buttons">
<a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
<a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
<a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a>
<a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>
<a href="{url|urlescape}raw-rev/{symrev}">raw</a>
{archives%archiveentry}
<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
</div>
<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset: {desc|strip|escape|firstline|nonempty}</h2>
<table id="changesetEntry">
<tr>
<th class="changeset">changeset {rev}:</th>
<td class="changeset"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
</tr>
{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
{child%changesetchild}
{changesettag}
<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>
{ifeq(phase, 'public', '', '<tr>
<th class="phase">phase:</th>
<td class="phase">{phase|escape}</td>
</tr>')}
{if(obsolete, succsandmarkers%obsfateentry)}
{if(instabilities, whyunstable%whyunstableentry)}
<tr>
<th class="files">files:</th>
<td class="files">{files}</td>
</tr>
<tr>
<th class="description">description:</th>
<td class="description">{desc|strip|escape|websub|addbreaks|nonempty}</td>
</tr>
</table>
<div id="changesetDiff">
{diff}
</div>
{footer}