##// END OF EJS Templates
reabase: call rewriteutil.precheck() a bit later...
reabase: call rewriteutil.precheck() a bit later We now filter out descendants of divergence-causing commits in `_handleskippingobsolete()`. The filtered-out commits are removed from the rebase set (`destmap` and `state`). We should therefore call `rewriteutil.precheck()` after `_handleskippingobsolete()`. This patch does that. It hasn't mattered so far because `rewriteutil.precheck()` doesn't yet check for divergence, but it will soon. This affects one test where we now fail because the user is trying to rebase an ancestor instead of failing because they tried to rebase a public commit. We have several similar tests just after, where we still fail because of the phase, so that seems fine. The difference in behavior also seems fine to me. Differential Revision: https://phab.mercurial-scm.org/D10258

File last commit:

r37042:7c18798f default
r47592:80cac993 default
Show More
changeset.tmpl
67 lines | 2.6 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: changeset {rev}:{node|short}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </head>
<body>
<div id="container">
<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset</h1>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
Gregory Szorc
hgweb: consolidate search form for monoblue...
r32759 {searchform}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<ul class="page-nav">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
<li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <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>
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </ul>
</div>
<ul class="submenu">
<li class="current">changeset</li>
av6
hgweb: don't dereference symbolic revision in monoblue style...
r25604 <li><a href="{url|urlescape}raw-rev/{symrev}">raw</a></li>
Anton Shestakov
hgweb: move archive entries outside of <li> in monoblue style...
r23784 {archives%archiveentry}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </ul>
<h2 class="no-link no-border">changeset</h2>
av6
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
r35051 <h3 class="changeset">
<a href="{url|urlescape}raw-rev/{node|short}">
{desc|strip|escape|firstline|nonempty}
av6
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...
r35052 {alltags}
av6
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
r35051 </a>
</h3>
Anton Shestakov
hgweb: recreate old DOM structure for css in monoblue style...
r24109 <p class="changeset-age"><span class="age">{date|rfc822date}</span></p>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<dl class="overview">
<dt>author</dt>
<dd>{author|obfuscate}</dd>
<dt>date</dt>
av6
hgweb: show changeset age in more places (gitweb and monoblue)...
r35136 <dd class="date age">{date|rfc822date}</dd>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {branch%changesetbranch}
<dt>changeset {rev}</dt>
av6
hgweb: link to revision by node hash in gitweb & monoblue...
r25616 <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
av6
hgweb: show each obsfateentry on its own line...
r36340 {if(obsolete, succsandmarkers%obsfateentry)}
av6
hgweb: explain instabilities of unstable changesets (the rest of the themes)
r37042 {if(instabilities, whyunstable%whyunstableentry)}
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}
</dl>
Angel Ezquerra
hgweb: apply the websub filter to revision descriptions...
r18628 <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<table>
{files}
</table>
av6
monoblue: port code selection without line numbers from gitweb...
r26314 <div class="diff diffblocks">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {diff}
</div>
{footer}