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

             branches.tmpl
        
                    53 lines
            
             | 1.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / branches.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: branches</title>

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

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

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

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

      </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 class="active">branches</li>

      </ul>

      <ul>

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

      </ul>

      <div class="atom-logo">

      <a href="{url|urlescape}atom-branches" title="subscribe to atom feed">

      <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />

      </a>

      </div>

      </div>

      <div class="main">

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

      <h3>branches</h3>

      {searchform}

      <table class="bigtable">

      <thead>

      <tr>

       <th>branch</th>

       <th>node</th>

      </tr>

      </thead>

      <tbody class="stripes2">

      {entries % branchentry}

      </tbody>

      </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>{repo\|escape}: branches</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url\|urlescape}atom-branches" title="Atom feed for {repo\|escape}: branches" />
				<link rel="alternate" type="application/rss+xml"
				href="{url\|urlescape}rss-branches" title="RSS feed for {repo\|escape}: branches" />
				</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 class="active">branches</li>
				</ul>
				<ul>
				<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				<div class="atom-logo">
				<a href="{url\|urlescape}atom-branches" title="subscribe to atom feed">
				<img class="atom-logo" src="{staticurl\|urlescape}feed-icon-14x14.png" alt="atom feed" />
				</a>
				</div>
				</div>

				<div class="main">
				<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
				<h3>branches</h3>

				{searchform}

				<table class="bigtable">
				<thead>
				<tr>
				<th>branch</th>
				<th>node</th>
				</tr>
				</thead>
				<tbody class="stripes2">
				{entries % branchentry}
				</tbody>
				</table>
				</div>
				</div>

				{footer}