##// END OF EJS Templates
push: add a way to allow concurrent pushes on unrelated heads...
push: add a way to allow concurrent pushes on unrelated heads Client has a mechanism for the server to check that nothing changed server side since the client prepared a push. That check is wide and any head changed on the server will lead to an aborted push. We introduce a way for the client to send a less strict checking. That logic will check that no heads impacted by the push have been affected. If other unrelated heads (including named branches heads) have been affected, the push will proceed. This is very helpful for repositories with high developers traffic on different heads, a common setup. That behavior is currently controlled by an experimental option. The config should live in the "server" section but bike-shedding of the name will happen in the next changesets. Servers advertise this capability through a new bundle2 capability 'checkeads', using the value 'related'. The 'test-push-race.t' is updated to check that new capabilities on the documented cases.

File last commit:

r30019:6ca3c54f default
r32709:16ada4cb default
Show More
helptopics.tmpl
52 lines | 1.4 KiB | application/x-cheetah | CheetahLexer
Augie Fackler
web: add a help view for getting hg help output
r12666 {header}
<title>Help: {title}</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Steven Stallion
hgweb: support alternate logo url...
r13964 <a href="{logourl}">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
Augie Fackler
web: add a help view for getting hg help output
r12666 </div>
<ul>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
<li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
Augie Fackler
web: add a help view for getting hg help output
r12666 </ul>
<ul>
Gregory Szorc
templates: support linking to main help page...
r27580 {if(subindex,
'<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>',
'<li class="active">help</li>'
)}
Augie Fackler
web: add a help view for getting hg help output
r12666 </ul>
</div>
<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <form class="search" action="{url|urlescape}log">
Augie Fackler
web: add a help view for getting hg help output
r12666 {sessionvars%hiddenformentry}
<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin
paper: define searchhint message in map file and use it in other templates
r19795 <div id="hint">{searchhint}</div>
Augie Fackler
web: add a help view for getting hg help output
r12666 </form>
<table class="bigtable">
av6
hgweb: make anchor name actually match its href on help index page
r30019 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
Augie Fackler
web: add a help view for getting hg help output
r12666 {topics % helpentry}
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 {if(earlycommands, '
Augie Fackler
web: add a help view for getting hg help output
r12666 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
{earlycommands % helpentry}
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 ')}
Augie Fackler
web: add a help view for getting hg help output
r12666
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 {if(othercommands, '
Augie Fackler
web: add a help view for getting hg help output
r12666 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
{othercommands % helpentry}
Gregory Szorc
templates: make earlycommands and othercommands optional...
r27578 ')}
Augie Fackler
web: add a help view for getting hg help output
r12666 </table>
</div>
</div>
{footer}