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

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

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.
Dirkjan Ochtman - - Load All Authors

File last commit:

r8936:1de6e7e1 default
r9115:b55d4471 default
Show More
test-hgweb-removed.out
180 lines | 4.6 KiB | text/plain | TextLexer
/ tests / test-hgweb-removed.out
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183 % setting up repo
adding a
% set up hgweb
% revision
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: working diff for removed files
 r7183 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
 r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183 <meta name="robots" content="index, nofollow" />
Matt Mackall
hgweb: update tests for paper style...
 r7339 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183
Matt Mackall
hgweb: update tests for paper style...
 r7339 <title>test: c78f6c5cbea9</title>
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183 </head>
<body>
Matt Mackall
hgweb: update tests for paper style...
 r7339 <div class="container">
<div class="menu">
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183 <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: working diff for removed files
 r7183 </div>
Matt Mackall
hgweb: update tests for paper style...
 r7339 <ul>
<li><a href="/shortlog/c78f6c5cbea9">log</a></li>
<li><a href="/graph/c78f6c5cbea9">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>
Matt Mackall
hgweb: update tests for paper style...
 r7339 </ul>
<ul>
<li class="active">changeset</li>
<li><a href="/raw-rev/c78f6c5cbea9">raw</a></li>
<li><a href="/file/c78f6c5cbea9">browse</a></li>
</ul>
<ul>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
Dirkjan Ochtman
coal/paper: show branch name in changeset view
 r7410 <h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3>
Matt Mackall
hgweb: update tests for paper style...
 r7339
<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>
Matt Mackall
hgweb: update tests for paper style...
 r7339 </form>
<div class="description">del</div>
<table id="changesetEntry">
<tr>
<th class="author">author</th>
<td class="author">&#116;&#101;&#115;&#116;</td>
</tr>
<tr>
<th class="date">date</th>
Gilles Moris
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py...
 r7544 <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
Matt Mackall
hgweb: update tests for paper style...
 r7339 <tr>
<th class="author">parents</th>
<td class="author"><a href="/rev/cb9a9f314b8b">cb9a9f314b8b</a> </td>
</tr>
<tr>
<th class="author">children</th>
<td class="author"></td>
</tr>
<tr>
<th class="files">files</th>
<td class="files">a </td>
</tr>
</table>
<div class="overflow">
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
 r7395 <div class="sourcefirst"> line diff</div>
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
 r8369 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- a/a Thu Jan 01 00:00:00 1970 +0000
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
 r7395 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -1,1 +0,0 @@
</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="minusline">-a
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
 r8369 </span></pre></div>
Matt Mackall
hgweb: update tests for paper style...
 r7339 </div>
</div>
</div>
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183
</body>
</html>
% diff removed file
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: working diff for removed files
 r7183 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
 r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183 <meta name="robots" content="index, nofollow" />
Matt Mackall
hgweb: update tests for paper style...
 r7339 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183
<title>test: a diff</title>
</head>
<body>
Matt Mackall
hgweb: update tests for paper style...
 r7339 <div class="container">
<div class="menu">
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183 <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: working diff for removed files
 r7183 </div>
Matt Mackall
hgweb: update tests for paper style...
 r7339 <ul>
<li><a href="/shortlog/c78f6c5cbea9">log</a></li>
<li><a href="/graph/c78f6c5cbea9">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>
Matt Mackall
hgweb: update tests for paper style...
 r7339 </ul>
<ul>
<li><a href="/rev/c78f6c5cbea9">changeset</a></li>
<li><a href="/file/c78f6c5cbea9">browse</a></li>
</ul>
<ul>
<li><a href="/file/c78f6c5cbea9/a">file</a></li>
<li class="active">diff</li>
<li><a href="/annotate/c78f6c5cbea9/a">annotate</a></li>
<li><a href="/log/c78f6c5cbea9/a">file log</a></li>
<li><a href="/raw-file/c78f6c5cbea9/a">raw</a></li>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
<h3>diff a @ 1:c78f6c5cbea9</h3>
<form class="search" action="/log">
Benoit Allard
coal/paper: switch to XHTML 1.1
 r7725 <p></p>
<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>
Matt Mackall
hgweb: update tests for paper style...
 r7339 </form>
<div class="description">del</div>
<table id="changesetEntry">
<tr>
<th>author</th>
<td>&#116;&#101;&#115;&#116;</td>
</tr>
<tr>
<th>date</th>
Gilles Moris
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py...
 r7544 <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
Matt Mackall
hgweb: update tests for paper style...
 r7339 </tr>
<tr>
<th>parents</th>
<td><a href="/file/cb9a9f314b8b/a">cb9a9f314b8b</a> </td>
</tr>
<tr>
<th>children</th>
<td></td>
</tr>
</table>
<div class="overflow">
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
 r7395 <div class="sourcefirst"> line diff</div>
Matt Mackall
hgweb: update tests for paper style...
 r7339
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
 r8369 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- a/a Thu Jan 01 00:00:00 1970 +0000
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
 r7395 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -1,1 +0,0 @@
</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="minusline">-a
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
 r8369 </span></pre></div>
Matt Mackall
hgweb: update tests for paper style...
 r7339 </div>
</div>
</div>
Dirkjan Ochtman
hgweb: working diff for removed files
 r7183
</body>
</html>