Mercurial > hg

diff tests/test-hgweb-diffs.out @ 7339:d11473955d30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: update tests for paper style diff -r ca03debb3dcd -r 4e1e6aee37e8 tests/test-hgweb-commands.out Binary file tests/test-hgweb-commands.out has changed
author Matt Mackall <mpm@selenic.com>
date Thu, 06 Nov 2008 12:22:09 -0600
parents bd522d09d5e3
children bc158cd800fa
line wrap: on
line diff
--- a/tests/test-hgweb-diffs.out	Thu Nov 06 11:57:37 2008 -0600
+++ b/tests/test-hgweb-diffs.out	Thu Nov 06 12:22:09 2008 -0600
@@ -6,267 +6,385 @@
 % revision
 200 Script output follows
 
+<!-- quirksmode -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png">
 <meta name="robots" content="index, nofollow" />
-<link rel="stylesheet" href="/static/style.css" type="text/css" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
-<title>test: changeset 0cd96de13884</title>
+<title>test: 0cd96de13884</title>
 </head>
 <body>
-
-<div class="buttons">
-<a href="/log/0">changelog</a>
-<a href="/shortlog/0">shortlog</a>
-<a href="/graph">graph</a>
-<a href="/tags">tags</a>
-<a href="/file/0cd96de13884">files</a>
-<a href="/raw-rev/0cd96de13884">raw</a>
-
-</div>
-
-<h2>changeset: a</h2>
-
-<table id="changesetEntry">
-<tr>
- <th class="changeset">changeset 0:</th>
- <td class="changeset"><a href="/rev/0cd96de13884">0cd96de13884</a></td>
-</tr>
-
-<tr><th class="child">child 1:</th><td class="child"><a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td></tr>
-
-<tr>
- <th class="author">author:</th>
- <td class="author">&#116;&#101;&#115;&#116;</td>
-</tr>
-<tr>
- <th class="date">date:</th>
- <td class="date">Thu Jan 01 00:00:00 1970 +0000 (38 years ago)</td>
-</tr>
-<tr>
- <th class="files">files:</th>
- <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
-</tr>
-<tr>
- <th class="description">description:</th>
- <td class="description">a</td>
-</tr>
-</table>
-
-<div id="changesetDiff">
-<pre class="parity0"><span class="minusline"><a class="lineno" href="#l1.1" id="l1.1">     1.1</a>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-</span><span class="plusline"><a class="lineno" href="#l1.2" id="l1.2">     1.2</a>+++ b/a	Thu Jan 01 00:00:00 1970 +0000
-</span><span class="atline"><a class="lineno" href="#l1.3" id="l1.3">     1.3</a>@@ -0,0 +1,1 @@
-</span><span class="plusline"><a class="lineno" href="#l1.4" id="l1.4">     1.4</a>+a
-</span></pre><pre class="parity1"><span class="minusline"><a class="lineno" href="#l2.1" id="l2.1">     2.1</a>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-</span><span class="plusline"><a class="lineno" href="#l2.2" id="l2.2">     2.2</a>+++ b/b	Thu Jan 01 00:00:00 1970 +0000
-</span><span class="atline"><a class="lineno" href="#l2.3" id="l2.3">     2.3</a>@@ -0,0 +1,1 @@
-</span><span class="plusline"><a class="lineno" href="#l2.4" id="l2.4">     2.4</a>+b
-</span></pre>
-</div>
-
-
+<div class="container">
+<div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
+<ul>
+ <li><a href="/shortlog/0cd96de13884">log</a></li>
+ <li><a href="/graph/0cd96de13884">graph</a></li>
+ <li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+ <li class="active">changeset</li>
+ <li><a href="/raw-rev/0cd96de13884">raw</a></li>
+ <li><a href="/file/0cd96de13884">browse</a></li>
+</ul>
+<ul>
+ 
+</ul>
+</div>
+
+<div class="main">
+
+<h2><a href="/">test</a></h2>
+<h3>changeset 0:0cd96de13884 </h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision, 
+files, or words in the commit message</span>
+</form>
+
+<div class="description">a</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>
+ <td class="date">Thu Jan 01 00:00:00 1970 +0000 (38 years ago)</td></tr>
+<tr>
+ <th class="author">parents</th>
+ <td class="author"></td>
+</tr>
+<tr>
+ <th class="author">children</th>
+ <td class="author"><a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
+</tr>
+<tr>
+ <th class="files">files</th>
+ <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
+</tr>
+</table>
+
+<div class="overflow">
+<table class="bigtable">
+<tr>
+ <th class="lineno">line</th>
+ <th class="source">diff</th>
+</tr>
+</table>
+<table class="bigtable parity0"><tr><td class="lineno"><a href="#l1.1" id="l1.1">     1.1</a></td><td class="source minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+</td></tr><tr><td class="lineno"><a href="#l1.2" id="l1.2">     1.2</a></td><td class="source plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
+</td></tr><tr><td class="lineno"><a href="#l1.3" id="l1.3">     1.3</a></td><td class="source atline">@@ -0,0 +1,1 @@
+</td></tr><tr><td class="lineno"><a href="#l1.4" id="l1.4">     1.4</a></td><td class="source plusline">+a
+</td></tr></table><table class="bigtable parity1"><tr><td class="lineno"><a href="#l2.1" id="l2.1">     2.1</a></td><td class="source minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+</td></tr><tr><td class="lineno"><a href="#l2.2" id="l2.2">     2.2</a></td><td class="source plusline">+++ b/b	Thu Jan 01 00:00:00 1970 +0000
+</td></tr><tr><td class="lineno"><a href="#l2.3" id="l2.3">     2.3</a></td><td class="source atline">@@ -0,0 +1,1 @@
+</td></tr><tr><td class="lineno"><a href="#l2.4" id="l2.4">     2.4</a></td><td class="source plusline">+b
+</td></tr></table>
+</div>
+
+</div>
+</div>
+
 
 </body>
 </html>
 
-
-
 % diff removed file
 200 Script output follows
 
+<!-- quirksmode -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png">
 <meta name="robots" content="index, nofollow" />
-<link rel="stylesheet" href="/static/style.css" type="text/css" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a diff</title>
 </head>
 <body>
 
-<div class="buttons">
-<a href="/log/1">changelog</a>
-<a href="/shortlog/1">shortlog</a>
-<a href="/graph">graph</a>
-<a href="/tags">tags</a>
-<a href="/rev/78e4ebad7cdf">changeset</a>
-<a href="/file/78e4ebad7cdf/a">file</a>
-<a href="/log/78e4ebad7cdf/a">revisions</a>
-<a href="/annotate/78e4ebad7cdf/a">annotate</a>
-<a href="/raw-diff/78e4ebad7cdf/a">raw</a>
-</div>
-
-<h2>a</h2>
-
-<table id="filediffEntry">
-<tr>
- <th class="revision">revision 1:</th>
- <td class="revision"><a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
-</tr>
-
-
-</table>
-
-<div id="fileDiff">
-<pre class="parity0"><span class="minusline"><a class="lineno" href="#l1.1" id="l1.1">     1.1</a>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-</span><span class="plusline"><a class="lineno" href="#l1.2" id="l1.2">     1.2</a>+++ b/a	Thu Jan 01 00:00:00 1970 +0000
-</span><span class="atline"><a class="lineno" href="#l1.3" id="l1.3">     1.3</a>@@ -0,0 +1,1 @@
-</span><span class="plusline"><a class="lineno" href="#l1.4" id="l1.4">     1.4</a>+a
-</span></pre>
-</div>
-
-
+<div class="container">
+<div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
+<ul>
+<li><a href="/shortlog/78e4ebad7cdf">log</a></li>
+<li><a href="/graph/78e4ebad7cdf">graph</a></li>
+<li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+<li><a href="/rev/78e4ebad7cdf">changeset</a></li>
+<li><a href="/file/78e4ebad7cdf">browse</a></li>
+</ul>
+<ul>
+<li><a href="/file/78e4ebad7cdf/a">file</a></li>
+<li class="active">diff</li>
+<li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li>
+<li><a href="/log/78e4ebad7cdf/a">file log</a></li>
+<li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li>
+</ul>
+</div>
+
+<div class="main">
+<h2><a href="/">test</a></h2>
+<h3>diff a @ 1:78e4ebad7cdf</h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision, 
+files, or words in the commit message</span>
+</form>
+
+<div class="description">b</div>
+
+<table id="changesetEntry">
+<tr>
+ <th>author</th>
+ <td>&#116;&#101;&#115;&#116;</td>
+</tr>
+<tr>
+ <th>date</th>
+ <td>Thu Jan 01 00:00:00 1970 +0000 (38 years ago)</td>
+</tr>
+<tr>
+ <th>parents</th>
+ <td></td>
+</tr>
+<tr>
+ <th>children</th>
+ <td></td>
+</tr>
+
+</table>
+
+<div class="overflow">
+<table class="bigtable">
+<tr>
+ <th class="lineno">line</th>
+ <th class="source">diff</th>
+</tr>
+</table>
+
+<table class="bigtable parity0"><tr><td class="lineno"><a href="#l1.1" id="l1.1">     1.1</a></td><td class="source minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+</td></tr><tr><td class="lineno"><a href="#l1.2" id="l1.2">     1.2</a></td><td class="source plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
+</td></tr><tr><td class="lineno"><a href="#l1.3" id="l1.3">     1.3</a></td><td class="source atline">@@ -0,0 +1,1 @@
+</td></tr><tr><td class="lineno"><a href="#l1.4" id="l1.4">     1.4</a></td><td class="source plusline">+a
+</td></tr></table>
+</div>
+</div>
+</div>
+
+
 
 </body>
 </html>
 
-
-
 % set up hgweb with git diffs
 % revision
 200 Script output follows
 
+<!-- quirksmode -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png">
 <meta name="robots" content="index, nofollow" />
-<link rel="stylesheet" href="/static/style.css" type="text/css" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
-<title>test: changeset 0cd96de13884</title>
+<title>test: 0cd96de13884</title>
 </head>
 <body>
-
-<div class="buttons">
-<a href="/log/0">changelog</a>
-<a href="/shortlog/0">shortlog</a>
-<a href="/graph">graph</a>
-<a href="/tags">tags</a>
-<a href="/file/0cd96de13884">files</a>
-<a href="/raw-rev/0cd96de13884">raw</a>
-
-</div>
-
-<h2>changeset: a</h2>
-
-<table id="changesetEntry">
-<tr>
- <th class="changeset">changeset 0:</th>
- <td class="changeset"><a href="/rev/0cd96de13884">0cd96de13884</a></td>
-</tr>
-
-<tr><th class="child">child 1:</th><td class="child"><a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td></tr>
-
-<tr>
- <th class="author">author:</th>
- <td class="author">&#116;&#101;&#115;&#116;</td>
-</tr>
-<tr>
- <th class="date">date:</th>
- <td class="date">Thu Jan 01 00:00:00 1970 +0000 (38 years ago)</td>
-</tr>
-<tr>
- <th class="files">files:</th>
- <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
-</tr>
-<tr>
- <th class="description">description:</th>
- <td class="description">a</td>
-</tr>
-</table>
-
-<div id="changesetDiff">
-<pre class="parity0"><a class="lineno" href="#l1.1" id="l1.1">     1.1</a>new file mode 100644
-<span class="minusline"><a class="lineno" href="#l1.2" id="l1.2">     1.2</a>--- /dev/null
-</span><span class="plusline"><a class="lineno" href="#l1.3" id="l1.3">     1.3</a>+++ b/a
-</span><span class="atline"><a class="lineno" href="#l1.4" id="l1.4">     1.4</a>@@ -0,0 +1,1 @@
-</span><span class="plusline"><a class="lineno" href="#l1.5" id="l1.5">     1.5</a>+a
-</span></pre><pre class="parity1"><a class="lineno" href="#l2.1" id="l2.1">     2.1</a>new file mode 100644
-<span class="minusline"><a class="lineno" href="#l2.2" id="l2.2">     2.2</a>--- /dev/null
-</span><span class="plusline"><a class="lineno" href="#l2.3" id="l2.3">     2.3</a>+++ b/b
-</span><span class="atline"><a class="lineno" href="#l2.4" id="l2.4">     2.4</a>@@ -0,0 +1,1 @@
-</span><span class="plusline"><a class="lineno" href="#l2.5" id="l2.5">     2.5</a>+b
-</span></pre>
-</div>
-
-
+<div class="container">
+<div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
+<ul>
+ <li><a href="/shortlog/0cd96de13884">log</a></li>
+ <li><a href="/graph/0cd96de13884">graph</a></li>
+ <li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+ <li class="active">changeset</li>
+ <li><a href="/raw-rev/0cd96de13884">raw</a></li>
+ <li><a href="/file/0cd96de13884">browse</a></li>
+</ul>
+<ul>
+ 
+</ul>
+</div>
+
+<div class="main">
+
+<h2><a href="/">test</a></h2>
+<h3>changeset 0:0cd96de13884 </h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision, 
+files, or words in the commit message</span>
+</form>
+
+<div class="description">a</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>
+ <td class="date">Thu Jan 01 00:00:00 1970 +0000 (38 years ago)</td></tr>
+<tr>
+ <th class="author">parents</th>
+ <td class="author"></td>
+</tr>
+<tr>
+ <th class="author">children</th>
+ <td class="author"><a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
+</tr>
+<tr>
+ <th class="files">files</th>
+ <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
+</tr>
+</table>
+
+<div class="overflow">
+<table class="bigtable">
+<tr>
+ <th class="lineno">line</th>
+ <th class="source">diff</th>
+</tr>
+</table>
+<table class="bigtable parity0"><tr><td class="lineno"><a href="#l1.1" id="l1.1">     1.1</a></td><td class="source">new file mode 100644
+</td></tr><tr><td class="lineno"><a href="#l1.2" id="l1.2">     1.2</a></td><td class="source minusline">--- /dev/null
+</td></tr><tr><td class="lineno"><a href="#l1.3" id="l1.3">     1.3</a></td><td class="source plusline">+++ b/a
+</td></tr><tr><td class="lineno"><a href="#l1.4" id="l1.4">     1.4</a></td><td class="source atline">@@ -0,0 +1,1 @@
+</td></tr><tr><td class="lineno"><a href="#l1.5" id="l1.5">     1.5</a></td><td class="source plusline">+a
+</td></tr></table><table class="bigtable parity1"><tr><td class="lineno"><a href="#l2.1" id="l2.1">     2.1</a></td><td class="source">new file mode 100644
+</td></tr><tr><td class="lineno"><a href="#l2.2" id="l2.2">     2.2</a></td><td class="source minusline">--- /dev/null
+</td></tr><tr><td class="lineno"><a href="#l2.3" id="l2.3">     2.3</a></td><td class="source plusline">+++ b/b
+</td></tr><tr><td class="lineno"><a href="#l2.4" id="l2.4">     2.4</a></td><td class="source atline">@@ -0,0 +1,1 @@
+</td></tr><tr><td class="lineno"><a href="#l2.5" id="l2.5">     2.5</a></td><td class="source plusline">+b
+</td></tr></table>
+</div>
+
+</div>
+</div>
+
 
 </body>
 </html>
 
-
-
 % diff removed file
 200 Script output follows
 
+<!-- quirksmode -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png">
 <meta name="robots" content="index, nofollow" />
-<link rel="stylesheet" href="/static/style.css" type="text/css" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a diff</title>
 </head>
 <body>
 
-<div class="buttons">
-<a href="/log/1">changelog</a>
-<a href="/shortlog/1">shortlog</a>
-<a href="/graph">graph</a>
-<a href="/tags">tags</a>
-<a href="/rev/78e4ebad7cdf">changeset</a>
-<a href="/file/78e4ebad7cdf/a">file</a>
-<a href="/log/78e4ebad7cdf/a">revisions</a>
-<a href="/annotate/78e4ebad7cdf/a">annotate</a>
-<a href="/raw-diff/78e4ebad7cdf/a">raw</a>
-</div>
-
-<h2>a</h2>
-
-<table id="filediffEntry">
-<tr>
- <th class="revision">revision 1:</th>
- <td class="revision"><a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
-</tr>
-
-
-</table>
-
-<div id="fileDiff">
-<pre class="parity0"><a class="lineno" href="#l1.1" id="l1.1">     1.1</a>new file mode 100755
-<span class="minusline"><a class="lineno" href="#l1.2" id="l1.2">     1.2</a>--- /dev/null
-</span><span class="plusline"><a class="lineno" href="#l1.3" id="l1.3">     1.3</a>+++ b/a
-</span><span class="atline"><a class="lineno" href="#l1.4" id="l1.4">     1.4</a>@@ -0,0 +1,1 @@
-</span><span class="plusline"><a class="lineno" href="#l1.5" id="l1.5">     1.5</a>+a
-</span></pre>
-</div>
-
-
+<div class="container">
+<div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
+<ul>
+<li><a href="/shortlog/78e4ebad7cdf">log</a></li>
+<li><a href="/graph/78e4ebad7cdf">graph</a></li>
+<li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+<li><a href="/rev/78e4ebad7cdf">changeset</a></li>
+<li><a href="/file/78e4ebad7cdf">browse</a></li>
+</ul>
+<ul>
+<li><a href="/file/78e4ebad7cdf/a">file</a></li>
+<li class="active">diff</li>
+<li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li>
+<li><a href="/log/78e4ebad7cdf/a">file log</a></li>
+<li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li>
+</ul>
+</div>
+
+<div class="main">
+<h2><a href="/">test</a></h2>
+<h3>diff a @ 1:78e4ebad7cdf</h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision, 
+files, or words in the commit message</span>
+</form>
+
+<div class="description">b</div>
+
+<table id="changesetEntry">
+<tr>
+ <th>author</th>
+ <td>&#116;&#101;&#115;&#116;</td>
+</tr>
+<tr>
+ <th>date</th>
+ <td>Thu Jan 01 00:00:00 1970 +0000 (38 years ago)</td>
+</tr>
+<tr>
+ <th>parents</th>
+ <td></td>
+</tr>
+<tr>
+ <th>children</th>
+ <td></td>
+</tr>
+
+</table>
+
+<div class="overflow">
+<table class="bigtable">
+<tr>
+ <th class="lineno">line</th>
+ <th class="source">diff</th>
+</tr>
+</table>
+
+<table class="bigtable parity0"><tr><td class="lineno"><a href="#l1.1" id="l1.1">     1.1</a></td><td class="source">new file mode 100755
+</td></tr><tr><td class="lineno"><a href="#l1.2" id="l1.2">     1.2</a></td><td class="source minusline">--- /dev/null
+</td></tr><tr><td class="lineno"><a href="#l1.3" id="l1.3">     1.3</a></td><td class="source plusline">+++ b/a
+</td></tr><tr><td class="lineno"><a href="#l1.4" id="l1.4">     1.4</a></td><td class="source atline">@@ -0,0 +1,1 @@
+</td></tr><tr><td class="lineno"><a href="#l1.5" id="l1.5">     1.5</a></td><td class="source plusline">+a
+</td></tr></table>
+</div>
+</div>
+</div>
+
+
 
 </body>
 </html>
 
-
-
 % errors