upstream/mercurial-mirror Files · mercurial/templates/gitweb/helptopics.tmpl

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

Gregory Szorc - - Load All Authors

File last commit:

r32762:2d93d215 default


                r45833:cb6a72dc

default

Download file

             helptopics.tmpl
        
                    50 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / helptopics.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>Help: {title}</title>

      <link rel="alternate" type="application/atom+xml"

         href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

      <link rel="alternate" type="application/rss+xml"

         href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div class="page_header">

      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

      <a href="/">Mercurial</a> {pathdef%breadcrumb} / help

      </div>

      <div class="page_nav">

      <div>

      <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> |

      <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a> |

      {if(subindex,

        '<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>',

        'help'

      )}

      </div>

      {searchform}

      </div>

      <div class="title">&nbsp;</div>

      <table cellspacing="0">

      <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>

      {topics % helpentry}

      {if(earlycommands, '

      <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>

      {earlycommands % helpentry}

      ')}

      {if(othercommands, '

      <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>

      {othercommands % helpentry}

      ')}

      </table>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				{header}
				<title>Help: {title}</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
				<link rel="alternate" type="application/rss+xml"
				href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
				</head>
				<body>

				<div class="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb} / help
				</div>

				<div class="page_nav">
				<div>
				<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> \|
				<a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a> \|
				{if(subindex,
				'<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>',
				'help'
				)}
				</div>
				{searchform}
				</div>

				<div class="title"> </div>
				<table cellspacing="0">
				<tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
				{topics % helpentry}

				{if(earlycommands, '
				<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
				{earlycommands % helpentry}
				')}

				{if(othercommands, '
				<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
				{othercommands % helpentry}
				')}

				</table>

				{footer}