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

rollback: avoid unsafe rollback when not at tip (issue2998)...

rollback: avoid unsafe rollback when not at tip (issue2998) You can get into trouble if you commit, update back to an older changeset, and then rollback. The update removes your valuable changes from the working dir, then rollback removes them history. Oops: you've just irretrievably lost data running nothing but core Mercurial commands. (More subtly: rollback from a shared clone that was already at an older changeset -- no update required, just rollback from the wrong directory.) The fix assumes that only "commit" transactions have irreplaceable data, and allows rolling back non-commit transactions as always. But when rolling back a commit, check that the working dir is checked out to tip, i.e. the changeset we're about to destroy. If not, abort. You can get back the old (dangerous) behaviour with --force.

Benoit Allard - - Load All Authors

File last commit:

r14046:b24e5a70 default


                r15183:59e8bc22

default

Download file

             graph.tmpl
        
                    128 lines
            
             | 3.8 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">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph

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

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

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

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

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

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

      <!-- 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 = '';

        Yuya Nishihara
    
hgweb: add bookmark labels to gitweb theme (based on 270f57d35525)

              r13863
            
      	if (cur[7].length || cur[8].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> ';

      			}

      		}

        Yuya Nishihara
    
hgweb: add bookmark labels to gitweb theme (based on 270f57d35525)

              r13863
            
      		if (cur[8].length) \{

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

      				var bookmark = cur[8][t];

      				tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';

      			}

      		}

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

              r9999
            
      		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">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / graph
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</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> \|
Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<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>
		<!-- 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 = '';
Yuya Nishihara hgweb: add bookmark labels to gitweb theme (based on 270f57d35525)	r13863	if (cur[7].length \|\| cur[8].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> ';
		}
		}
Yuya Nishihara hgweb: add bookmark labels to gitweb theme (based on 270f57d35525)	r13863	if (cur[8].length) \{
		for (var t in cur[8]) \{
		var bookmark = cur[8][t];
		tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';
		}
		}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	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}