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

dirstate: avoid a race with multiple commits in the same process...

dirstate: avoid a race with multiple commits in the same process (issue2264, issue2516) The race happens when two commits in a row change the same file without changing its size, *if* those two commits happen in the same second in the same process while holding the same repo lock. For example: commit 1: M a M b commit 2: # same process, same second, same repo lock M b # modify b without changing its size M c This first manifested in transplant, which is the most common way to do multiple commits in the same process. But it can manifest in any script or extension that does multiple commits under the same repo lock. (Thus, the test script tests both transplant and a custom script.) The problem was that dirstate.status() failed to notice the change to b when localrepo is about to do the second commit, meaning that change gets left in the working directory. In the context of transplant, that means either a crash ("RuntimeError: nothing committed after transplant") or a silently inaccurate transplant, depending on whether any other files were modified by the second transplanted changeset. The fix is to make status() work a little harder when we have previously marked files as clean (state 'normal') in the same process. Specifically, dirstate.normal() adds files to self._lastnormal, and other state-changing methods remove them. Then dirstate.status() puts any files in self._lastnormal into state 'lookup', which will make localrepository.status() read file contents to see if it has really changed. So we pay a small performance penalty for the second (and subsequent) commits in the same process, without affecting the common case. Anything that does lots of status updates and checks in the same process could suffer a performance hit. Incidentally, there is a simpler fix: call dirstate.normallookup() on every file updated by commit() at the end of the commit. The trouble with that solution is that it imposes a performance penalty on the common case: it means the next status-dependent hg command after every "hg commit" will be a little bit slower. The patch here is more complex, but only affects performance for the uncommon case.

Dirkjan Ochtman - - Load All Authors

File last commit:

r13610:7359cb75 stable


                r13704:a464763e

default

Download file

             graph.tmpl
        
                    122 lines
            
             | 3.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / 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"

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

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

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

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

      </head>

      <body>

      <div class="page_header">

      <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph

      </div>

      <form action="{url}log">

      {sessionvars%hiddenformentry}

      <div class="search">

      <input type="text" name="rev"  />

      </div>

      </form>

      <div class="page_nav">

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

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

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

      graph |

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

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

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |

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

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

              r9999
            
      <br/>

      <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>

      <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>

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

              r10254
            
      | {changenav%navgraph}<br/>

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

              r9999
            
      </div>

      <div class="title">&nbsp;</div>

      <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" src="{staticurl}graph.js"></script>

      <script>

      <!-- hide script content

      var data = {jsdata|json};

      var graph = new Graph();

      graph.scale({bg_height});

        Matt Mackall
    
templates: escape javascript braces

              r10856
            
      graph.edge = function(x0, y0, x1, y1, color) \{

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

              r9999
            
      	this.setColor(color, 0.0, 0.65);

      	this.ctx.beginPath();

      	this.ctx.moveTo(x0, y0);

      	this.ctx.lineTo(x1, y1);

      	this.ctx.stroke();

      }

      var revlink = '<li style="_STYLE"><span class="desc">';

      revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>';

      revlink += '</span> _TAGS';

        Martin Geisler
    
Merge with stable

              r10278
            
      revlink += '<span class="info">_DATE, by _USER</span></li>';

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

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

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

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

      	var item = revlink.replace(/_STYLE/, nstyle);

      	item = item.replace(/_PARITY/, 'parity' + parity);

      	item = item.replace(/_NODEID/, cur[0]);

      	item = item.replace(/_NODEID/, cur[0]);

      	item = item.replace(/_DESC/, cur[3]);

      	item = item.replace(/_USER/, cur[4]);

      	item = item.replace(/_DATE/, cur[5]);

      	var tagspan = '';

        Matt Mackall
    
templates: escape javascript braces

              r10856
            
      	if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) \{

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

              r9999
            
      		tagspan = '<span class="logtags">';

        Matt Mackall
    
templates: escape javascript braces

              r10856
            
      		if (cur[6][1]) \{

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

              r9999
            
      			tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';

      			tagspan += cur[6][0] + '</span> ';

        Matt Mackall
    
templates: escape javascript braces

              r10856
            
      		} else if (!cur[6][1] && cur[6][0] != 'default') \{

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

              r9999
            
      			tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';

      			tagspan += cur[6][0] + '</span> ';

      		}

        Matt Mackall
    
templates: escape javascript braces

              r10856
            
      		if (cur[7].length) \{

      			for (var t in cur[7]) \{

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

              r9999
            
      				var tag = cur[7][t];

      				tagspan += '<span class="tagtag">' + tag + '</span> ';

      			}

      		}

      		tagspan += '</span>';

      	}

      	item = item.replace(/_TAGS/, tagspan);

      	return [bg, item];

      }

      graph.render(data);

      // stop hiding script -->

      </script>

      <div class="page_nav">

      <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>

      <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>

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

              r10254
            
      | {changenav%navgraph}

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

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

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"
		href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
		<link rel="alternate" type="application/rss+xml"
		href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
		<!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]-->
		</head>
		<body>

		<div class="page_header">
		<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / graph
		</div>

		<form action="{url}log">
		{sessionvars%hiddenformentry}
		<div class="search">
		<input type="text" name="rev" />
		</div>
		</form>
		<div class="page_nav">
		<a href="{url}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> \|
		graph \|
		<a href="{url}tags{sessionvars%urlparameter}">tags</a> \|
		<a href="{url}branches{sessionvars%urlparameter}">branches</a> \|
Augie Fackler web: add a help view for getting hg help output	r12666	<a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a> \|
		<a href="{url}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<br/>
		<a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
		<a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	\| {changenav%navgraph}<br/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="title"> </div>

		<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" src="{staticurl}graph.js"></script>
		<script>
		<!-- hide script content

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

Matt Mackall templates: escape javascript braces	r10856	graph.edge = function(x0, y0, x1, y1, color) \{
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		this.setColor(color, 0.0, 0.65);
		this.ctx.beginPath();
		this.ctx.moveTo(x0, y0);
		this.ctx.lineTo(x1, y1);
		this.ctx.stroke();

		}

		var revlink = '<li style="_STYLE"><span class="desc">';
		revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>';
		revlink += '</span> _TAGS';
Martin Geisler Merge with stable	r10278	revlink += '<span class="info">_DATE, by _USER</span></li>';
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
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>';
		var left = (this.columns + 1) * this.bg_height;
		var nstyle = 'padding-left: ' + left + 'px;';
		var item = revlink.replace(/_STYLE/, nstyle);
		item = item.replace(/_PARITY/, 'parity' + parity);
		item = item.replace(/_NODEID/, cur[0]);
		item = item.replace(/_NODEID/, cur[0]);
		item = item.replace(/_DESC/, cur[3]);
		item = item.replace(/_USER/, cur[4]);
		item = item.replace(/_DATE/, cur[5]);

		var tagspan = '';
Matt Mackall templates: escape javascript braces	r10856	if (cur[7].length \|\| (cur[6][0] != 'default' \|\| cur[6][1])) \{
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	tagspan = '<span class="logtags">';
Matt Mackall templates: escape javascript braces	r10856	if (cur[6][1]) \{
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
		tagspan += cur[6][0] + '</span> ';
Matt Mackall templates: escape javascript braces	r10856	} else if (!cur[6][1] && cur[6][0] != 'default') \{
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
		tagspan += cur[6][0] + '</span> ';
		}
Matt Mackall templates: escape javascript braces	r10856	if (cur[7].length) \{
		for (var t in cur[7]) \{
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	var tag = cur[7][t];
		tagspan += '<span class="tagtag">' + tag + '</span> ';
		}
		}
		tagspan += '</span>';
		}

		item = item.replace(/_TAGS/, tagspan);
		return [bg, item];

		}

		graph.render(data);

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

		<div class="page_nav">
		<a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
		<a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	\| {changenav%navgraph}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		{footer}