##// END OF EJS Templates
merge: pass commitinfo to applyupdates() and get it stored in mergestate...
merge: pass commitinfo to applyupdates() and get it stored in mergestate This patch passes the commitinfo calulcated in manifestmerge() to applyupdates() so that it can be read there and stored in mergestate. On commit, we can read mergestate for such information and act accordingly. This patch also makes ACTION_GET_OTHER_AND_STORE not required anymore. Next patch will remove the messy code surrounding it. Differential Revision: https://phab.mercurial-scm.org/D8743

File last commit:

r32762:2d93d215 default
r45833:cb6a72dc default
Show More
help.tmpl
36 lines | 1.2 KiB | application/x-cheetah | CheetahLexer
Augie Fackler
web: add a help view for getting hg help output
r12666 {header}
av6
hgweb: fix help pages title in gitweb and monoblue...
r25686 <title>Help: {topic}</title>
Augie Fackler
web: add a help view for getting hg help output
r12666 <link rel="alternate" type="application/atom+xml"
av6
gitweb: link to the correct feeds from help pages
r27548 href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
Augie Fackler
web: add a help view for getting hg help output
r12666 <link rel="alternate" type="application/rss+xml"
av6
gitweb: link to the correct feeds from help pages
r27548 href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
Augie Fackler
web: add a help view for getting hg help output
r12666 </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} / help
Augie Fackler
web: add a help view for getting hg help output
r12666 </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> |
<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> |
Yuya Nishihara
hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help
r13861 help
Gregory Szorc
hgweb: refresh styling of gitweb's search form...
r32762 </div>
{searchform}
Augie Fackler
web: add a help view for getting hg help output
r12666 </div>
<div class="title">&nbsp;</div>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 <div id="doc">
{rstdoc(doc, "html")}
</div>
Augie Fackler
web: add a help view for getting hg help output
r12666
{footer}