##// END OF EJS Templates
merge: disallow merge abort in case of an unfinished operation (issue6160)...
merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

File last commit:

r32758:cba4461a default
r42780:b8d54f46 default
Show More
helptopics.tmpl
48 lines | 1.3 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>
Gregory Szorc
hgweb: consolidate search form for paper...
r32758 {searchform}
Augie Fackler
web: add a help view for getting hg help output
r12666 <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}