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

filemerge: call premerge directly from main merge function...

filemerge: call premerge directly from main merge function The merge code currently does (in pseudocode): for f in tomerge: premerge f merge f We'd like to change this to look more like: for f in tomerge: premerge f for f in tomerge: merge f This makes sure as many files are resolved as possible before prompting for the others. This restructuring is also necessary for custom merge drivers. This function separates out the premerge step from the merge step. In future patches we'll actually turn these into separate steps in the merge driver. The 'if r:' occurrences will be cleaned up in subsequent patches.

av6 - - Load All Authors

File last commit:

r25605:dd893046 default


                r26567:f18646cf

default

Download file

             graph.tmpl
        
                    122 lines
            
             | 3.9 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / 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-log" title="Atom feed for {repo|escape}"/>

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

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

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

      </head>

      <body>

      <div class="page_header">

      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

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

      </div>

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

      {sessionvars%hiddenformentry}

      <div class="search">

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

      </div>

      </form>

      <div class="page_nav">

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

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

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

      graph |

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

      <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</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>

      <br/>

      <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>

      <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>

      | {changenav%navgraph}<br/>

      </div>

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

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

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

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

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

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

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

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

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

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

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

      		}

      		if (cur[7].length) \{

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

      				var tag = cur[7][t];

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

      			}

      		}

      		if (cur[8].length) \{

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

      				var bookmark = cur[8][t];

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

      			}

      		}

      		tagspan += '</span>';

      	}

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

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

      	item += '</span> ' + tagspan + '';

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

      	return [bg, item];

      }

      graph.render(data);

      // stop hiding script -->

      </script>

      <div class="page_nav">

      <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>

      <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>

      | {changenav%navgraph}

      </div>

      <script type="text/javascript">

          ajaxScrollInit(

                  '{url|urlescape}graph/{rev}?revcount=%next%&style={style}',

                  {revcount}+60,

                  function (htmlText, previousVal) \{ return previousVal + 60; },

                  '#wrapper',

                  '<div class="%class%" style="text-align: center;">%text%</div>',

                  'graph'

          );

      </script>

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

				<div class="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb} / graph
				</div>

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<div class="search">
				<input type="text" name="rev" />
				</div>
				</form>
				<div class="page_nav">
				<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
				<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> \|
				graph \|
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
				<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</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>
				<br/>
				<a href="{url\|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>
				\| {changenav%navgraph}<br/>
				</div>

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

				<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>
				<!-- 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 tagspan = '';
				if (cur[7].length \|\| cur[8].length \|\| (cur[6][0] != 'default' \|\| cur[6][1])) \{
				tagspan = '<span class="logtags">';
				if (cur[6][1]) \{
				tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
				tagspan += cur[6][0] + '</span> ';
				} else if (!cur[6][1] && cur[6][0] != 'default') \{
				tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
				tagspan += cur[6][0] + '</span> ';
				}
				if (cur[7].length) \{
				for (var t in cur[7]) \{
				var tag = cur[7][t];
				tagspan += '<span class="tagtag">' + tag + '</span> ';
				}
				}
				if (cur[8].length) \{
				for (var t in cur[8]) \{
				var bookmark = cur[8][t];
				tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';
				}
				}
				tagspan += '</span>';
				}

				var item = '<li style="' + nstyle + '"><span class="desc">';
				item += '<a class="list" href="{url\|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '"><b>' + cur[3] + '</b></a>';
				item += '</span> ' + tagspan + '';
				item += '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';

				return [bg, item];

				}

				graph.render(data);

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

				<div class="page_nav">
				<a href="{url\|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>
				\| {changenav%navgraph}
				</div>

				<script type="text/javascript">
				ajaxScrollInit(
				'{url\|urlescape}graph/{rev}?revcount=%next%&style={style}',
				{revcount}+60,
				function (htmlText, previousVal) \{ return previousVal + 60; },
				'#wrapper',
				'<div class="%class%" style="text-align: center;">%text%</div>',
				'graph'
				);
				</script>

				{footer}