mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
cd5e04a455
Before this patch, template files for "graph" web page use fixed width
size "480" for canvas element.
This causes pruned lanes and invisible vertexes, if there are 16 or
more vertical lanes at once. In such case, part of graph in right side
area over 480 is invisible, even though corresponded summary text
blocks are visible correctly.
This limitation isn't reasonable for workflow using many branches at
once (e.g. "one branch per issue" workflow).
There were changes below related to width of canvas:
- 6c855f5350cd (templates: widen the graph canvas (issue2683)),
released as a part of Mercurial 1.8.2
According to the description, this assumed that 15 parallel
branches was enough for ordinary workflow, and bumped width of
canvas up from 224 to 480.
- f5506d2a674c (hgweb: make graph data suitable for template usage),
released as a part of Mercurial 2.3
This introduced "canvaswidth" template keyword as a part of
refactoring around graph rendering.
But 'width="480"' of canvas element in template files wasn't
replaced by 'width="{canvaswidth}"' in it (or subsequent one).
This patch uses dynamic value "{canvaswidth}" instead of fixed width
size "480" for canvas element.
This is posted for "stable", because:
- this is re-fixing issue2683
- this is simple enough for stable
- using "{canvaswidth}" doesn't require any additional cost
Calculation of canvaswidth is already implied as a part of "graph"
web command.
119 lines
4.6 KiB
Cheetah
119 lines
4.6 KiB
Cheetah
{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 id="container">
|
|
<div class="page-header">
|
|
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1>
|
|
|
|
<form action="{url|urlescape}log">
|
|
{sessionvars%hiddenformentry}
|
|
<dl class="search">
|
|
<dt><label>Search: </label></dt>
|
|
<dd><input type="text" name="rev" /></dd>
|
|
</dl>
|
|
</form>
|
|
|
|
<ul class="page-nav">
|
|
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
|
|
<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
|
|
<li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
|
|
<li class="current">graph</li>
|
|
<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
|
|
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
|
|
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
|
|
<li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>
|
|
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
|
|
</ul>
|
|
</div>
|
|
|
|
<h2 class="no-link no-border">graph</h2>
|
|
|
|
<div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
|
|
<div id="wrapper">
|
|
<ul id="nodebgs"></ul>
|
|
<canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas>
|
|
<ul id="graphnodes"></ul>
|
|
</div>
|
|
|
|
<script>
|
|
<!-- hide script content
|
|
|
|
document.getElementById('noscript').style.display = 'none';
|
|
|
|
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 href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
|
|
item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';
|
|
|
|
return [bg, item];
|
|
|
|
}
|
|
|
|
graph.render(data);
|
|
|
|
// stop hiding script -->
|
|
</script>
|
|
|
|
<div class="page-path">
|
|
<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}
|