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

r35672:59c842a3 default
r47592:80cac993 default
Show More
shortlog.tmpl
55 lines | 1.9 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: Shortlog</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} / shortlog
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> |
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 shortlog |
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> |
av6
gitweb: don't drop current revision context on graph page...
r26666 <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}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}{sessionvars%urlparameter}">files</a>{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>
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 <br/>{changenav%navshort}<br/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
Gregory Szorc
hgweb: refresh styling of gitweb's search form...
r32762 {searchform}
</div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<div class="title">&nbsp;</div>
Takumi IINO
hgweb: infinite scroll support for gitweb style
r20254 <table class="shortlogtable" cellspacing="0">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {entries%shortlogentry}
</table>
Gregory Szorc
hgweb: use separate CSS class for navigation links in footer...
r32990 <div class="extra_nav">
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 {changenav%navshort}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
Gregory Szorc
hgweb: support Content Security Policy...
r30766 <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
Takumi IINO
hgweb: infinite scroll support for gitweb style
r20254 ajaxScrollInit(
'{url|urlescape}shortlog/%next%{sessionvars%urlparameter}',
'{nextentry%"{node}"}', <!-- NEXTHASH
av6
hgweb: remove unused second argument of nextPageVarGet()...
r35672 function (htmlText) \{
Takumi IINO
hgweb: infinite scroll support for gitweb style
r20254 var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
return m ? m[1] : null;
},
'.shortlogtable > tbody:nth-of-type(1)',
'<tr class="%class%">\
<td colspan="4" style="text-align: center;">%text%</td>\
</tr>'
);
</script>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {footer}