Mercurial > hg

view mercurial/templates/spartan/changeset.tmpl @ 48578:77e24ee8994b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: take arguments as annotated context objects The labels we put in conflict markers are formatted so the part before the ':' (typically says things like "local") is padded so the ':' is aligned among the labels. That means that if you specify a long label for "base" but the conflict marker style is "merge" (i.e. 2-way), the other two will have unwanted padding. We often don't specify a label for the base, so we don't notice the problem (and it may very well be that it didn't exist before my D11972). I think the best fix is to pass the labels along with the context objects, so the low-level code that switches on the marker style to use (i.e. `simplemerge`) can do the formatting. This patch starts doing that by passing a fully-formatted label to `simplemerge`. A coming patch will move the formatting to `simplemerge`. Differential Revision: https://phab.mercurial-scm.org/D12013
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 11:00:30 -0800
parents 7c18798fc24d
children
line wrap: on
line source

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