upstream/mercurial-mirror Files · mercurial/templates/gitweb/notfound.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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r39302:82555d71

default

Download file

             notfound.tmpl
        
                    18 lines
            
             | 397 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / notfound.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>Mercurial repository not found</title>

      </head>

      <body>

      <div class="page_header">

      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}

      </div>

      <div class="page_body">

      The specified repository "{repo|escape}" is unknown, sorry.

      <br/>

      <br/>

      Please go back to the <a href="{url|urlescape}">main repository list page</a>.

      </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>Mercurial repository not found</title>
				</head>

				<body>

				<div class="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo\|escape}
				</div>

				<div class="page_body">
				The specified repository "{repo\|escape}" is unknown, sorry.
				<br/>
				<br/>
				Please go back to the <a href="{url\|urlescape}">main repository list page</a>.
				</div>

				{footer}