##// 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:

r33557:875b054e default
r47592:80cac993 default
Show More
filerevision.tmpl
77 lines | 2.7 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: {file|escape}@{node|short}</title>
<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 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 class="page_header">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / file revision
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<div class="page_nav">
Gregory Szorc
hgweb: refresh styling of gitweb's search form...
r32762 <div>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a> |
<a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> |
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 file |
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
<a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
<a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
<a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
<a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> |
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
Gregory Szorc
hgweb: refresh styling of gitweb's search form...
r32762 </div>
{searchform}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<div class="title">{file|escape}</div>
<div class="title_text">
<table cellspacing="0">
<tr>
<td>author</td>
Anton Shestakov
hgweb: clearly outline <tr> block in gitweb and spartan styles...
r24999 <td>{author|obfuscate}</td>
</tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <tr>
<td></td>
Anton Shestakov
hgweb: clearly outline <tr> block in gitweb and spartan styles...
r24999 <td class="date age">{date|rfc822date}</td>
</tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {branch%filerevbranch}
<tr>
<td>changeset {rev}</td>
Anton Shestakov
hgweb: clearly outline <tr> block in gitweb and spartan styles...
r24999 <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
</tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {parent%filerevparent}
{child%filerevchild}
<tr>
<td>permissions</td>
Anton Shestakov
hgweb: clearly outline <tr> block in gitweb and spartan styles...
r24999 <td style="font-family:monospace">{permissions|permissions}</td>
</tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </table>
</div>
Gregory Szorc
gitweb: preserve whitespace in description...
r33557 <div class="page_path description">{desc|strip|escape|websub|nonempty}</div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<div class="page_body">
Denis Laxalde
hgweb: parameterize the tag name of elements holding followlines selection...
r32993 <pre class="sourcelines stripes"
data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}"
data-selectabletag="SPAN"
data-ishead="{ishead}">
{text%fileline}
</pre>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
Denis Laxalde
gitweb: plug followlines UI in filerevision view...
r31949 <script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {footer}