##// END OF EJS Templates
destupdate: move the check related to the "clean" logic in the function...
destupdate: move the check related to the "clean" logic in the function We want this function to exactly predict the behavior for update. Moreover, we would like to remove all high level behavior logic out of the merge module so this is a step forward. Now that the 'destupdate' function both compute and validate the destination, we can directly use it at the command level, ensuring that the 'hg update' command never call 'merge.update' without a defined destination. This is a first (but significant) step toward having 'merge.update' always feed with a properly validated destination and free of high level logic.

File last commit:

r25794:90214844 default
r26628:45b86dba default
Show More
changeset.tmpl
52 lines | 1.5 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: changeset {node|short}</title>
</head>
<body>
<div class="buttons">
av6
hgweb: don't dereference symbolic revision in spartan style...
r25603 <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
<a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
av6
spartan: don't drop current revision in log/graph links...
r25794 <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a>
av6
hgweb: don't dereference symbolic revision in spartan style...
r25603 <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>
<a href="{url|urlescape}raw-rev/{symrev}">raw</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {archives%archiveentry}
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb, spartan: add "URL breadcrumbs"...
r18259 <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset: {desc|strip|escape|firstline|nonempty}</h2>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<table id="changesetEntry">
<tr>
<th class="changeset">changeset {rev}:</th>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td class="changeset"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>
Anton Shestakov
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...
r23740 {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {child%changesetchild}
{changesettag}
<tr>
<th class="author">author:</th>
<td class="author">{author|obfuscate}</td>
</tr>
<tr>
<th class="date">date:</th>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="date age">{date|rfc822date}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>
<tr>
<th class="files">files:</th>
<td class="files">{files}</td>
</tr>
<tr>
<th class="description">description:</th>
Angel Ezquerra
hgweb: apply the websub filter to revision descriptions...
r18628 <td class="description">{desc|strip|escape|websub|addbreaks|nonempty}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>
</table>
<div id="changesetDiff">
{diff}
</div>
{footer}