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

filemerge: make capability check for internal tools ignore merge-tools section...

filemerge: make capability check for internal tools ignore merge-tools section This is follow up of 4d7b11877dd0. Before this patch, capability check of internal merge tools falls back to _toolbool(), which examines configurations in "merge-tools" section. But "hg help config" explicitly says that "merge-tools" section configures external merge tools. Therefore, this patch makes capability check for internal tools in hascapability() always ignore configurations in merge-tools section. In this patch, command line configurations below are added at tests in tests/test-merge-tools.t, in order to confirm that explicit configuration is intentionally ignored at tool selection. --config merge-tools.:INTERNAL_TOOL.CAPABILITY=true

Gregory Szorc - - Load All Authors

File last commit:

r32758:cba4461a default


                r39302:82555d71

default

Download file

             helptopics.tmpl
        
                    48 lines
            
             | 1.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / helptopics.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

      </div>

      <ul>

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

      </ul>

      <ul>

      {if(subindex,

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

        '<li class="active">help</li>'

      )}

      </ul>

      </div>

      <div class="main">

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

      {searchform}

      <table class="bigtable">

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

      </div>

      </div>

      {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>
				</head>
				<body>

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
				</div>
				<ul>
				<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>
				</ul>
				<ul>
				{if(subindex,
				'<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>',
				'<li class="active">help</li>'
				)}
				</ul>
				</div>

				<div class="main">
				<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
				{searchform}
				<table class="bigtable">
				<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>
				</div>
				</div>

				{footer}