##// END OF EJS Templates
split: new extension to split changesets...
split: new extension to split changesets This diff introduces an experimental split extension to split changesets. The implementation is largely inspired by Laurent Charignon's implementation for mutable-history (changeset 9603aa1ecdfd54b0d86e262318a72e0a2ffeb6cc [1]) This version contains various improvements: - Rebase by default. This is more friendly for new users. Split won't lead to merge conflicts so a rebase won't give the user more trouble. This has been on by default at Facebook for months now and seems to be a good UX improvement. The rebase skips obsoleted or orphaned changesets, which can avoid issues like allowdivergence, merge conflicts, etc. This is more flexible because the user can decide what to do next (see the last test case in test-split.t) - Remove "Done split? [y/n]" prompt. That could be detected by checking `repo.status()` instead. - Works with obsstore disabled. Without obsstore, split uses strip to clean up old nodes, and it can even handle split a non-head changeset with "allowunstable" disabled, since it runs a rebase to solve the "unstable" issue in a same transaction. - More friendly editor text. Put what has been already split into the editor text so users won't lost track about where they are. [1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b Differential Revision: https://phab.mercurial-scm.org/D1082

File last commit:

r32990:816a4fa7 default
r35471:02ea370c @7 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
function (htmlText, previousVal) \{
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}