Mercurial > hg

annotate tests/test-hgweb-diffs.t @ 20717:da3124178fbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: added tests to test sort revset This tests are intended to test sort in many different cases where it could fail when using the new structures
author Lucas Moscovicz <lmoscovicz@fb.com>
date Thu, 13 Mar 2014 17:20:03 -0700
parents 544848ef65f2
children 8c9e84b44221
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>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
87 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
88 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
12435
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
19428
c3cdba6e5d7f hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat
Alexander Plavin <me@aplavin.ru>
parents: 18517
diff changeset
118 <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<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;">
19428
c3cdba6e5d7f hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat
Alexander Plavin <me@aplavin.ru>
parents: 18517
diff changeset
120 <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
121 <p>
19455
c229a5e7511e hgweb: make stripes in diffstat with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19433
diff changeset
122 <table class="stripes2"> <tr>
14571
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>
19455
c229a5e7511e hgweb: make stripes in diffstat with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19433
diff changeset
130 <tr>
14571
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>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
142 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
143
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
144 <div class="overflow">
19433
a79b21ece345 hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents: 19432
diff changeset
145 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
19432
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
146 <div class="sourcefirst"> line diff</div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
147 <div class="stripes2 diffblocks">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
148 <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
149 <span id="l1.1" class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
150 <span id="l1.2" class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
151 <span id="l1.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.3"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
152 <span id="l1.4" class="plusline">+a</span><a href="#l1.4"></a></pre></div><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
153 <span id="l2.1" class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l2.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
154 <span id="l2.2" class="plusline">+++ b/b Thu Jan 01 00:00:00 1970 +0000</span><a href="#l2.2"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
155 <span id="l2.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l2.3"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
156 <span id="l2.4" class="plusline">+b</span><a href="#l2.4"></a></pre></div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
157 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
158 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
159
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
160 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
161 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
162 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
163
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
164
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
165 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
166 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
167
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
168
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
169 raw revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
170
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
171 $ "$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
172 200 Script output follows
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 # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
176 # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
177 # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
178 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
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 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
181
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
182 diff -r 000000000000 -r 0cd96de13884 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
183 --- /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
184 +++ 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
185 @@ -0,0 +1,1 @@
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 diff -r 000000000000 -r 0cd96de13884 b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
188 --- /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
189 +++ 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
190 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
191 +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
192
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
193
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
194 diff removed file
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
195
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
196 $ "$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
197 200 Script output follows
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 <!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
200 <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
201 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
202 <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
203 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
204 <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
205 <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
206
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
207 <title>test: b diff</title>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
208 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
209 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
210
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
211 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
212 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
213 <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
214 <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
215 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
216 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
217 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
218 <li><a href="/shortlog/559edbd9ed20">log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
219 <li><a href="/graph/559edbd9ed20">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
220 <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
221 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
222 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
223 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
224 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
225 <li><a href="/rev/559edbd9ed20">changeset</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
226 <li><a href="/file/559edbd9ed20">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
227 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
228 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
229 <li><a href="/file/559edbd9ed20/b">file</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
230 <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
231 <li class="active">diff</li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
232 <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
233 <li><a href="/annotate/559edbd9ed20/b">annotate</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
234 <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
235 <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
236 </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
237 <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
238 <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
239 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
240 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
241
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
242 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
243 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
244 <h3>diff b @ 1:559edbd9ed20</h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
245
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
246 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
247 <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
248 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
249 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
250 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
251 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
252
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
253 <div class="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
254
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
255 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
256 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
257 <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
258 <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
259 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
260 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
261 <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
262 <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
263 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
264 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
265 <th>parents</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
266 <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
267 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
268 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
269 <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
270 <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
271 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
272 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
273
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
274 <div class="overflow">
19433
a79b21ece345 hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents: 19432
diff changeset
275 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
19432
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
276 <div class="sourcefirst"> line diff</div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
277 <div class="stripes2 diffblocks">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
278 <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
279 <span id="l1.1" class="minusline">--- a/b Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
280 <span id="l1.2" class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
281 <span id="l1.3" class="atline">@@ -1,1 +0,0 @@</span><a href="#l1.3"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
282 <span id="l1.4" class="minusline">-b</span><a href="#l1.4"></a></pre></div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
283 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
284 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
285 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
286 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
287
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
288 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
289
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
290
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
291 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
292 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
293
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
294
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
295 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
296
17466
d5a3bda6e170 killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents: 17303
diff changeset
297 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
298 $ 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
299 $ cat hg.pid >> $DAEMON_PIDS
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
300
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
301 revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
302
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
303 $ "$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
304 200 Script output follows
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 <!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
307 <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
308 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
309 <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
310 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
311 <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
312 <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
313
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
314 <title>test: 0cd96de13884</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
315 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
316 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
317 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
318 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
319 <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
320 <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
321 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
322 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
323 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
324 <li><a href="/shortlog/0cd96de13884">log</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
325 <li><a href="/graph/0cd96de13884">graph</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
326 <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
327 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
328 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
329 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
330 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
331 <li class="active">changeset</li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
332 <li><a href="/raw-rev/0cd96de13884">raw</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
333 <li><a href="/file/0cd96de13884">browse</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
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
337 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
338 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
339 <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
340 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
341 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
342
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
343 <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
344
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
345 <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
346 <h3>changeset 0:0cd96de13884 </h3>
12435
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 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
349
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
350 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
351 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
352 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
353 </form>
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 <div class="description">a</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
356
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
357 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
358 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
359 <th class="author">author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
360 <td class="author">&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
361 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
362 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
363 <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
364 <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
365 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
366 <th class="author">parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
367 <td class="author"></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
368 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
369 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
370 <th class="author">children</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
371 <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
372 </tr>
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 <th class="files">files</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
375 <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
376 </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
377 <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
378 <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
379 <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
380 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
381
19428
c3cdba6e5d7f hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat
Alexander Plavin <me@aplavin.ru>
parents: 18517
diff changeset
382 <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
383 <div id="diffstatdetails" style="display:none;">
19428
c3cdba6e5d7f hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat
Alexander Plavin <me@aplavin.ru>
parents: 18517
diff changeset
384 <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
385 <p>
19455
c229a5e7511e hgweb: make stripes in diffstat with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19433
diff changeset
386 <table class="stripes2"> <tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
387 <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
388 <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
389 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
390 <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
391 <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
392 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
393 </tr>
19455
c229a5e7511e hgweb: make stripes in diffstat with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19433
diff changeset
394 <tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
395 <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
396 <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
397 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
398 <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
399 <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
400 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
401 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
402 </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
403 </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
404 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
405 </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
406 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
407
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
408 <div class="overflow">
19433
a79b21ece345 hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents: 19432
diff changeset
409 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
19432
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
410 <div class="sourcefirst"> line diff</div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
411 <div class="stripes2 diffblocks">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
412 <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
413 <span id="l1.1">new file mode 100644</span><a href="#l1.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
414 <span id="l1.2" class="minusline">--- /dev/null</span><a href="#l1.2"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
415 <span id="l1.3" class="plusline">+++ b/a</span><a href="#l1.3"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
416 <span id="l1.4" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.4"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
417 <span id="l1.5" class="plusline">+a</span><a href="#l1.5"></a></pre></div><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
418 <span id="l2.1">new file mode 100644</span><a href="#l2.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
419 <span id="l2.2" class="minusline">--- /dev/null</span><a href="#l2.2"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
420 <span id="l2.3" class="plusline">+++ b/b</span><a href="#l2.3"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
421 <span id="l2.4" class="atline">@@ -0,0 +1,1 @@</span><a href="#l2.4"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
422 <span id="l2.5" class="plusline">+b</span><a href="#l2.5"></a></pre></div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
423 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
424 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
425
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
426 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
427 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
428 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
429
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
430
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
431 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
432 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
433
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
434
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
435 revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
436
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
437 $ "$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
438 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
439
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 # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
442 # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
443 # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
444 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
445
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
446 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
447
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
448 diff --git a/a b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
449 new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
450 --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
451 +++ b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
452 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
453 +a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
454 diff --git a/b b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
455 new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
456 --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
457 +++ b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
458 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
459 +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
460
9402
5d49fdef6fd0 hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8452
diff changeset
461
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
462 diff removed file
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
463
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
464 $ "$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
465 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
466
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
467 <!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
468 <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
469 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
470 <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
471 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
472 <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
473 <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
474
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
475 <title>test: a diff</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
476 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
477 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
478
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
479 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
480 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
481 <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
482 <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
483 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
484 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
485 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
486 <li><a href="/shortlog/559edbd9ed20">log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
487 <li><a href="/graph/559edbd9ed20">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
488 <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
489 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
490 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
491 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
492 <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
493 <li><a href="/rev/559edbd9ed20">changeset</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
494 <li><a href="/file/559edbd9ed20">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
495 </ul>
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="/file/559edbd9ed20/a">file</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
498 <li><a href="/file/tip/a">latest</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
499 <li class="active">diff</li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
500 <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
501 <li><a href="/annotate/559edbd9ed20/a">annotate</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
502 <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
503 <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
504 </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
505 <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
506 <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
507 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
508 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
509
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
510 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
511 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
512 <h3>diff a @ 1:559edbd9ed20</h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
513
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
514 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
515 <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
516 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
517 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
518 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
519 </form>
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="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
522
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
523 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
524 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
525 <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
526 <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
527 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
528 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
529 <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
530 <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
531 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
532 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
533 <th>parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
534 <td></td>
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 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
537 <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
538 <td></td>
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 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
541
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
542 <div class="overflow">
19433
a79b21ece345 hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents: 19432
diff changeset
543 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
19432
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
544 <div class="sourcefirst"> line diff</div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
545 <div class="stripes2 diffblocks">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
546 <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
547 <span id="l1.1">old mode 100644</span><a href="#l1.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
548 <span id="l1.2">new mode 100755</span><a href="#l1.2"></a></pre></div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
549 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
550 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
551 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
552 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
553
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
554 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
555
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
556
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
557 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
558 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
559
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
560
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
561 comparison new file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
562
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
563 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/0/a'
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
564 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
565
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
566 <!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
567 <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
568 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
569 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
570 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
571 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
572 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
573
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
574 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
575 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
576 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
577
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
578 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
579 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
580 <div class="logo">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
581 <a href="http://mercurial.selenic.com/">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
582 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
583 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
584 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
585 <li><a href="/shortlog/0cd96de13884">log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
586 <li><a href="/graph/0cd96de13884">graph</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
587 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
588 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
589 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
590 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
591 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
592 <li><a href="/rev/0cd96de13884">changeset</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
593 <li><a href="/file/0cd96de13884">browse</a></li>
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 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
596 <li><a href="/file/0cd96de13884/a">file</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
597 <li><a href="/file/tip/a">latest</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
598 <li><a href="/diff/0cd96de13884/a">diff</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
599 <li class="active">comparison</li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
600 <li><a href="/annotate/0cd96de13884/a">annotate</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
601 <li><a href="/log/0cd96de13884/a">file log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
602 <li><a href="/raw-file/0cd96de13884/a">raw</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
603 </ul>
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 <li><a href="/help">help</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
606 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
607 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
608
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
609 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
610 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
611 <h3>comparison a @ 0:0cd96de13884</h3>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
612
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
613 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
614 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
615 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
616 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
617 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
618 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
619
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
620 <div class="description">a</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
621
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
622 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
623 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
624 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
625 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
626 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
627 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
628 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
629 <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
630 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
631 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
632 <th>parents</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
633 <td></td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
634 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
635 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
636 <th>children</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
637 <td></td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
638 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
639 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
640
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
641 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
642 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
643 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
644 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
645 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
646 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
647 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
648 </div>
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 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
651 <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
652 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
653 <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
654 <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
655 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
656 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
657
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
658 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
659
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
660 <tr id="r1">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
661 <td class="source insert"><a href="#r1"> </a> </td>
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
662 <td class="source insert"><a href="#r1"> 1</a> a</td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
663 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
664 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
665 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
666
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
667 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
668 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
669 </div>
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 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
672
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
673
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
674 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
675 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
676
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 comparison existing file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
679
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
680 $ hg up
18334
44bda93df90e merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents: 18264
diff changeset
681 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
682 $ echo a >> a
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
683 $ hg ci -mc
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
684 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a'
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
685 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
686
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
687 <!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
688 <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
689 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
690 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
691 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
692 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
693 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
694
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
695 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
696 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
697 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
698
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
699 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
700 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
701 <div class="logo">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
702 <a href="http://mercurial.selenic.com/">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
703 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
704 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
705 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
706 <li><a href="/shortlog/d73db4d812ff">log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
707 <li><a href="/graph/d73db4d812ff">graph</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
708 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
709 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
710 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
711 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
712 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
713 <li><a href="/rev/d73db4d812ff">changeset</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
714 <li><a href="/file/d73db4d812ff">browse</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
715 </ul>
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="/file/d73db4d812ff/a">file</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
718 <li><a href="/file/tip/a">latest</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
719 <li><a href="/diff/d73db4d812ff/a">diff</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
720 <li class="active">comparison</li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
721 <li><a href="/annotate/d73db4d812ff/a">annotate</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
722 <li><a href="/log/d73db4d812ff/a">file log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
723 <li><a href="/raw-file/d73db4d812ff/a">raw</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
724 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
725 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
726 <li><a href="/help">help</a></li>
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 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
729
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
730 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
731 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
732 <h3>comparison a @ 2:d73db4d812ff</h3>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
733
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
734 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
735 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
736 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
737 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
738 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
739 </form>
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="description">c</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
742
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
743 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
744 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
745 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
746 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
747 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
748 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
749 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
750 <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
751 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
752 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
753 <th>parents</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
754 <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
17202
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 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
757 <th>children</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
758 <td></td>
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 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
761
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
762 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
763 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
764 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
765 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
766 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
767 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
768 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
769 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
770
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
771 <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
772 <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
773 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
774 <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
775 <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
776 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
777 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
778
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
779 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
780
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
781 <tr id="l1r1">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
782 <td class="source equal"><a href="#l1r1"> 1</a> a</td>
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
783 <td class="source equal"><a href="#l1r1"> 1</a> a</td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
784 </tr>
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
785 <tr id="r2">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
786 <td class="source insert"><a href="#r2"> </a> </td>
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
787 <td class="source insert"><a href="#r2"> 2</a> a</td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
788 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
789 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
790 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
791
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
792 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
793 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
794 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
795
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
796 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
797
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
798
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
799 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
800 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
801
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
802
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
803 comparison removed file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
804
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
805 $ hg rm a
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
806 $ hg ci -md
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
807 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a'
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
808 200 Script output follows
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 <!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
811 <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
812 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
813 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
814 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
815 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
816 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
817
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
818 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
819 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
820 <body>
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 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
823 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
824 <div class="logo">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
825 <a href="http://mercurial.selenic.com/">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
826 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
827 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
828 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
829 <li><a href="/shortlog/20e80271eb7a">log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
830 <li><a href="/graph/20e80271eb7a">graph</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
831 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
832 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
833 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
834 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
835 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
836 <li><a href="/rev/20e80271eb7a">changeset</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
837 <li><a href="/file/20e80271eb7a">browse</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
838 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
839 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
840 <li><a href="/file/20e80271eb7a/a">file</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
841 <li><a href="/file/tip/a">latest</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
842 <li><a href="/diff/20e80271eb7a/a">diff</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
843 <li class="active">comparison</li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
844 <li><a href="/annotate/20e80271eb7a/a">annotate</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
845 <li><a href="/log/20e80271eb7a/a">file log</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
846 <li><a href="/raw-file/20e80271eb7a/a">raw</a></li>
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 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
849 <li><a href="/help">help</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 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
852
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
853 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
854 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
855 <h3>comparison a @ 3:20e80271eb7a</h3>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
856
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
857 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
858 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
859 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
860 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
861 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
862 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
863
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
864 <div class="description">d</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
865
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
866 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
867 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
868 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
869 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
870 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
871 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
872 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
873 <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
874 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
875 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
876 <th>parents</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
877 <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
878 </tr>
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>children</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
881 <td></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 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
884
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
885 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
886 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
887 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
888 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
889 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
890 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
891 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
892 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
893
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
894 <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
895 <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
896 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
897 <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
898 <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
899 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
900 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
901
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
902 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
903
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
904 <tr id="l1">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
905 <td class="source delete"><a href="#l1"> 1</a> a</td>
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
906 <td class="source delete"><a href="#l1"> </a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
907 </tr>
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
908 <tr id="l2">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
909 <td class="source delete"><a href="#l2"> 2</a> a</td>
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
910 <td class="source delete"><a href="#l2"> </a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
911 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
912 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
913 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
914
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
915 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
916 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
917 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
918
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
919 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
920
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
921
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
922 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
923 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
924
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
925
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
926 $ cd ..
9731
0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9402
diff changeset
927
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
928 test import rev as raw-rev
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
929
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
930 $ hg clone -r0 test test1
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
931 adding changesets
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
932 adding manifests
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
933 adding file changes
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
934 added 1 changesets with 2 changes to 2 files
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
935 updating to branch default
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
936 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
937 $ cd test1
17109
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
938 $ 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
939
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
940 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
941
17466
d5a3bda6e170 killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents: 17303
diff changeset
942 $ "$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
943 $ 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
944 > [web]
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
945 > templates = rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
946 > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
947 $ mkdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
948 $ 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
949 > 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
950 > changeset = '{diff}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
951 > difflineplus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
952 > difflineminus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
953 > difflineat = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
954 > diffline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
955 > filenodelink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
956 > filenolink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
957 > fileline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
958 > 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
959 > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
960 $ 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
961 $ cat hg.pid >> $DAEMON_PIDS
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
962 $ "$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
963 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
964
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
965 Block: 1
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
966 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
967 --- /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
968 +++ 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
969 @@ -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
970 +a
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
971
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
972 Block: 2
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
973 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
974 --- /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
975 +++ 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
976 @@ -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
977 +b
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
978
17466
d5a3bda6e170 killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents: 17303
diff changeset
979 $ "$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
980 $ 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
981 $ rmdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
982 $ 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
983 $ 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
984
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
985 errors
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
986
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
987 $ cat ../test/errors.log
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16722
diff changeset
988
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16722
diff changeset
989 $ cd ..