##// END OF EJS Templates
tests: test divergence created during interrupted rebase...
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

File last commit:

r37419:7d94fe3e default
r47586:6648307d default
Show More
summary.tmpl
62 lines | 2.4 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: Summary</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} / summary
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>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 summary |
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <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 point file links at tip hash where it doesn't make sense...
r25526 <a href="{url|urlescape}file{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>
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">&nbsp;</div>
<table cellspacing="0">
<tr><td>description</td><td>{desc}</td></tr>
<tr><td>owner</td><td>{owner|obfuscate}</td></tr>
av6
hgweb: show changeset age in more places (gitweb and monoblue)...
r35136 <tr><td>last change</td><td class="date age">{lastchange|rfc822date}</td></tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </table>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <div><a class="title" href="{url|urlescape}shortlog{sessionvars%urlparameter}">changes</a></div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <table cellspacing="0">
Yuya Nishihara
hgweb: fix summary {tags} and {shortlog} to not forcibly expand template...
r37419 {shortlog%shortlogentry}
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <tr class="light"><td colspan="4"><a class="list" href="{url|urlescape}shortlog{sessionvars%urlparameter}">...</a></td></tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </table>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <div><a class="title" href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <table cellspacing="0">
Yuya Nishihara
hgweb: fix summary {tags} and {shortlog} to not forcibly expand template...
r37419 {tags%tagentry}
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <tr class="light"><td colspan="3"><a class="list" href="{url|urlescape}tags{sessionvars%urlparameter}">...</a></td></tr>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </table>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <div><a class="title" href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></div>
Yuya Nishihara
hgweb: add bookmarks listing to summary page of gitweb/monoblue styles
r13924 <table cellspacing="0">
{bookmarks%bookmarkentry}
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <tr class="light"><td colspan="3"><a class="list" href="{url|urlescape}bookmarks{sessionvars%urlparameter}">...</a></td></tr>
Yuya Nishihara
hgweb: add bookmarks listing to summary page of gitweb/monoblue styles
r13924 </table>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <div><a class="title" href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <table cellspacing="0">
{branches%branchentry}
<tr class="light">
av6
gitweb: tweak branch table's last row's cell colspan on summary page...
r29982 <td colspan="3"><a class="list" href="{url|urlescape}branches{sessionvars%urlparameter}">...</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>
</table>
{footer}