upstream/mercurial-mirror Files · tests/test-hgweb-diffs.out

issue1577: fix broken test by assuming less about CVS output....

issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

Benoit Allard - - Load All Authors

File last commit:

r7725:6a888d49 default


                r8081:6c3b8132

default

Download file

             test-hgweb-diffs.out
        
                    368 lines
            
             | 9.9 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-hgweb-diffs.out

History | Source | Raw |Copy content |Copy permalink

Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	% setting up repo
		adding a
		adding b
		% change permissions for git diffs
		% 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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<head>
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
Matt Mackall hgweb: update tests for paper style...	r7339	<title>test: 0cd96de13884</title>
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	</head>
		<body>
Matt Mackall hgweb: update tests for paper style...	r7339	<div class="container">
		<div class="menu">
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<div class="logo">
		<a href="http://www.selenic.com/mercurial/">
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	</div>
Matt Mackall hgweb: update tests for paper style...	r7339	<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>
Dirkjan Ochtman coal/paper: show branch name in changeset view	r7410	<h3>changeset 0:0cd96de13884 </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">a</div>

		<table id="changesetEntry">
		<tr>
		<th class="author">author</th>
		<td class="author">test</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"></td>
		</tr>
		<tr>
		<th class="author">children</th>
Stepan Koltsov coal/paper: add missing spaces in changeset child formatting	r7668	<td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
Matt Mackall hgweb: update tests for paper style...	r7339	</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">
Dirkjan Ochtman tests: fix tests broken by 03b60f2f90bf	r7395	<div class="sourcefirst"> line diff</div>

		<div class="source bottomline parity0"><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000
		</span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000
		</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@
		</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a
		</span></div><div class="source bottomline parity1"><a href="#l2.1" id="l2.1"> 2.1</a> <span class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000
		</span><a href="#l2.2" id="l2.2"> 2.2</a> <span class="plusline">+++ b/b Thu Jan 01 00:00:00 1970 +0000
		</span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="atline">@@ -0,0 +1,1 @@
		</span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="plusline">+b
		</span></div>
Matt Mackall hgweb: update tests for paper style...	r7339	</div>

		</div>
		</div>

Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
		</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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<head>
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
		<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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<div class="logo">
		<a href="http://www.selenic.com/mercurial/">
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	</div>
Matt Mackall hgweb: update tests for paper style...	r7339	<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">
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">b</div>

		<table id="changesetEntry">
		<tr>
		<th>author</th>
		<td>test</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></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
Dirkjan Ochtman tests: fix tests broken by 03b60f2f90bf	r7395	<div class="source bottomline parity0"><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000
		</span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000
		</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@
		</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a
		</span></div>
Matt Mackall hgweb: update tests for paper style...	r7339	</div>
		</div>
		</div>


Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
		</body>
		</html>

		% set up hgweb with git diffs
		% 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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<head>
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
Matt Mackall hgweb: update tests for paper style...	r7339	<title>test: 0cd96de13884</title>
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	</head>
		<body>
Matt Mackall hgweb: update tests for paper style...	r7339	<div class="container">
		<div class="menu">
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<div class="logo">
		<a href="http://www.selenic.com/mercurial/">
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	</div>
Matt Mackall hgweb: update tests for paper style...	r7339	<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>
Dirkjan Ochtman coal/paper: show branch name in changeset view	r7410	<h3>changeset 0:0cd96de13884 </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">a</div>

		<table id="changesetEntry">
		<tr>
		<th class="author">author</th>
		<td class="author">test</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"></td>
		</tr>
		<tr>
		<th class="author">children</th>
Stepan Koltsov coal/paper: add missing spaces in changeset child formatting	r7668	<td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
Matt Mackall hgweb: update tests for paper style...	r7339	</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">
Dirkjan Ochtman tests: fix tests broken by 03b60f2f90bf	r7395	<div class="sourcefirst"> line diff</div>

		<div class="source bottomline parity0"><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644
		<a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null
		</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a
		</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@
		</span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a
		</span></div><div class="source bottomline parity1"><a href="#l2.1" id="l2.1"> 2.1</a> new file mode 100644
		<a href="#l2.2" id="l2.2"> 2.2</a> <span class="minusline">--- /dev/null
		</span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="plusline">+++ b/b
		</span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="atline">@@ -0,0 +1,1 @@
		</span><a href="#l2.5" id="l2.5"> 2.5</a> <span class="plusline">+b
		</span></div>
Matt Mackall hgweb: update tests for paper style...	r7339	</div>

		</div>
		</div>

Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
		</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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<head>
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
		<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: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	<div class="logo">
		<a href="http://www.selenic.com/mercurial/">
Benoit Allard coal/paper: switch to XHTML 1.1	r7725	<img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309	</div>
Matt Mackall hgweb: update tests for paper style...	r7339	<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">
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">b</div>

		<table id="changesetEntry">
		<tr>
		<th>author</th>
		<td>test</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></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
Dirkjan Ochtman tests: fix tests broken by 03b60f2f90bf	r7395	<div class="source bottomline parity0"><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100755
		<a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null
		</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a
		</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@
		</span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a
		</span></div>
Matt Mackall hgweb: update tests for paper style...	r7339	</div>
		</div>
		</div>


Dirkjan Ochtman hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...	r7309
		</body>
		</html>

		% errors

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages