Mercurial > hg

annotate tests/test-hgweb-diffs.t @ 18455:28aaa24dc36b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added signature for changeset f5fbe15ca744
author Matt Mackall <mpm@selenic.com>
date Sat, 19 Jan 2013 17:26:19 -0600
parents 44bda93df90e
children 0c51532ec233
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17109
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
1 $ "$TESTDIR/hghave" serve || exit 80
15442
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 15375
diff changeset
2
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
3 setting up repo
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
4
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
5 $ hg init test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
6 $ cd test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
7 $ echo a > a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
8 $ echo b > b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
9 $ hg ci -Ama
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
10 adding a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
11 adding b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
12
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
13 change permissions for git diffs
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
14
17109
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
15 $ hg import -q --bypass - <<EOF
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
16 > # HG changeset patch
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
17 > # User test
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
18 > # Date 0 0
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
19 > b
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
20 >
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
21 > diff --git a/a b/a
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
22 > old mode 100644
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
23 > new mode 100755
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
24 > diff --git a/b b/b
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
25 > deleted file mode 100644
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
26 > --- a/b
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
27 > +++ /dev/null
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
28 > @@ -1,1 +0,0 @@
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
29 > -b
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
30 > EOF
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
31
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
32 set up hgweb
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
33
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
34 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
35 $ cat hg.pid >> $DAEMON_PIDS
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
36
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
37 revision
8452
cb93eee1fbcd tests: add missing interpreter lines
Martin Geisler <mg@lazybytes.net>
parents: 7428
diff changeset
38
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
39 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'rev/0'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
40 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
41
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
42 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
43 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
44 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
45 <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
46 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
47 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
48 <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
49
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
50 <title>test: 0cd96de13884</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
51 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
52 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
53 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
54 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
55 <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
56 <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
57 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
58 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
59 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
60 <li><a href="/shortlog/0cd96de13884">log</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
61 <li><a href="/graph/0cd96de13884">graph</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
62 <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
63 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
64 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
65 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
66 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
67 <li class="active">changeset</li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
68 <li><a href="/raw-rev/0cd96de13884">raw</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
69 <li><a href="/file/0cd96de13884">browse</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
70 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
71 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
72
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
73 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
74 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
75 <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
76 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
77 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
78
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
79 <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
80
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
81 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
13596
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12847
diff changeset
82 <h3>changeset 0:0cd96de13884 </h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
83
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
84 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
85
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
86 <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
87 <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
88 files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
89 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
90
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
91 <div class="description">a</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
92
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
93 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
94 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
95 <th class="author">author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
96 <td class="author">&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
97 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
98 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
99 <th class="date">date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
100 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td></tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
101 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
102 <th class="author">parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
103 <td class="author"></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
104 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
105 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
106 <th class="author">children</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
107 <td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
108 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
109 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
110 <th class="files">files</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
111 <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
112 </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
113 <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
114 <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
115 <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
116 2 files changed, 2 insertions(+), 0 deletions(-)
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
117
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
118 <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
119 <div id="diffstatdetails" style="display:none;">
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
120 <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
121 <p>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
122 <table> <tr class="parity0">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
123 <td class="diffstat-file"><a href="#l1.1">a</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
124 <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
125 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
126 <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
127 <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
128 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
129 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
130 <tr class="parity1">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
131 <td class="diffstat-file"><a href="#l2.1">b</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
132 <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
133 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
134 <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
135 <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
136 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
137 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
138 </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
139 </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
140 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
141 </tr>
17991
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
142 <tr>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
143 <th class="author">change baseline</th>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
144 <td class="author"></td>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
145 </tr>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
146 <tr>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
147 <th class="author">current baseline</th>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
148 <td class="author"><a href="/rev/000000000000">000000000000</a></td>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
149 </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
150 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
151
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
152 <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
153 <div class="sourcefirst"> line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
154
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
155 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
156 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
157 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
158 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
159 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1"> 2.1</a> <span class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
160 </span><a href="#l2.2" id="l2.2"> 2.2</a> <span class="plusline">+++ b/b Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
161 </span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
162 </span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="plusline">+b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
163 </span></pre></div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
164 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
165
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
166 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
167 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
168 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
169
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
170
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
171 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
172 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
173
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
174
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
175 raw revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
176
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
177 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'raw-rev/0'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
178 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
179
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
180
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
181 # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
182 # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
183 # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
184 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
185
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
186 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
187
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
188 diff -r 000000000000 -r 0cd96de13884 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
189 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
190 +++ b/a Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
191 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
192 +a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
193 diff -r 000000000000 -r 0cd96de13884 b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
194 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
195 +++ b/b Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
196 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
197 +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
198
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
199
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
200 diff removed file
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
201
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
202 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'diff/tip/b'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
203 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
204
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
205 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
206 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
207 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
208 <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
209 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
210 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
211 <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
212
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
213 <title>test: b diff</title>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
214 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
215 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
216
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
217 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
218 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
219 <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
220 <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
221 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
222 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
223 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
224 <li><a href="/shortlog/559edbd9ed20">log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
225 <li><a href="/graph/559edbd9ed20">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
226 <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
227 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
228 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
229 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
230 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
231 <li><a href="/rev/559edbd9ed20">changeset</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
232 <li><a href="/file/559edbd9ed20">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
233 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
234 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
235 <li><a href="/file/559edbd9ed20/b">file</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
236 <li><a href="/file/tip/b">latest</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
237 <li class="active">diff</li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
238 <li><a href="/comparison/559edbd9ed20/b">comparison</a></li>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
239 <li><a href="/annotate/559edbd9ed20/b">annotate</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
240 <li><a href="/log/559edbd9ed20/b">file log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
241 <li><a href="/raw-file/559edbd9ed20/b">raw</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
242 </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
243 <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
244 <li><a href="/help">help</a></li>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
245 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
246 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
247
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
248 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
249 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
250 <h3>diff b @ 1:559edbd9ed20</h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
251
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
252 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
253 <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
254 <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
255 <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
256 files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
257 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
258
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
259 <div class="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
260
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
261 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
262 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
263 <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
264 <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
265 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
266 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
267 <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
268 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
269 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
270 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
271 <th>parents</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
272 <td><a href="/file/0cd96de13884/b">0cd96de13884</a> </td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
273 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
274 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
275 <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
276 <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
277 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
278
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
279 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
280
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
281 <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
282 <div class="sourcefirst"> line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
283
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
284 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- a/b Thu Jan 01 00:00:00 1970 +0000
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
285 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
286 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -1,1 +0,0 @@
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
287 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="minusline">-b
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
288 </span></pre></div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
289 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
290 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
291 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
292
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
293 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
294
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
295
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
296 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
297 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
298
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
299
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
300 set up hgweb with git diffs
9402
5d49fdef6fd0 hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8452
diff changeset
301
17466
d5a3bda6e170 killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents: 17303
diff changeset
302 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
303 $ hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
304 $ cat hg.pid >> $DAEMON_PIDS
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
305
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
306 revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
307
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
308 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'rev/0'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
309 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
310
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
311 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
312 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
313 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
314 <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
315 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
316 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
317 <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
318
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
319 <title>test: 0cd96de13884</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
320 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
321 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
322 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
323 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
324 <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
325 <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
326 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
327 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
328 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
329 <li><a href="/shortlog/0cd96de13884">log</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
330 <li><a href="/graph/0cd96de13884">graph</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
331 <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
332 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
333 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
334 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
335 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
336 <li class="active">changeset</li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
337 <li><a href="/raw-rev/0cd96de13884">raw</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
338 <li><a href="/file/0cd96de13884">browse</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
339 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
340 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
341
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
342 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
343 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
344 <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
345 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
346 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
347
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
348 <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
349
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
350 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
13596
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12847
diff changeset
351 <h3>changeset 0:0cd96de13884 </h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
352
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
353 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
354
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
355 <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
356 <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
357 files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
358 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
359
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
360 <div class="description">a</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
361
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
362 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
363 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
364 <th class="author">author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
365 <td class="author">&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
366 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
367 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
368 <th class="date">date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
369 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td></tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
370 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
371 <th class="author">parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
372 <td class="author"></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
373 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
374 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
375 <th class="author">children</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
376 <td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
377 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
378 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
379 <th class="files">files</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
380 <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
381 </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
382 <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
383 <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
384 <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
385 2 files changed, 2 insertions(+), 0 deletions(-)
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
386
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
387 <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
388 <div id="diffstatdetails" style="display:none;">
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
389 <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
390 <p>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
391 <table> <tr class="parity0">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
392 <td class="diffstat-file"><a href="#l1.1">a</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
393 <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
394 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
395 <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
396 <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
397 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
398 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
399 <tr class="parity1">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
400 <td class="diffstat-file"><a href="#l2.1">b</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
401 <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
402 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
403 <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
404 <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
405 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
406 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
407 </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
408 </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
409 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
410 </tr>
17991
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
411 <tr>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
412 <th class="author">change baseline</th>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
413 <td class="author"></td>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
414 </tr>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
415 <tr>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
416 <th class="author">current baseline</th>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
417 <td class="author"><a href="/rev/000000000000">000000000000</a></td>
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)
Weiwen <weiwen@fb.com>
parents: 17466
diff changeset
418 </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
419 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
420
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
421 <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
422 <div class="sourcefirst"> line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
423
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
424 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
425 <a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
426 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
427 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
428 </span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
429 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1"> 2.1</a> new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
430 <a href="#l2.2" id="l2.2"> 2.2</a> <span class="minusline">--- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
431 </span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="plusline">+++ b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
432 </span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
433 </span><a href="#l2.5" id="l2.5"> 2.5</a> <span class="plusline">+b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
434 </span></pre></div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
435 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
436
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
437 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
438 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
439 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
440
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
441
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
442 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
443 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
444
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
445
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
446 revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
447
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
448 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'raw-rev/0'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
449 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
450
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
451
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
452 # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
453 # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
454 # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
455 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
456
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
457 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
458
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
459 diff --git a/a b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
460 new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
461 --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
462 +++ b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
463 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
464 +a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
465 diff --git a/b b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
466 new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
467 --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
468 +++ b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
469 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
470 +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
471
9402
5d49fdef6fd0 hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8452
diff changeset
472
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
473 diff removed file
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
474
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
475 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'diff/tip/a'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
476 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
477
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
478 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
479 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
480 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
481 <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
482 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
483 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
484 <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
485
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
486 <title>test: a diff</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
487 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
488 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
489
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
490 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
491 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
492 <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
493 <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
494 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
495 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
496 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
497 <li><a href="/shortlog/559edbd9ed20">log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
498 <li><a href="/graph/559edbd9ed20">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
499 <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
500 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
501 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
502 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
503 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
504 <li><a href="/rev/559edbd9ed20">changeset</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
505 <li><a href="/file/559edbd9ed20">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
506 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
507 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
508 <li><a href="/file/559edbd9ed20/a">file</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
509 <li><a href="/file/tip/a">latest</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
510 <li class="active">diff</li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
511 <li><a href="/comparison/559edbd9ed20/a">comparison</a></li>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
512 <li><a href="/annotate/559edbd9ed20/a">annotate</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
513 <li><a href="/log/559edbd9ed20/a">file log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
514 <li><a href="/raw-file/559edbd9ed20/a">raw</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
515 </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
516 <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
517 <li><a href="/help">help</a></li>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
518 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
519 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
520
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
521 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
522 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
523 <h3>diff a @ 1:559edbd9ed20</h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
524
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
525 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
526 <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
527 <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
528 <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
529 files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
530 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
531
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
532 <div class="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
533
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
534 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
535 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
536 <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
537 <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
538 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
539 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
540 <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
541 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
542 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
543 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
544 <th>parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
545 <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
546 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
547 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
548 <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
549 <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
550 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
551
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
552 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
553
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
554 <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
555 <div class="sourcefirst"> line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
556
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
557 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> old mode 100644
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
558 <a href="#l1.2" id="l1.2"> 1.2</a> new mode 100755
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
559 </pre></div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
560 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
561 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
562 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
563
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
564 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
565
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
566
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
567 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
568 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
569
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
570
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
571 comparison new file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
572
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
573 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/0/a'
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
574 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
575
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
576 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
577 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
578 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
579 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
580 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
581 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
582 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
583
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
584 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
585 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
586 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
587
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
588 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
589 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
590 <div class="logo">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
591 <a href="http://mercurial.selenic.com/">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
592 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
593 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
594 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
595 <li><a href="/shortlog/0cd96de13884">log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
596 <li><a href="/graph/0cd96de13884">graph</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
597 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
598 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
599 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
600 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
601 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
602 <li><a href="/rev/0cd96de13884">changeset</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
603 <li><a href="/file/0cd96de13884">browse</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
604 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
605 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
606 <li><a href="/file/0cd96de13884/a">file</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
607 <li><a href="/file/tip/a">latest</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
608 <li><a href="/diff/0cd96de13884/a">diff</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
609 <li class="active">comparison</li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
610 <li><a href="/annotate/0cd96de13884/a">annotate</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
611 <li><a href="/log/0cd96de13884/a">file log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
612 <li><a href="/raw-file/0cd96de13884/a">raw</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
613 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
614 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
615 <li><a href="/help">help</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
616 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
617 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
618
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
619 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
620 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
621 <h3>comparison a @ 0:0cd96de13884</h3>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
622
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
623 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
624 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
625 <p><input name="rev" id="search1" type="text" size="30" /></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
626 <div id="hint">find changesets by author, revision,
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
627 files, or words in the commit message</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
628 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
629
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
630 <div class="description">a</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
631
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
632 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
633 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
634 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
635 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
636 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
637 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
638 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
639 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
640 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
641 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
642 <th>parents</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
643 <td></td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
644 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
645 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
646 <th>children</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
647 <td></td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
648 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
649
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
650 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
651
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
652 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
653 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
654 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
655 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
656 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
657 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
658 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
659 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
660
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
661 <table class="bigtable">
17302
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
662 <thead class="header">
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
663 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
664 <th>-1:000000000000</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
665 <th>0:b789fdd96dc2</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
666 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
667 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
668
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
669 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
670
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
671 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
672 <td class="source insert"><a href="#r1" id="r1"> </a> </td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
673 <td class="source insert"><a href="#r1" id="r1"> 1</a> a</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
674 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
675 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
676 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
677
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
678 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
679 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
680 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
681
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
682 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
683
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
684
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
685 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
686 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
687
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
688
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
689 comparison existing file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
690
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
691 $ hg up
18334
44bda93df90e merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents: 18264
diff changeset
692 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
693 $ echo a >> a
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
694 $ hg ci -mc
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
695 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a'
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
696 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
697
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
698 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
699 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
700 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
701 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
702 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
703 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
704 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
705
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
706 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
707 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
708 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
709
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
710 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
711 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
712 <div class="logo">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
713 <a href="http://mercurial.selenic.com/">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
714 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
715 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
716 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
717 <li><a href="/shortlog/d73db4d812ff">log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
718 <li><a href="/graph/d73db4d812ff">graph</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
719 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
720 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
721 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
722 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
723 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
724 <li><a href="/rev/d73db4d812ff">changeset</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
725 <li><a href="/file/d73db4d812ff">browse</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
726 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
727 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
728 <li><a href="/file/d73db4d812ff/a">file</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
729 <li><a href="/file/tip/a">latest</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
730 <li><a href="/diff/d73db4d812ff/a">diff</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
731 <li class="active">comparison</li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
732 <li><a href="/annotate/d73db4d812ff/a">annotate</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
733 <li><a href="/log/d73db4d812ff/a">file log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
734 <li><a href="/raw-file/d73db4d812ff/a">raw</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
735 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
736 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
737 <li><a href="/help">help</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
738 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
739 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
740
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
741 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
742 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
743 <h3>comparison a @ 2:d73db4d812ff</h3>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
744
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
745 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
746 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
747 <p><input name="rev" id="search1" type="text" size="30" /></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
748 <div id="hint">find changesets by author, revision,
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
749 files, or words in the commit message</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
750 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
751
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
752 <div class="description">c</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
753
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
754 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
755 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
756 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
757 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
758 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
759 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
760 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
761 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
762 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
763 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
764 <th>parents</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
765 <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
766 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
767 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
768 <th>children</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
769 <td></td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
770 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
771
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
772 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
773
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
774 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
775 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
776 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
777 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
778 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
779 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
780 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
781 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
782
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
783 <table class="bigtable">
17302
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
784 <thead class="header">
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
785 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
786 <th>0:b789fdd96dc2</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
787 <th>1:a80d06849b33</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
788 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
789 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
790
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
791 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
792
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
793 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
794 <td class="source equal"><a href="#l1r1" id="l1r1"> 1</a> a</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
795 <td class="source equal"><a href="#l1r1" id="l1r1"> 1</a> a</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
796 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
797 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
798 <td class="source insert"><a href="#r2" id="r2"> </a> </td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
799 <td class="source insert"><a href="#r2" id="r2"> 2</a> a</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
800 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
801 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
802 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
803
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
804 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
805 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
806 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
807
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
808 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
809
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
810
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
811 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
812 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
813
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
814
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
815 comparison removed file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
816
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
817 $ hg rm a
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
818 $ hg ci -md
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
819 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a'
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
820 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
821
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
822 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
823 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
824 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
825 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
826 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
827 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
828 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
829
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
830 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
831 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
832 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
833
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
834 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
835 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
836 <div class="logo">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
837 <a href="http://mercurial.selenic.com/">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
838 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
839 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
840 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
841 <li><a href="/shortlog/20e80271eb7a">log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
842 <li><a href="/graph/20e80271eb7a">graph</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
843 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
844 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
845 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
846 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
847 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
848 <li><a href="/rev/20e80271eb7a">changeset</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
849 <li><a href="/file/20e80271eb7a">browse</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
850 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
851 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
852 <li><a href="/file/20e80271eb7a/a">file</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
853 <li><a href="/file/tip/a">latest</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
854 <li><a href="/diff/20e80271eb7a/a">diff</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
855 <li class="active">comparison</li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
856 <li><a href="/annotate/20e80271eb7a/a">annotate</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
857 <li><a href="/log/20e80271eb7a/a">file log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
858 <li><a href="/raw-file/20e80271eb7a/a">raw</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
859 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
860 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
861 <li><a href="/help">help</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
862 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
863 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
864
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
865 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
866 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
867 <h3>comparison a @ 3:20e80271eb7a</h3>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
868
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
869 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
870 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
871 <p><input name="rev" id="search1" type="text" size="30" /></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
872 <div id="hint">find changesets by author, revision,
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
873 files, or words in the commit message</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
874 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
875
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
876 <div class="description">d</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
877
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
878 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
879 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
880 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
881 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
882 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
883 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
884 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
885 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
886 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
887 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
888 <th>parents</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
889 <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
890 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
891 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
892 <th>children</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
893 <td></td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
894 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
895
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
896 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
897
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
898 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
899 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
900 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
901 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
902 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
903 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
904 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
905 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
906
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
907 <table class="bigtable">
17302
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
908 <thead class="header">
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
909 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
910 <th>1:a80d06849b33</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
911 <th>-1:000000000000</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
912 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
913 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
914
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
915 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
916
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
917 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
918 <td class="source delete"><a href="#l1" id="l1"> 1</a> a</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
919 <td class="source delete"><a href="#l1" id="l1"> </a> </td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
920 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
921 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
922 <td class="source delete"><a href="#l2" id="l2"> 2</a> a</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
923 <td class="source delete"><a href="#l2" id="l2"> </a> </td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
924 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
925 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
926 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
927
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
928 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
929 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
930 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
931
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
932 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
933
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
934
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
935 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
936 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
937
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
938
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
939 $ cd ..
9731
0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9402
diff changeset
940
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
941 test import rev as raw-rev
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
942
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
943 $ hg clone -r0 test test1
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
944 adding changesets
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
945 adding manifests
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
946 adding file changes
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
947 added 1 changesets with 2 changes to 2 files
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
948 updating to branch default
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
949 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
950 $ cd test1
17109
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
951 $ hg import -q --bypass --exact http://localhost:$HGPORT/rev/1
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
952
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
953 raw revision with diff block numbers
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
954
17466
d5a3bda6e170 killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents: 17303
diff changeset
955 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
956 $ cat <<EOF > .hg/hgrc
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
957 > [web]
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
958 > templates = rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
959 > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
960 $ mkdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
961 $ cat <<EOF > rawdiff/map
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
962 > mimetype = 'text/plain; charset={encoding}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
963 > changeset = '{diff}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
964 > difflineplus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
965 > difflineminus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
966 > difflineat = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
967 > diffline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
968 > filenodelink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
969 > filenolink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
970 > fileline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
971 > diffblock = 'Block: {blockno}\n{lines}\n'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
972 > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
973 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
974 $ cat hg.pid >> $DAEMON_PIDS
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
975 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'raw-rev/0'
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
976 200 Script output follows
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
977
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
978 Block: 1
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
979 diff -r 000000000000 -r 0cd96de13884 a
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
980 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
981 +++ b/a Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
982 @@ -0,0 +1,1 @@
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
983 +a
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
984
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
985 Block: 2
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
986 diff -r 000000000000 -r 0cd96de13884 b
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
987 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
988 +++ b/b Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
989 @@ -0,0 +1,1 @@
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
990 +b
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
991
17466
d5a3bda6e170 killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents: 17303
diff changeset
992 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
993 $ rm .hg/hgrc rawdiff/map
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
994 $ rmdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
995 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
996 $ cat hg.pid >> $DAEMON_PIDS
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
997
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
998 errors
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
999
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1000 $ cat ../test/errors.log
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16722
diff changeset
1001
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16722
diff changeset
1002 $ cd ..