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

av6 - - Load All Authors

File last commit:

r35623:45a81636 default


                r39302:82555d71

default

Download file

             graph.tmpl
        
                    53 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / graph.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

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

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

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

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

      </head>

      <body>

      <div class="buttons">

      <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>

      <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>

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

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

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

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

      </div>

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

      <form action="{url|urlescape}log">

      {sessionvars%hiddenformentry}

      <p>

      <label for="search1">search:</label>

      <input name="rev" id="search1" type="text" size="30">

      navigate: <small class="navigate">{changenav%navgraph}</small>

      </p>

      </form>

      <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>

      <div id="wrapper">

      <canvas id="graph"></canvas>

      <ul id="graphnodes">{nodes%graphentry}</ul>

      </div>

      <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>

      var data = {jsdata|json};

      var graph = new Graph();

      graph.scale({bg_height});

      graph.render(data);

      </script>

      <form action="{url|urlescape}log">

      {sessionvars%hiddenformentry}

      <p>

      <label for="search1">search:</label>

      <input name="rev" id="search1" type="text" size="30">

      navigate: <small class="navigate">{changenav%navgraph}</small>

      </p>

      </form>

      {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}: graph</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url\|urlescape}atom-tags" title="Atom feed for {repo\|escape}: tags">
				<link rel="alternate" type="application/rss+xml"
				href="{url\|urlescape}rss-tags" title="RSS feed for {repo\|escape}: tags">
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
				<a href="{url\|urlescape}file/{symrev}/{sessionvars%urlparameter}">files</a>
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>

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

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search1">search:</label>
				<input name="rev" id="search1" type="text" size="30">
				navigate: <small class="navigate">{changenav%navgraph}</small>
				</p>
				</form>

				<noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>

				<div id="wrapper">
				<canvas id="graph"></canvas>
				<ul id="graphnodes">{nodes%graphentry}</ul>
				</div>

				<script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
				var data = {jsdata\|json};
				var graph = new Graph();
				graph.scale({bg_height});
				graph.render(data);
				</script>

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search1">search:</label>
				<input name="rev" id="search1" type="text" size="30">
				navigate: <small class="navigate">{changenav%navgraph}</small>
				</p>
				</form>

				{footer}