upstream/mercurial-mirror Files · mercurial/templates/spartan/graph.tmpl

convert: fix bad conversion of copies when hg.startrev is specified...

convert: fix bad conversion of copies when hg.startrev is specified The 'copynode' was looked up in self.keep as if it was a changeset node. It is however a filelog node, and self.keep would thus fail if it actually looked at its parameter ... which it only did if a startrev was specified. Instead we now don't check the copy node - we don't have to. It must have been copied from one of the parents, and we already check whether one of the parents have the copy source. We could perhaps use linkrev to see if the corresponding changeset was converted ... but that would sometimes be wrong. The existing test of this was wrong - now it is better, but it seems like it exposes a 'log' issue.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r19457:948df0f1

default

Download file

             graph.tmpl
        
                    78 lines
            
             | 2.5 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">

      <!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]-->

      </head>

      <body>

      <div class="buttons">

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

      <a href="{url|urlescape}shortlog{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/{node|short}/{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">

      <ul id="nodebgs"></ul>

      <canvas id="graph" width="480" height="{canvasheight}"></canvas>

      <ul id="graphnodes"></ul>

      </div>

      <script type="text/javascript">

      <!-- hide script content

      var data = {jsdata|json};

      var graph = new Graph();

      graph.scale({bg_height});

      graph.vertex = function(x, y, color, parity, cur) \{

      	this.ctx.beginPath();

      	color = this.setColor(color, 0.25, 0.75);

      	this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);

      	this.ctx.fill();

      	var bg = '<li class="bg parity' + parity + '"></li>';

      	var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size;

      	var nstyle = 'padding-left: ' + left + 'px;';

      	var item = '<li style="' + nstyle + '"><span class="desc">';

      	item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';

      	item += '</span><span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';

      	return [bg, item];

      }

      graph.render(data);

      // stop hiding script -->

      </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">
				<!--[if IE]><script type="text/javascript" src="{staticurl\|urlescape}excanvas.js"></script><![endif]-->
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog{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/{node\|short}/{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">
				<ul id="nodebgs"></ul>
				<canvas id="graph" width="480" height="{canvasheight}"></canvas>
				<ul id="graphnodes"></ul>
				</div>

				<script type="text/javascript">
				<!-- hide script content

				var data = {jsdata\|json};
				var graph = new Graph();
				graph.scale({bg_height});

				graph.vertex = function(x, y, color, parity, cur) \{

				this.ctx.beginPath();
				color = this.setColor(color, 0.25, 0.75);
				this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
				this.ctx.fill();

				var bg = '<li class="bg parity' + parity + '"></li>';
				var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size;
				var nstyle = 'padding-left: ' + left + 'px;';
				var item = '<li style="' + nstyle + '"><span class="desc">';
				item += '<a href="{url\|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
				item += '</span><span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';

				return [bg, item];

				}

				graph.render(data);

				// stop hiding script -->
				</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}