##// END OF EJS Templates
merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

File last commit:

r22046:7a9cbb31 default
r23524:a1a7c94d default
Show More
test-hgweb-filelog.t
847 lines | 24.4 KiB | text/troff | Tads3Lexer
/ tests / test-hgweb-filelog.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve
Matt Mackall
tests: unify test-hgweb-filelog
r12437
$ hg init test
$ cd test
$ echo b > b
$ hg ci -Am "b"
adding b
$ echo a > a
$ hg ci -Am "first a"
adding a
$ hg rm a
$ hg ci -m "del a"
$ echo b > a
$ hg ci -Am "second a"
adding a
$ hg rm a
$ hg ci -m "del2 a"
$ hg mv b c
$ hg ci -m "mv b"
$ echo c >> c
$ hg ci -m "change c"
$ hg log -p
changeset: 6:b7682196df1c
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change c
diff -r 1a6696706df2 -r b7682196df1c 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:1a6696706df2
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: mv b
diff -r 52e848cdcd88 -r 1a6696706df2 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 1a6696706df2 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
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
tip - two revisions
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/tip/a')
Matt Mackall
tests: unify test-hgweb-filelog
r12437 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" />
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript" src="/static/mercurial.js"></script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<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://mercurial.selenic.com/">
<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>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <li><a href="/bookmarks">bookmarks</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <li><a href="/branches">branches</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>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 <li><a href="/comparison/01de2d66a28d/a">comparison</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <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>
Augie Fackler
hgweb: add help link to templates missed in ead4e21f49f1
r12680 <ul>
<li><a href="/help">help</a></li>
</ul>
Angel Ezquerra
hgweb: add (Atom) subscribe link to the main paper template pages...
r18200 <p>
<div class="atom-logo">
<a href="/atom-log/01de2d66a28d/a" title="subscribe to atom feed">
<img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a>
</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </div>
<div class="main">
Bryan O'Sullivan
tests: update hgweb tests to include breadcrumbs
r18264 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <h3>log a</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin
paper: edit search hint to include new feature description
r19796 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </form>
<div class="navigate">
<a href="/log/01de2d66a28d/a?revcount=30">less</a>
<a href="/log/01de2d66a28d/a?revcount=120">more</a>
| <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>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 <tbody class="stripes2">
<tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <td class="author">test</td>
<td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
</tr>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 <tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <td class="author">test</td>
<td class="description"><a href="/rev/5ed941583260">first a</a></td>
</tr>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 </tbody>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </table>
<div class="navigate">
<a href="/log/01de2d66a28d/a?revcount=30">less</a>
<a href="/log/01de2d66a28d/a?revcount=120">more</a>
| <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
</div>
</div>
</div>
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript">process_dates()</script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
</body>
</html>
second version - two revisions
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/3/a')
Matt Mackall
tests: unify test-hgweb-filelog
r12437 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" />
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript" src="/static/mercurial.js"></script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<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://mercurial.selenic.com/">
<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>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <li><a href="/bookmarks">bookmarks</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <li><a href="/branches">branches</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>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 <li><a href="/comparison/01de2d66a28d/a">comparison</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <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>
Augie Fackler
hgweb: add help link to templates missed in ead4e21f49f1
r12680 <ul>
<li><a href="/help">help</a></li>
</ul>
Angel Ezquerra
hgweb: add (Atom) subscribe link to the main paper template pages...
r18200 <p>
<div class="atom-logo">
<a href="/atom-log/01de2d66a28d/a" title="subscribe to atom feed">
<img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a>
</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </div>
<div class="main">
Bryan O'Sullivan
tests: update hgweb tests to include breadcrumbs
r18264 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <h3>log a</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin
paper: edit search hint to include new feature description
r19796 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </form>
<div class="navigate">
<a href="/log/01de2d66a28d/a?revcount=30">less</a>
<a href="/log/01de2d66a28d/a?revcount=120">more</a>
| <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>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 <tbody class="stripes2">
<tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <td class="author">test</td>
<td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
</tr>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 <tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <td class="author">test</td>
<td class="description"><a href="/rev/5ed941583260">first a</a></td>
</tr>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 </tbody>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </table>
<div class="navigate">
<a href="/log/01de2d66a28d/a?revcount=30">less</a>
<a href="/log/01de2d66a28d/a?revcount=120">more</a>
| <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
</div>
</div>
</div>
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript">process_dates()</script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
</body>
</html>
first deleted - one revision
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/2/a')
Matt Mackall
tests: unify test-hgweb-filelog
r12437 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" />
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript" src="/static/mercurial.js"></script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<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://mercurial.selenic.com/">
<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>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <li><a href="/bookmarks">bookmarks</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <li><a href="/branches">branches</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>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 <li><a href="/comparison/5ed941583260/a">comparison</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <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>
Augie Fackler
hgweb: add help link to templates missed in ead4e21f49f1
r12680 <ul>
<li><a href="/help">help</a></li>
</ul>
Angel Ezquerra
hgweb: add (Atom) subscribe link to the main paper template pages...
r18200 <p>
<div class="atom-logo">
<a href="/atom-log/5ed941583260/a" title="subscribe to atom feed">
<img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a>
</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </div>
<div class="main">
Bryan O'Sullivan
tests: update hgweb tests to include breadcrumbs
r18264 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <h3>log a</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin
paper: edit search hint to include new feature description
r19796 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </form>
<div class="navigate">
<a href="/log/5ed941583260/a?revcount=30">less</a>
<a href="/log/5ed941583260/a?revcount=120">more</a>
| <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>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 <tbody class="stripes2">
<tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <td class="author">test</td>
<td class="description"><a href="/rev/5ed941583260">first a</a></td>
</tr>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 </tbody>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </table>
<div class="navigate">
<a href="/log/5ed941583260/a?revcount=30">less</a>
<a href="/log/5ed941583260/a?revcount=120">more</a>
| <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
</div>
</div>
</div>
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript">process_dates()</script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
</body>
</html>
first version - one revision
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/1/a')
Matt Mackall
tests: unify test-hgweb-filelog
r12437 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" />
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript" src="/static/mercurial.js"></script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<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://mercurial.selenic.com/">
<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>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <li><a href="/bookmarks">bookmarks</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <li><a href="/branches">branches</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>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 <li><a href="/comparison/5ed941583260/a">comparison</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <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>
Augie Fackler
hgweb: add help link to templates missed in ead4e21f49f1
r12680 <ul>
<li><a href="/help">help</a></li>
</ul>
Angel Ezquerra
hgweb: add (Atom) subscribe link to the main paper template pages...
r18200 <p>
<div class="atom-logo">
<a href="/atom-log/5ed941583260/a" title="subscribe to atom feed">
<img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a>
</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </div>
<div class="main">
Bryan O'Sullivan
tests: update hgweb tests to include breadcrumbs
r18264 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <h3>log a</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin
paper: edit search hint to include new feature description
r19796 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </form>
<div class="navigate">
<a href="/log/5ed941583260/a?revcount=30">less</a>
<a href="/log/5ed941583260/a?revcount=120">more</a>
| <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>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 <tbody class="stripes2">
<tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <td class="author">test</td>
<td class="description"><a href="/rev/5ed941583260">first a</a></td>
</tr>
Alexander Plavin
hgweb: make stripes in file log with CSS
r19454 </tbody>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </table>
<div class="navigate">
<a href="/log/5ed941583260/a?revcount=30">less</a>
<a href="/log/5ed941583260/a?revcount=120">more</a>
| <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
</div>
</div>
</div>
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript">process_dates()</script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
</body>
</html>
before addition - error
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/0/a')
Matt Mackall
tests: unify test-hgweb-filelog
r12437 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" />
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript" src="/static/mercurial.js"></script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<title>test: error</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="http://mercurial.selenic.com/">
<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>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <li><a href="/bookmarks">bookmarks</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <li><a href="/branches">branches</a></li>
Ross Lagerwall
hgweb: make paper:error consistent with template...
r17290 </ul>
<ul>
Augie Fackler
hgweb: add help link to templates missed in ead4e21f49f1
r12680 <li><a href="/help">help</a></li>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </ul>
</div>
<div class="main">
Bryan O'Sullivan
tests: update hgweb tests to include breadcrumbs
r18264 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <h3>error</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30"></p>
Alexander Plavin
paper: edit search hint to include new feature description
r19796 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </form>
<div class="description">
<p>
An error occurred while processing your request:
</p>
<p>
a@6563da9dcf87: not found in manifest
</p>
</div>
</div>
</div>
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript">process_dates()</script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
</body>
</html>
[1]
should show base link, use spartan because it shows it
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log/tip/c?style=spartan')
Matt Mackall
tests: unify test-hgweb-filelog
r12437 200 Script output follows
Augie Fackler
test-hgweb-*: output change fixes from b1d65cb8
r20256 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <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" />
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript" src="/static/mercurial.js"></script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<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="/branches?style=spartan">branches</a>
<a href="/file/b7682196df1c/c?style=spartan">file</a>
<a href="/annotate/b7682196df1c/c?style=spartan">annotate</a>
Augie Fackler
hgweb: add help link to templates missed in ead4e21f49f1
r12680 <a href="/help?style=spartan">help</a>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <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>
Bryan O'Sullivan
tests: update hgweb tests to include breadcrumbs
r18264 <h2><a href="/">Mercurial</a> / c revision history</h2>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<p>navigate: <small class="navigate"><a href="/log/1a6696706df2/c?style=spartan">(0)</a> <a href="/log/tip/c?style=spartan">tip</a> </small></p>
<table class="logEntry parity0">
<tr>
FUJIWARA Katsunori
hgweb: align entries in "changelog" and "revisions" pages of "spartan" style...
r21124 <th class="label"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>:</th>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <th class="firstline"><a href="/rev/b7682196df1c?style=spartan">change c</a></th>
</tr>
<tr>
<th class="revision">revision 1:</td>
<td class="node">
<a href="/file/b7682196df1c/c?style=spartan">b7682196df1c</a>
<a href="/diff/b7682196df1c/c?style=spartan">(diff)</a>
<a href="/annotate/b7682196df1c/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>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="date">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </tr>
</table>
<table class="logEntry parity1">
<tr>
FUJIWARA Katsunori
hgweb: align entries in "changelog" and "revisions" pages of "spartan" style...
r21124 <th class="label"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>:</th>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 <th class="firstline"><a href="/rev/1a6696706df2?style=spartan">mv b</a></th>
</tr>
<tr>
<th class="revision">revision 0:</td>
<td class="node">
<a href="/file/1a6696706df2/c?style=spartan">1a6696706df2</a>
<a href="/diff/1a6696706df2/c?style=spartan">(diff)</a>
<a href="/annotate/1a6696706df2/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>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="date">Thu, 01 Jan 1970 00:00:00 +0000</td>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 </tr>
</table>
Benoit Allard
web: Made elapsed time calculation dynamic (javascript)....
r14046 <script type="text/javascript">process_dates()</script>
Matt Mackall
tests: unify test-hgweb-filelog
r12437
<div class="logo">
<a href="http://mercurial.selenic.com/">
<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
</div>
</body>
</html>
Patrick Mezard
hgweb: fix filelog rss links generation
r13547 rss log
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'rss-log/tip/a')
Patrick Mezard
hgweb: fix filelog rss links generation
r13547 200 Script output follows
<?xml version="1.0" encoding="ascii"?>
<rss version="2.0">
<channel>
<link>http://*:$HGPORT/</link> (glob)
<language>en-us</language>
<title>test: a history</title>
<description>a revision history</description>
<item>
<title>second a</title>
<link>http://*:$HGPORT/log01de2d66a28d/a</link> (glob)
<description><![CDATA[second a]]></description>
<author>&#116;&#101;&#115;&#116;</author>
<pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
</item>
<item>
<title>first a</title>
<link>http://*:$HGPORT/log5ed941583260/a</link> (glob)
<description><![CDATA[first a]]></description>
<author>&#116;&#101;&#115;&#116;</author>
<pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
</item>
</channel>
</rss>
atom log
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'atom-log/tip/a')
Patrick Mezard
hgweb: fix filelog rss links generation
r13547 200 Script output follows
<?xml version="1.0" encoding="ascii"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<id>http://*:$HGPORT/atom-log/tip/a</id> (glob)
<link rel="self" href="http://*:$HGPORT/atom-log/tip/a"/> (glob)
<title>test: a history</title>
<updated>1970-01-01T00:00:00+00:00</updated>
<entry>
<title>second a</title>
<id>http://*:$HGPORT/#changeset-01de2d66a28df5549090991dccda788726948517</id> (glob)
<link href="http://*:$HGPORT/rev/01de2d66a28d"/> (glob)
<author>
<name>test</name>
<email>&#116;&#101;&#115;&#116;</email>
</author>
<updated>1970-01-01T00:00:00+00:00</updated>
<published>1970-01-01T00:00:00+00:00</published>
<content type="xhtml">
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries
r21056 <table xmlns="http://www.w3.org/1999/xhtml">
<tr>
<th style="text-align:left;">changeset</th>
<td>01de2d66a28d</td>
Aaron Jensen
hgweb: adding branch names from inbranch template to atom feed
r21117 </tr>
<tr>
<th style="text-align:left;">branch</th>
<td></td>
</tr>
<tr>
<th style="text-align:left;">bookmark</th>
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries
r21056 <td></td>
</tr>
<tr>
<th style="text-align:left;">tag</th>
<td></td>
</tr>
<tr>
<th style="text-align:left;">user</th>
<td>&#116;&#101;&#115;&#116;</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">description</th>
<td>second a</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">files</th>
<td></td>
</tr>
</table>
Patrick Mezard
hgweb: fix filelog rss links generation
r13547 </content>
</entry>
<entry>
<title>first a</title>
<id>http://*:$HGPORT/#changeset-5ed941583260248620985524192fdc382ef57c36</id> (glob)
<link href="http://*:$HGPORT/rev/5ed941583260"/> (glob)
<author>
<name>test</name>
<email>&#116;&#101;&#115;&#116;</email>
</author>
<updated>1970-01-01T00:00:00+00:00</updated>
<published>1970-01-01T00:00:00+00:00</published>
<content type="xhtml">
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries
r21056 <table xmlns="http://www.w3.org/1999/xhtml">
<tr>
<th style="text-align:left;">changeset</th>
<td>5ed941583260</td>
Aaron Jensen
hgweb: adding branch names from inbranch template to atom feed
r21117 </tr>
<tr>
<th style="text-align:left;">branch</th>
<td></td>
</tr>
<tr>
<th style="text-align:left;">bookmark</th>
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries
r21056 <td></td>
</tr>
<tr>
<th style="text-align:left;">tag</th>
<td></td>
</tr>
<tr>
<th style="text-align:left;">user</th>
<td>&#116;&#101;&#115;&#116;</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">description</th>
<td>first a</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">files</th>
<td></td>
</tr>
</table>
Patrick Mezard
hgweb: fix filelog rss links generation
r13547 </content>
</entry>
</feed>
Matt Mackall
tests: unify test-hgweb-filelog
r12437 errors
$ cat errors.log
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..