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

revset: fix iteration over ordered addset composed of non-ordered operands...

revset: fix iteration over ordered addset composed of non-ordered operands Before this change, doing ordered iteration over an 'addset' object composed of operands without fastasc or fastdesc method could result in duplicated entries. This was the result of applying '_iterordered' on an unordered set. We fix it by ensuring we iterate over the set in a sorted order. Using the fast iterator when it exists on any operand. We kill the '_iterator' method in the process because it did not make a lot of sense independently. Thanks goes to Yuya Nishihara for reporting the issue and analysing the cause.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r25115:5548f558

default

Download file

             graph.tmpl
        
                    78 lines
            
             | 2.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / graph.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

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

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </head>

      <body>

      <div class="buttons">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb, spartan: add "URL breadcrumbs"...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {sessionvars%hiddenformentry}

      <p>

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

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

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </p>

      </form>

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

      <div id="wrapper">

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

        Dirkjan Ochtman
    
templates: widen the graph canvas (issue2683)

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

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

      </div>

      <script type="text/javascript">

      <!-- hide script content

      var data = {jsdata|json};

      var graph = new Graph();

      graph.scale({bg_height});

        Matt Mackall
    
templates: escape javascript braces

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      	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>';

        Tim Delaney
    
hgweb: fix incorrect graph padding calculation (issue3626)...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

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

        Mads Kiilerich
    
hgweb: avoid bad $$ processing in graph (issue3601)...

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Mads Kiilerich
    
hgweb: avoid bad $$ processing in graph (issue3601)...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      	return [bg, item];

      }

      graph.render(data);

      // stop hiding script -->

      </script>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {sessionvars%hiddenformentry}

      <p>

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

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

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: graph</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-tags" title="Atom feed for {repo\|escape}: tags">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	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]-->
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>
		<body>

		<div class="buttons">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb, spartan: add "URL breadcrumbs"...	r18259	<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<p>
		<label for="search1">search:</label>
		<input name="rev" id="search1" type="text" size="30">
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	navigate: <small class="navigate">{changenav%navgraph}</small>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</p>
		</form>

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

		<div id="wrapper">
		<ul id="nodebgs"></ul>
Dirkjan Ochtman templates: widen the graph canvas (issue2683)	r13610	<canvas id="graph" width="480" height="{canvasheight}"></canvas>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<ul id="graphnodes"></ul>
		</div>

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

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

Matt Mackall templates: escape javascript braces	r10856	graph.vertex = function(x, y, color, parity, cur) \{
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		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>';
Tim Delaney hgweb: fix incorrect graph padding calculation (issue3626)...	r17580	var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size;
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	var nstyle = 'padding-left: ' + left + 'px;';
Mads Kiilerich hgweb: avoid bad $$ processing in graph (issue3601)...	r17421	var item = '<li style="' + nstyle + '"><span class="desc">';
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	item += '<a href="{url\|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
Mads Kiilerich hgweb: avoid bad $$ processing in graph (issue3601)...	r17421	item += '</span><span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	return [bg, item];

		}

		graph.render(data);

		// stop hiding script -->
		</script>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<p>
		<label for="search1">search:</label>
		<input name="rev" id="search1" type="text" size="30">
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	navigate: <small class="navigate">{changenav%navgraph}</small>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</p>
		</form>

		{footer}