view tests/test-hgweb-filelog.out @ 7769:8c06d4bf2c23

test-merge-tools: Don't use tac "tac" was a bad tool - is not available on all platforms. The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 10 Feb 2009 16:11:48 +0100
parents 6a888d491eaf
children 179fac5c10d8
line wrap: on
line source

adding b
adding a
adding a
changeset:   6:38d962e6234d
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change c

diff -r a3b6a9e4507e -r 38d962e6234d c
--- a/c	Thu Jan 01 00:00:00 1970 +0000
+++ b/c	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@
 b
+c

changeset:   5:a3b6a9e4507e
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     mv b

diff -r 52e848cdcd88 -r a3b6a9e4507e b
--- a/b	Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-b
diff -r 52e848cdcd88 -r a3b6a9e4507e c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/c	Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b

changeset:   4:52e848cdcd88
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     del2 a

diff -r 01de2d66a28d -r 52e848cdcd88 a
--- a/a	Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-b

changeset:   3:01de2d66a28d
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     second a

diff -r be3ebcc91739 -r 01de2d66a28d a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b

changeset:   2:be3ebcc91739
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     del a

diff -r 5ed941583260 -r be3ebcc91739 a
--- a/a	Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a

changeset:   1:5ed941583260
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     first a

diff -r 6563da9dcf87 -r 5ed941583260 a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+a

changeset:   0:6563da9dcf87
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

diff -r 000000000000 -r 6563da9dcf87 b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/b	Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b

% tip - two revisions
200 Script output follows

<!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">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />

<title>test: a history</title>
<link rel="alternate" type="application/atom+xml"
   href="/atom-log/tip/a" title="Atom feed for test:a" />
<link rel="alternate" type="application/rss+xml"
   href="/rss-log/tip/a" title="RSS feed for test:a" />
</head>
<body>

<div class="container">
<div class="menu">
<div class="logo">
<a href="http://www.selenic.com/mercurial/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog/01de2d66a28d">log</a></li>
<li><a href="/graph/01de2d66a28d">graph</a></li>
<li><a href="/tags">tags</a></li>
</ul>
<ul>
<li><a href="/rev/01de2d66a28d">changeset</a></li>
<li><a href="/file/01de2d66a28d">browse</a></li>
</ul>
<ul>
<li><a href="/file/01de2d66a28d/a">file</a></li>
<li><a href="/diff/01de2d66a28d/a">diff</a></li>
<li><a href="/annotate/01de2d66a28d/a">annotate</a></li>
<li class="active">file log</li>
<li><a href="/raw-file/01de2d66a28d/a">raw</a></li>
</ul>
</div>

<div class="main">
<h2><a href="/">test</a></h2>
<h3>log a</h3>

<form class="search" action="/log">

<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>
</form>

<div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>

<table class="bigtable">
 <tr>
  <th class="age">age</th>
  <th class="author">author</th>
  <th class="description">description</th>
 </tr>
 <tr class="parity0">
  <td class="age">many years</td>
  <td class="author">test</td>
  <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
 </tr>
 <tr class="parity1">
  <td class="age">many years</td>
  <td class="author">test</td>
  <td class="description"><a href="/rev/5ed941583260">first a</a></td>
 </tr>

</table>

</div>
</div>



</body>
</html>

% second version - two revisions
200 Script output follows

<!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">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />

<title>test: a history</title>
<link rel="alternate" type="application/atom+xml"
   href="/atom-log/tip/a" title="Atom feed for test:a" />
<link rel="alternate" type="application/rss+xml"
   href="/rss-log/tip/a" title="RSS feed for test:a" />
</head>
<body>

<div class="container">
<div class="menu">
<div class="logo">
<a href="http://www.selenic.com/mercurial/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog/01de2d66a28d">log</a></li>
<li><a href="/graph/01de2d66a28d">graph</a></li>
<li><a href="/tags">tags</a></li>
</ul>
<ul>
<li><a href="/rev/01de2d66a28d">changeset</a></li>
<li><a href="/file/01de2d66a28d">browse</a></li>
</ul>
<ul>
<li><a href="/file/01de2d66a28d/a">file</a></li>
<li><a href="/diff/01de2d66a28d/a">diff</a></li>
<li><a href="/annotate/01de2d66a28d/a">annotate</a></li>
<li class="active">file log</li>
<li><a href="/raw-file/01de2d66a28d/a">raw</a></li>
</ul>
</div>

<div class="main">
<h2><a href="/">test</a></h2>
<h3>log a</h3>

<form class="search" action="/log">

<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>
</form>

<div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>

<table class="bigtable">
 <tr>
  <th class="age">age</th>
  <th class="author">author</th>
  <th class="description">description</th>
 </tr>
 <tr class="parity0">
  <td class="age">many years</td>
  <td class="author">test</td>
  <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
 </tr>
 <tr class="parity1">
  <td class="age">many years</td>
  <td class="author">test</td>
  <td class="description"><a href="/rev/5ed941583260">first a</a></td>
 </tr>

</table>

</div>
</div>



</body>
</html>

% first deleted - one revision
200 Script output follows

<!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">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />

<title>test: a history</title>
<link rel="alternate" type="application/atom+xml"
   href="/atom-log/tip/a" title="Atom feed for test:a" />
<link rel="alternate" type="application/rss+xml"
   href="/rss-log/tip/a" title="RSS feed for test:a" />
</head>
<body>

<div class="container">
<div class="menu">
<div class="logo">
<a href="http://www.selenic.com/mercurial/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog/5ed941583260">log</a></li>
<li><a href="/graph/5ed941583260">graph</a></li>
<li><a href="/tags">tags</a></li>
</ul>
<ul>
<li><a href="/rev/5ed941583260">changeset</a></li>
<li><a href="/file/5ed941583260">browse</a></li>
</ul>
<ul>
<li><a href="/file/5ed941583260/a">file</a></li>
<li><a href="/diff/5ed941583260/a">diff</a></li>
<li><a href="/annotate/5ed941583260/a">annotate</a></li>
<li class="active">file log</li>
<li><a href="/raw-file/5ed941583260/a">raw</a></li>
</ul>
</div>

<div class="main">
<h2><a href="/">test</a></h2>
<h3>log a</h3>

<form class="search" action="/log">

<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>
</form>

<div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>

<table class="bigtable">
 <tr>
  <th class="age">age</th>
  <th class="author">author</th>
  <th class="description">description</th>
 </tr>
 <tr class="parity0">
  <td class="age">many years</td>
  <td class="author">test</td>
  <td class="description"><a href="/rev/5ed941583260">first a</a></td>
 </tr>

</table>

</div>
</div>



</body>
</html>

% first version - one revision
200 Script output follows

<!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">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />

<title>test: a history</title>
<link rel="alternate" type="application/atom+xml"
   href="/atom-log/tip/a" title="Atom feed for test:a" />
<link rel="alternate" type="application/rss+xml"
   href="/rss-log/tip/a" title="RSS feed for test:a" />
</head>
<body>

<div class="container">
<div class="menu">
<div class="logo">
<a href="http://www.selenic.com/mercurial/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog/5ed941583260">log</a></li>
<li><a href="/graph/5ed941583260">graph</a></li>
<li><a href="/tags">tags</a></li>
</ul>
<ul>
<li><a href="/rev/5ed941583260">changeset</a></li>
<li><a href="/file/5ed941583260">browse</a></li>
</ul>
<ul>
<li><a href="/file/5ed941583260/a">file</a></li>
<li><a href="/diff/5ed941583260/a">diff</a></li>
<li><a href="/annotate/5ed941583260/a">annotate</a></li>
<li class="active">file log</li>
<li><a href="/raw-file/5ed941583260/a">raw</a></li>
</ul>
</div>

<div class="main">
<h2><a href="/">test</a></h2>
<h3>log a</h3>

<form class="search" action="/log">

<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>
</form>

<div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>

<table class="bigtable">
 <tr>
  <th class="age">age</th>
  <th class="author">author</th>
  <th class="description">description</th>
 </tr>
 <tr class="parity0">
  <td class="age">many years</td>
  <td class="author">test</td>
  <td class="description"><a href="/rev/5ed941583260">first a</a></td>
 </tr>

</table>

</div>
</div>



</body>
</html>

% before addition - error
404 Not Found

<!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">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />

<title>test: error</title>
</head>
<body>

<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">log</a></li>
<li><a href="/graph">graph</a></li>
<li><a href="/tags">tags</a></li>
</ul>
</div>

<div class="main">

<h2><a href="/">test</a></h2>
<h3>error</h3>

<form class="search" action="/log">

<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>
</form>

<div class="description">
<p>
An error occurred while processing your request:
</p>
<p>
a@6563da9dcf87: not found in manifest
</p>
</div>
</div>
</div>



</body>
</html>

% should show base link, use spartan because it shows it
200 Script output follows

<!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" />

<title>test: c history</title>
<link rel="alternate" type="application/atom+xml"
   href="/atom-log/tip/c" title="Atom feed for test:c">
<link rel="alternate" type="application/rss+xml"
   href="/rss-log/tip/c" title="RSS feed for test:c">
</head>
<body>

<div class="buttons">
<a href="/log?style=spartan">changelog</a>
<a href="/shortlog?style=spartan">shortlog</a>
<a href="/graph?style=spartan">graph</a>
<a href="/tags?style=spartan">tags</a>
<a href="/file/38d962e6234d/c?style=spartan">file</a>
<a href="/annotate/38d962e6234d/c?style=spartan">annotate</a>
<a type="application/rss+xml" href="/rss-log/tip/c">rss</a>
<a type="application/atom+xml" href="/atom-log/tip/c" title="Atom feed for test:c">atom</a>
</div>

<h2>c revision history</h2>

<p>navigate: <small class="navigate"><a href="/log/a3b6a9e4507e/c?style=spartan">(0)</a> <a href="/log/tip/c?style=spartan">tip</a> </small></p>

<table class="logEntry parity0">
 <tr>
  <th class="age">many years ago:</th>
  <th class="firstline"><a href="/rev/38d962e6234d?style=spartan">change c</a></th>
 </tr>
 <tr>
  <th class="revision">revision 1:</td>
  <td class="node">
   <a href="/file/38d962e6234d/c?style=spartan">38d962e6234d</a>
   <a href="/diff/38d962e6234d/c?style=spartan">(diff)</a>
   <a href="/annotate/38d962e6234d/c?style=spartan">(annotate)</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</td>
 </tr>
</table>


<table class="logEntry parity1">
 <tr>
  <th class="age">many years ago:</th>
  <th class="firstline"><a href="/rev/a3b6a9e4507e?style=spartan">mv b</a></th>
 </tr>
 <tr>
  <th class="revision">revision 0:</td>
  <td class="node">
   <a href="/file/a3b6a9e4507e/c?style=spartan">a3b6a9e4507e</a>
   <a href="/diff/a3b6a9e4507e/c?style=spartan">(diff)</a>
   <a href="/annotate/a3b6a9e4507e/c?style=spartan">(annotate)</a>
  </td>
 </tr>
 <tr><th>base:</th><td><a href="/file/1e88685f5dde/b?style=spartan">b@1e88685f5dde</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</td>
 </tr>
</table>





<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>

</body>
</html>

% errors