##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

update: add comments and test cases for updating across branches...
update: add comments and test cases for updating across branches Add comment to merge.py:update() showing various cases of 'hg update': to a descendant, crossing named branches, and crossing branches within a named branch; with no option, -c or -C; with or without uncommitted changes; and with or without a specific revision. Add tests for all of these cases.
Dirkjan Ochtman - - Load All Authors

File last commit:

r8936:1de6e7e1 default
r9716:ea8c207a default
Show More
graph.tmpl
121 lines | 3.6 KiB | application/x-cheetah | CheetahLexer
/ templates / gitweb / graph.tmpl
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 {header}
<title>{repo|escape}: Graph</title>
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 <link rel="alternate" type="application/atom+xml"
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 href="{url}atom-log" title="Atom feed for {repo|escape}"/>
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 <link rel="alternate" type="application/rss+xml"
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 href="{url}rss-log" title="RSS feed for {repo|escape}"/>
Dirkjan Ochtman
gitweb: fix graph again after previous faulty commit (1e0677756f60)
 r7445 <!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]-->
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 </head>
<body>
<div class="page_header">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
 r8936 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 </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> |
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 graph |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
Sune Foldager
gitweb: add branches page
 r8356 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 <br/>
Dirkjan Ochtman
hgweb: fix up the less/more links on the graph page...
 r7345 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
<a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 | {changenav%navgraphentry}<br/>
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 </div>
<div class="title">&nbsp;</div>
Benoit Allard
graph: replace the blinking no javascript message
 r7124 <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693
<div id="wrapper">
<ul id="nodebgs"></ul>
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 <canvas id="graph" width="224" height="{canvasheight}"></canvas>
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 <ul id="graphnodes"></ul>
</div>
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 <script type="text/javascript" src="{staticurl}graph.js"></script>
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 <script>
Dirkjan Ochtman
graph: improve script hiding tricks
 r6729 <!-- hide script content
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693
Benoit Allard
graph: fix JavaScript issues to make it work on IE
 r6733 var data = {jsdata|json};
var graph = new Graph();
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 graph.scale({bg_height});
graph.edge = function(x0, y0, x1, y1, color) {
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';
revlink += '<span class="info">_DATE ago, by _USER</span></li>';
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.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]);
Martin Geisler
webcommands: move nonempty logic from JavaScript to Python...
 r8236 item = item.replace(/_DESC/, cur[3]);
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 item = item.replace(/_USER/, cur[4]);
item = item.replace(/_DATE/, cur[5]);
Dirkjan Ochtman
graph: display branch name alongside tags
 r6720
var tagspan = '';
if (cur[7].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> ';
}
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 }
tagspan += '</span>';
}
Dirkjan Ochtman
graph: display branch name alongside tags
 r6720
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 item = item.replace(/_TAGS/, tagspan);
Augie Fackler
graph: optimize rendering by appending all nodes at once
 r6728 return [bg, item];
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693
}
graph.render(data);
Dirkjan Ochtman
graph: improve script hiding tricks
 r6729
// stop hiding script -->
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 </script>
<div class="page_nav">
Dirkjan Ochtman
hgweb: fix up the less/more links on the graph page...
 r7345 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
<a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
Dirkjan Ochtman
templates: fix navigation links for graph entries
 r6701 | {changenav%navgraphentry}
Augie Fackler
hgweb: Fix up non-coal styles to support graph.
 r6693 </div>
Dirkjan Ochtman
git: use newer template syntax everywhere
 r8427 {footer}