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

r35052:e9a8a941 default
r47592:80cac993 default
Show More
changelogentry.tmpl
16 lines | 489 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <div>
av6
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
r35051 <a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
<span class="age">{date|rfc822date}</span>
{desc|strip|firstline|escape|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>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<div class="title_text">
<div class="log_link">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>
</div>
Gregory Szorc
gitweb: preserve whitespace in description...
r33557 <div class="log_body description">{desc|strip|escape|websub|nonempty}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>