##// END OF EJS Templates
inotify: server: new data structure to keep track of changes....
inotify: server: new data structure to keep track of changes. == Rationale for the new structure == Current structure was a dictionary tree. One directory was tracked as a dictionary: - keys: file/subdir name - values: - for a file, the status (a/r/m/...) - for a subdir, the directory representing the subdir It allowed efficient lookups, no matter of the type of the terminal leaf: for part in path.split('/'): tree = tree[part] However, there is no way to represent a directory and a file with the same name because keys are conflicting in the dictionary. Concrete example: Initial state: root dir |- foo (file) |- bar (file) # data state is: {'foo': 'n', 'bar': 'n'} Remove foo: root dir |- bar (file) # Data becomes {'foo': 'r'} until next commit. Add foo, as a directory, and foo/barbar file: root dir |- bar (file) |-> foo (dir) |- barbar (file) # New state should be represented as: {'foo': {'barbar': 'a'}, 'bar': 'n'} however, the key "foo" is already used and represents the old file. The dirstate: D foo A foo/barbar cannot be represented, hence the need for a new structure. == The new structure == 'directory' class. Represents one directory level. * Notable attributes: Two dictionaries: - 'files' Maps filename -> status for the current dir. - 'dirs' Maps subdir's name -> directory object representing the subdir * methods - walk(), formerly server.walk - lookup(), old server.lookup - dir(), old server.dir This new class allows embedding all the tree walks/lookups in its own class, instead of having everything mixed together in server. Incidently, since files and directories are not stored in the same dictionaries, we are solving the previous key conflict problem. The small drawback is that lookup operation is a bit more complex: for a path a/b/c/d/e we have to check twice the leaf, if e is a directory or a file.

File last commit:

r8936:1de6e7e1 default
r9115:b55d4471 default
Show More
test-hgweb-empty.out
348 lines | 8.8 KiB | text/plain | TextLexer
/ tests / test-hgweb-empty.out
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<title>test: log</title>
<link rel="alternate" type="application/atom+xml"
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 href="/atom-log" title="Atom feed for test" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <link rel="alternate" type="application/rss+xml"
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 href="/rss-log" title="RSS feed for test" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </div>
<ul>
<li class="active">log</li>
<li><a href="/graph/000000000000">graph</a></li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </ul>
<ul>
<li><a href="/rev/000000000000">changeset</a></li>
<li><a href="/file/000000000000">browse</a></li>
</ul>
<ul>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
<h3>log</h3>
<form class="search" action="/log">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </form>
<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
<table class="bigtable">
<tr>
<th class="age">age</th>
<th class="author">author</th>
<th class="description">description</th>
</tr>
</table>
<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
</div>
</div>
</body>
</html>
200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<title>test: log</title>
<link rel="alternate" type="application/atom+xml"
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 href="/atom-log" title="Atom feed for test" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <link rel="alternate" type="application/rss+xml"
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 href="/rss-log" title="RSS feed for test" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </div>
<ul>
<li class="active">log</li>
<li><a href="/graph/000000000000">graph</a></li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </ul>
<ul>
<li><a href="/rev/000000000000">changeset</a></li>
<li><a href="/file/000000000000">browse</a></li>
</ul>
<ul>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
<h3>log</h3>
<form class="search" action="/log">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </form>
<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
<table class="bigtable">
<tr>
<th class="age">age</th>
<th class="author">author</th>
<th class="description">description</th>
</tr>
</table>
<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
</div>
</div>
</body>
</html>
200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<title>test: revision graph</title>
<link rel="alternate" type="application/atom+xml"
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 href="/atom-log" title="Atom feed for test: log" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <link rel="alternate" type="application/rss+xml"
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 href="/rss-log" title="RSS feed for test: log" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <!--[if IE]><script type="text/javascript" src="/static/excanvas.js"></script><![endif]-->
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </div>
<ul>
<li><a href="/shortlog/000000000000">log</a></li>
<li class="active">graph</li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </ul>
<ul>
<li><a href="/rev/000000000000">changeset</a></li>
<li><a href="/file/000000000000">browse</a></li>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
<h3>graph</h3>
<form class="search" action="/log">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </form>
<div class="navigate">
<a href="/graph/-1?revcount=12">less</a>
<a href="/graph/-1?revcount=50">more</a>
| rev -1: <a href="/graph/000000000000">(0)</a> <a href="/graph/tip">tip</a>
</div>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565
<div id="wrapper">
<ul id="nodebgs"></ul>
<canvas id="graph" width="224" height="12"></canvas>
<ul id="graphnodes"></ul>
</div>
<script type="text/javascript" src="/static/graph.js"></script>
<script type="text/javascript">
<!-- hide script content
var data = [];
var graph = new Graph();
graph.scale(39);
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 href="/rev/_NODEID" title="_NODEID">_DESC</a>';
revlink += '</span>_TAGS<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]);
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 item = item.replace(/_USER/, cur[4]);
item = item.replace(/_DATE/, cur[5]);
var tagspan = '';
if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
tagspan = '<span class="logtags">';
if (cur[6][1]) {
tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';
tagspan += cur[6][0] + '</span> ';
} else if (!cur[6][1] && cur[6][0] != 'default') {
tagspan += '<span class="branchname" 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="tag">' + tag + '</span> ';
}
}
tagspan += '</span>';
}
item = item.replace(/_TAGS/, tagspan);
return [bg, item];
}
graph.render(data);
// stop hiding script -->
</script>
<div class="navigate">
<a href="/graph/-1?revcount=12">less</a>
<a href="/graph/-1?revcount=50">more</a>
| rev -1: <a href="/graph/000000000000">(0)</a> <a href="/graph/tip">tip</a>
</div>
</div>
</div>
</body>
</html>
200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 <meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<title>test: 000000000000 /</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </div>
<ul>
<li><a href="/shortlog/000000000000">log</a></li>
<li><a href="/graph/000000000000">graph</a></li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </ul>
<ul>
<li><a href="/rev/000000000000">changeset</a></li>
<li class="active">browse</li>
</ul>
<ul>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
<h3>directory / @ -1:000000000000 <span class="tag">tip</span> </h3>
<form class="search" action="/log">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
Dirkjan Ochtman
hgweb: fix problems with empty repositories
r7565 </form>
<table class="bigtable">
<tr>
<th class="name">name</th>
<th class="size">size</th>
<th class="permissions">permissions</th>
</tr>
<tr class="fileline parity0">
<td class="name"><a href="/file/000000000000/">[up]</a></td>
<td class="size"></td>
<td class="permissions">drwxr-xr-x</td>
</tr>
</table>
</div>
</div>
</body>
</html>