##// END OF EJS Templates
rebase: move bookmarks with --keep (issue5682)...
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 3b7cb3d17137. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727

File last commit:

r33557:875b054e default
r34364:2f427b57 4.3.3 stable
Show More
changeset.tmpl
57 lines | 2.2 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>
<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} / changeset
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> |
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> |
<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> |
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changeset |
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}raw-rev/{symrev}">raw</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>
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>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="title" href="{url|urlescape}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<div class="title_text">
<table cellspacing="0">
<tr><td>author</td><td>{author|obfuscate}</td></tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <tr><td></td><td class="date age">{date|rfc822date}</td></tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {branch%changesetbranch}
av6
hgweb: link to revision by node hash in gitweb & monoblue...
r25616 <tr>
<td>changeset {rev}</td>
<td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
</tr>
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}
</table></div>
Gregory Szorc
gitweb: preserve whitespace in description...
r33557 <div class="page_body description">{desc|strip|escape|websub|nonempty}</div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <div class="list_head"></div>
<div class="title_text">
<table cellspacing="0">
{files}
</table></div>
av6
gitweb: port code selection without line numbers from paper...
r26288 <div class="page_body diffblocks">{diff}</div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
{footer}