annotate tests/test-hgweb-diffs.t @ 29218:fd288d118074

largefiles: send statlfile remote calls only for nonexisting locally files Files that are already in local store should be checked locally. The problem with this implementation is how difference in messages between local and remote checks should look like. For now local errors for file missing and content corrupted looks like this: 'changeset cset: filename references missing storepath\n' 'changeset cset: filename references corrupted storepath\n' for remote it looks like: 'changeset cset: filename missing\n' 'changeset cset: filename: contents differ\n' Contents differ error for remote calls is never raised currently - for now statlfile implementation lacks checking file content.
author liscju <piotr.listkiewicz@gmail.com>
date Mon, 09 May 2016 10:05:32 +0200
parents 522ffc189671
children eb7de21b15be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 21123
diff changeset
1 #require serve
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
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
39 $ 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">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
56 <a href="https://mercurial-scm.org/">
12435
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>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
60 <li><a href="/shortlog/0">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
61 <li><a href="/graph/0">graph</a></li>
12435
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>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
68 <li><a href="/raw-rev/0">raw</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
69 <li><a href="/file/0">browse</a></li>
12435
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>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
82 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
83 changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
84
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
85 </h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
86
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
87 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
88
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
89 <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
90 <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
91 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
92 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
93
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
94 <div class="description">a</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
95
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
96 <table id="changesetEntry">
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 <th class="author">author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
99 <td class="author">&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
100 </tr>
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="date">date</th>
24130
03f692eee31d hgweb: clearly outline <tr> block in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 24042
diff changeset
103 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
03f692eee31d hgweb: clearly outline <tr> block in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 24042
diff changeset
104 </tr>
12435
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">parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
107 <td class="author"></td>
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="author">children</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
111 <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
112 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
113 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
114 <th class="files">files</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
115 <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
116 </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
117 <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
118 <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
119 <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
120 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
121
23831
0ab23a48b9a7 hgweb: fix diffstat links in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 23829
diff changeset
122 <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
123 <div id="diffstatdetails" style="display:none;">
23831
0ab23a48b9a7 hgweb: fix diffstat links in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 23829
diff changeset
124 <a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
24042
bf661a03fddc hgweb: use css margin instead of empty <p> before diffstat table
Anton Shestakov <engored@ya.ru>
parents: 23831
diff changeset
125 <table class="diffstat-table stripes2"> <tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
126 <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
127 <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
128 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
129 <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
130 <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
131 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
132 </tr>
19455
c229a5e7511e hgweb: make stripes in diffstat with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19433
diff changeset
133 <tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
134 <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
135 <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
136 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
137 <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
138 <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
139 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
140 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
141 </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
142 </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
143 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
144 </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
145 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
146
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
147 <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
148 <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
149 <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
150 <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
151 <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
152 <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
153 <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
154 <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
155 <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
156 <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
157 <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
158 <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
159 <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
160 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
161 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
162
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
163 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
164 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
165 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
166
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 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
169 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
170
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
171
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
172 raw revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
173
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
174 $ 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
175 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
176
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
177
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
178 # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
179 # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
180 # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
181 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
182
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
183 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
184
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
185 diff -r 000000000000 -r 0cd96de13884 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
186 --- /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
187 +++ 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
188 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
189 +a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
190 diff -r 000000000000 -r 0cd96de13884 b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
191 --- /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
192 +++ 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
193 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
194 +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
195
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
196
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
197 diff removed file
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
198
21122
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
199 $ hg log --template "{file_mods}\n{file_dels}\n" -r tip
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
200 a
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
201 b
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
202 $ hg parents --template "{node|short}\n" -r tip
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
203 0cd96de13884
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
204 $ hg parents --template "{node|short}\n" -r tip b
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
205 0cd96de13884
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
206
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
207 $ 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
208 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
209
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
210 <!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
211 <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
212 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
213 <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
214 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
215 <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
216 <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
217
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
218 <title>test: b diff</title>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
219 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
220 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
221
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
222 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
223 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
224 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
225 <a href="https://mercurial-scm.org/">
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
226 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
227 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
228 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
229 <li><a href="/shortlog/tip">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
230 <li><a href="/graph/tip">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
231 <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
232 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
233 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
234 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
235 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
236 <li><a href="/rev/tip">changeset</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
237 <li><a href="/file/tip">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
238 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
239 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
240 <li><a href="/file/tip/b">file</a></li>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
241 <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
242 <li class="active">diff</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
243 <li><a href="/comparison/tip/b">comparison</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
244 <li><a href="/annotate/tip/b">annotate</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
245 <li><a href="/log/tip/b">file log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
246 <li><a href="/raw-file/tip/b">raw</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
247 </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
248 <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
249 <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
250 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
251 </div>
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="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
254 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
255 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
256 diff b @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
257 <span class="tag">tip</span>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
258 </h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
259
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
260 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
261 <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
262 <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
263 <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
264 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
265 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
266
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
267 <div class="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
268
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
269 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
270 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
271 <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
272 <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
273 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
274 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
275 <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
276 <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
277 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
278 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
279 <th>parents</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
280 <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
281 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
282 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
283 <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
284 <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
285 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
286 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
287
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
288 <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
289 <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
290 <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
291 <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
292 <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
293 <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
294 <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
295 <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
296 <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
297 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
298 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
299 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
300 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
301
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
302 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
303
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
304
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
305 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
306 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
307
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
308
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
309 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
310
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
311 $ killdaemons.py
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
312 $ 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
313 $ cat hg.pid >> $DAEMON_PIDS
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
314
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
315 revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
316
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
317 $ get-with-headers.py localhost:$HGPORT 'rev/0'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
318 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
319
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
320 <!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
321 <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
322 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
323 <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
324 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
325 <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
326 <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
327
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
328 <title>test: 0cd96de13884</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
329 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
330 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
331 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
332 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
333 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
334 <a href="https://mercurial-scm.org/">
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
335 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
336 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
337 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
338 <li><a href="/shortlog/0">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
339 <li><a href="/graph/0">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
340 <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
341 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
342 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
343 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
344 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
345 <li class="active">changeset</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
346 <li><a href="/raw-rev/0">raw</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
347 <li><a href="/file/0">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
348 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
349 <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
350
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
351 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
352 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
353 <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
354 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
355 </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 <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
358
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
359 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
360 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
361 changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
362
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
363 </h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
364
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
365 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
366
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
367 <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
368 <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
369 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
370 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
371
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
372 <div class="description">a</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
373
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
374 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
375 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
376 <th class="author">author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
377 <td class="author">&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
378 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
379 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
380 <th class="date">date</th>
24130
03f692eee31d hgweb: clearly outline <tr> block in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 24042
diff changeset
381 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
03f692eee31d hgweb: clearly outline <tr> block in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 24042
diff changeset
382 </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
383 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
384 <th class="author">parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
385 <td class="author"></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
386 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
387 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
388 <th class="author">children</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
389 <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
390 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
391 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
392 <th class="files">files</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
393 <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
394 </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
395 <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
396 <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
397 <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
398 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
399
23831
0ab23a48b9a7 hgweb: fix diffstat links in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 23829
diff changeset
400 <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
401 <div id="diffstatdetails" style="display:none;">
23831
0ab23a48b9a7 hgweb: fix diffstat links in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 23829
diff changeset
402 <a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
24042
bf661a03fddc hgweb: use css margin instead of empty <p> before diffstat table
Anton Shestakov <engored@ya.ru>
parents: 23831
diff changeset
403 <table class="diffstat-table stripes2"> <tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
404 <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
405 <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
406 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
407 <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
408 <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
409 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
410 </tr>
19455
c229a5e7511e hgweb: make stripes in diffstat with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19433
diff changeset
411 <tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
412 <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
413 <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
414 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
415 <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
416 <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
417 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
418 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
419 </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
420 </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
421 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
422 </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
423 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
424
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
425 <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
426 <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
427 <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
428 <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
429 <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
430 <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
431 <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
432 <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
433 <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
434 <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
435 <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
436 <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
437 <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
438 <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
439 <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
440 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
441 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
442
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
443 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
444 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
445 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
446
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 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
449 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
450
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
451
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
452 revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
453
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
454 $ 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
455 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
456
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
457
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
458 # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
459 # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
460 # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
461 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
462
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
463 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
464
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
465 diff --git a/a b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
466 new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
467 --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
468 +++ b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
469 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
470 +a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
471 diff --git a/b b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
472 new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
473 --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
474 +++ b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
475 @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
476 +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
477
9402
5d49fdef6fd0 hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8452
diff changeset
478
21122
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
479 diff modified file
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
480
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
481 $ hg log --template "{file_mods}\n{file_dels}\n" -r tip
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
482 a
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
483 b
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
484 $ hg parents --template "{node|short}\n" -r tip
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
485 0cd96de13884
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
486 $ hg parents --template "{node|short}\n" -r tip a
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
487 0cd96de13884
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
488
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
489 $ 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
490 200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
491
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
492 <!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
493 <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
494 <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
495 <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
496 <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
497 <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
498 <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
499
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
500 <title>test: a diff</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
501 </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
502 <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
503
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
504 <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
505 <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
506 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
507 <a href="https://mercurial-scm.org/">
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
508 <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
509 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
510 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
511 <li><a href="/shortlog/tip">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
512 <li><a href="/graph/tip">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
513 <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
514 <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
515 <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
516 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
517 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
518 <li><a href="/rev/tip">changeset</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
519 <li><a href="/file/tip">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
520 </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
521 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
522 <li><a href="/file/tip/a">file</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
523 <li><a href="/file/tip/a">latest</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
524 <li class="active">diff</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
525 <li><a href="/comparison/tip/a">comparison</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
526 <li><a href="/annotate/tip/a">annotate</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
527 <li><a href="/log/tip/a">file log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
528 <li><a href="/raw-file/tip/a">raw</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
529 </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
530 <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
531 <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
532 </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
533 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
534
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
535 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
536 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
537 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
538 diff a @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
539 <span class="tag">tip</span>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
540 </h3>
12435
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 <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
543 <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
544 <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
545 <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
546 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
547 </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
548
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
549 <div class="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
550
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
551 <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
552 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
553 <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
554 <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
555 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
556 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
557 <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
558 <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
559 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
560 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
561 <th>parents</th>
21122
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
562 <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
563 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
564 <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
565 <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
566 <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
567 </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
568 </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
569
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
570 <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
571 <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
572 <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
573 <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
574 <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
575 <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
576 <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
577 </div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
578 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
579 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
580 </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
581
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
582 <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
583
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
584
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
585 </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
586 </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
587
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
588
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
589 comparison new file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
590
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
591 $ hg parents --template "{rev}:{node|short}\n" -r 0
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
592 $ hg log --template "{rev}:{node|short}\n" -r 0
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
593 0:0cd96de13884
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
594
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
595 $ get-with-headers.py localhost:$HGPORT 'comparison/0/a'
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
596 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
597
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
598 <!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
599 <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
600 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
601 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
602 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
603 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
604 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
605
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
606 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
607 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
608 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
609
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
610 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
611 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
612 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
613 <a href="https://mercurial-scm.org/">
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
614 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
615 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
616 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
617 <li><a href="/shortlog/0">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
618 <li><a href="/graph/0">graph</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
619 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
620 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
621 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
622 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
623 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
624 <li><a href="/rev/0">changeset</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
625 <li><a href="/file/0">browse</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
626 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
627 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
628 <li><a href="/file/0/a">file</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
629 <li><a href="/file/tip/a">latest</a></li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
630 <li><a href="/diff/0/a">diff</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
631 <li class="active">comparison</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
632 <li><a href="/annotate/0/a">annotate</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
633 <li><a href="/log/0/a">file log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
634 <li><a href="/raw-file/0/a">raw</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
635 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
636 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
637 <li><a href="/help">help</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
638 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
639 </div>
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="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
642 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
643 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
644 comparison a @ 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
645
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
646 </h3>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
647
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
648 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
649 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
650 <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
651 <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
652 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
653 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
654
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
655 <div class="description">a</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
656
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
657 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
658 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
659 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
660 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
661 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
662 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
663 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
664 <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
665 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
666 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
667 <th>parents</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
668 <td></td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
669 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
670 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
671 <th>children</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
672 <td></td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
673 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
674 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
675
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
676 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
677 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
678 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
679 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
680 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
681 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
682 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
683 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
684
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
685 <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
686 <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
687 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
688 <th>-1:000000000000</th>
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
689 <th>0:0cd96de13884</th>
17302
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
690 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
691 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
692
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
693 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
694
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
695 <tr id="r1">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
696 <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
697 <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
698 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
699 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
700 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
701
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
702 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
703 </div>
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
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
706 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
707
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
708
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
709 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
710 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
711
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
712
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
713 comparison existing file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
714
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
715 $ hg up
18334
44bda93df90e merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents: 18264
diff changeset
716 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
717 $ echo a >> a
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
718 $ hg ci -mc
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
719
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
720 $ hg parents --template "{rev}:{node|short}\n" -r tip
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
721 1:559edbd9ed20
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
722 $ hg log --template "{rev}:{node|short}\n" -r tip
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
723 2:d73db4d812ff
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
724
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
725 $ get-with-headers.py localhost:$HGPORT 'comparison/tip/a'
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
726 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
727
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
728 <!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
729 <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
730 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
731 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
732 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
733 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
734 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
735
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
736 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
737 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
738 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
739
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
740 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
741 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
742 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
743 <a href="https://mercurial-scm.org/">
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
744 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
745 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
746 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
747 <li><a href="/shortlog/tip">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
748 <li><a href="/graph/tip">graph</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
749 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
750 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
751 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
752 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
753 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
754 <li><a href="/rev/tip">changeset</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
755 <li><a href="/file/tip">browse</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
756 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
757 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
758 <li><a href="/file/tip/a">file</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
759 <li><a href="/file/tip/a">latest</a></li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
760 <li><a href="/diff/tip/a">diff</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
761 <li class="active">comparison</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
762 <li><a href="/annotate/tip/a">annotate</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
763 <li><a href="/log/tip/a">file log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
764 <li><a href="/raw-file/tip/a">raw</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
765 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
766 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
767 <li><a href="/help">help</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
768 </ul>
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 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
772 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
773 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
774 comparison a @ 2:<a href="/rev/d73db4d812ff">d73db4d812ff</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
775 <span class="tag">tip</span>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
776 </h3>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
777
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
778 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
779 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
780 <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
781 <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
782 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
783 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
784
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
785 <div class="description">c</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
786
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
787 <table id="changesetEntry">
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 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
790 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
791 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
792 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
793 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
794 <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
795 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
796 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
797 <th>parents</th>
17303
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison
wujek srujek <wujek.srujek@googlemail.com>
parents: 17302
diff changeset
798 <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
799 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
800 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
801 <th>children</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
802 <td></td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
803 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
804 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
805
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
806 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
807 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
808 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
809 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
810 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
811 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
812 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
813 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
814
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
815 <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
816 <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
817 <tr>
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
818 <th>1:559edbd9ed20</th>
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
819 <th>2:d73db4d812ff</th>
17302
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
820 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
821 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
822
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
823 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
824
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
825 <tr id="l1r1">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
826 <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
827 <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
828 </tr>
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
829 <tr id="r2">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
830 <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
831 <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
832 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
833 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
834 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
835
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
836 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
837 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
838 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
839
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
840 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
841
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
842
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
843 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
844 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
845
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
846
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
847 comparison removed file
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
848
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
849 $ hg rm a
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
850 $ hg ci -md
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
851
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
852 $ hg parents --template "{rev}:{node|short}\n" -r tip
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
853 2:d73db4d812ff
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
854 $ hg log --template "{rev}:{node|short}\n" -r tip
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
855 3:20e80271eb7a
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
856
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
857 $ get-with-headers.py localhost:$HGPORT 'comparison/tip/a'
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
858 200 Script output follows
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
859
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
860 <!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
861 <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
862 <head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
863 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
864 <meta name="robots" content="index, nofollow" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
865 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
866 <script type="text/javascript" src="/static/mercurial.js"></script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
867
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
868 <title>test: a comparison</title>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
869 </head>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
870 <body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
871
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
872 <div class="container">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
873 <div class="menu">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
874 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
875 <a href="https://mercurial-scm.org/">
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
876 <img src="/static/hglogo.png" alt="mercurial" /></a>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
877 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
878 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
879 <li><a href="/shortlog/tip">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
880 <li><a href="/graph/tip">graph</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
881 <li><a href="/tags">tags</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
882 <li><a href="/bookmarks">bookmarks</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
883 <li><a href="/branches">branches</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
884 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
885 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
886 <li><a href="/rev/tip">changeset</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
887 <li><a href="/file/tip">browse</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
888 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
889 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
890 <li><a href="/file/tip/a">file</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
891 <li><a href="/file/tip/a">latest</a></li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
892 <li><a href="/diff/tip/a">diff</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
893 <li class="active">comparison</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
894 <li><a href="/annotate/tip/a">annotate</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
895 <li><a href="/log/tip/a">file log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
896 <li><a href="/raw-file/tip/a">raw</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
897 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
898 <ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
899 <li><a href="/help">help</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
900 </ul>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
901 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
902
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
903 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
904 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
905 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
906 comparison a @ 3:<a href="/rev/20e80271eb7a">20e80271eb7a</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
907 <span class="tag">tip</span>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
908 </h3>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
909
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
910 <form class="search" action="/log">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
911 <p></p>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
912 <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
913 <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
914 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
915 </form>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
916
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
917 <div class="description">d</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 <table id="changesetEntry">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
920 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
921 <th>author</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
922 <td>&#116;&#101;&#115;&#116;</td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
923 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
924 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
925 <th>date</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
926 <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
927 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
928 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
929 <th>parents</th>
27158
522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962)
Anton Shestakov <av6@dwimlabs.net>
parents: 26421
diff changeset
930 <td><a href="/file/d73db4d812ff/a">d73db4d812ff</a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
931 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
932 <tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
933 <th>children</th>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
934 <td></td>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
935 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
936 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
937
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
938 <div class="overflow">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
939 <div class="sourcefirst"> comparison</div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
940 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
941 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
942 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
943 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
944 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
945 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
946
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
947 <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
948 <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
949 <tr>
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
950 <th>2:d73db4d812ff</th>
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
951 <th>3:20e80271eb7a</th>
17302
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
952 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
953 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
954
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
955 <tbody class="block">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
956
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
957 <tr id="l1">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
958 <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
959 <td class="source delete"><a href="#l1"> </a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
960 </tr>
19459
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
961 <tr id="l2">
fbfe5748ef3e hgweb: highlight line which is linked to at comparison view
Alexander Plavin <me@aplavin.ru>
parents: 19455
diff changeset
962 <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
963 <td class="source delete"><a href="#l2"> </a> </td>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
964 </tr>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
965 </tbody>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
966 </table>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
967
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
968 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
969 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
970 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
971
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
972 <script type="text/javascript">process_dates()</script>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
973
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
974
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
975 </body>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
976 </html>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
977
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 17109
diff changeset
978
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
979 comparison not-modified file
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
980
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
981 $ echo e > e
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
982 $ hg add e
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
983 $ hg ci -m e
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
984 $ echo f > f
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
985 $ hg add f
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
986 $ hg ci -m f
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
987 $ hg tip --template "{rev}:{node|short}\n"
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
988 5:41d9fc4a6ae1
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
989 $ hg diff -c tip e
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
990 $ hg parents --template "{rev}:{node|short}\n" -r tip
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
991 4:402bea3b0976
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
992 $ hg parents --template "{rev}:{node|short}\n" -r tip e
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
993 4:402bea3b0976
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
994
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
995 $ get-with-headers.py localhost:$HGPORT 'comparison/tip/e'
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
996 200 Script output follows
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
997
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
998 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
999 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1000 <head>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1001 <link rel="icon" href="/static/hgicon.png" type="image/png" />
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1002 <meta name="robots" content="index, nofollow" />
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1003 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1004 <script type="text/javascript" src="/static/mercurial.js"></script>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1005
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1006 <title>test: e comparison</title>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1007 </head>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1008 <body>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1009
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1010 <div class="container">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1011 <div class="menu">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1012 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
1013 <a href="https://mercurial-scm.org/">
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1014 <img src="/static/hglogo.png" alt="mercurial" /></a>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1015 </div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1016 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1017 <li><a href="/shortlog/tip">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1018 <li><a href="/graph/tip">graph</a></li>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1019 <li><a href="/tags">tags</a></li>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1020 <li><a href="/bookmarks">bookmarks</a></li>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1021 <li><a href="/branches">branches</a></li>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1022 </ul>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1023 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1024 <li><a href="/rev/tip">changeset</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1025 <li><a href="/file/tip">browse</a></li>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1026 </ul>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1027 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1028 <li><a href="/file/tip/e">file</a></li>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1029 <li><a href="/file/tip/e">latest</a></li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1030 <li><a href="/diff/tip/e">diff</a></li>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1031 <li class="active">comparison</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1032 <li><a href="/annotate/tip/e">annotate</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1033 <li><a href="/log/tip/e">file log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25474
diff changeset
1034 <li><a href="/raw-file/tip/e">raw</a></li>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1035 </ul>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1036 <ul>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1037 <li><a href="/help">help</a></li>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1038 </ul>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1039 </div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1040
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1041 <div class="main">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1042 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
1043 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
1044 comparison e @ 5:<a href="/rev/41d9fc4a6ae1">41d9fc4a6ae1</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
1045 <span class="tag">tip</span>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
1046 </h3>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1047
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1048 <form class="search" action="/log">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1049 <p></p>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1050 <p><input name="rev" id="search1" type="text" size="30" /></p>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1051 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1052 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1053 </form>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1054
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1055 <div class="description">f</div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1056
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1057 <table id="changesetEntry">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1058 <tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1059 <th>author</th>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1060 <td>&#116;&#101;&#115;&#116;</td>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1061 </tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1062 <tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1063 <th>date</th>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1064 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1065 </tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1066 <tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1067 <th>parents</th>
21122
50981ce36236 hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21121
diff changeset
1068 <td><a href="/file/402bea3b0976/e">402bea3b0976</a> </td>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1069 </tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1070 <tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1071 <th>children</th>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1072 <td></td>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1073 </tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1074 </table>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1075
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1076 <div class="overflow">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1077 <div class="sourcefirst"> comparison</div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1078 <div class="legend">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1079 <span class="legendinfo equal">equal</span>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1080 <span class="legendinfo delete">deleted</span>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1081 <span class="legendinfo insert">inserted</span>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1082 <span class="legendinfo replace">replaced</span>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1083 </div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1084
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1085 <table class="bigtable">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1086 <thead class="header">
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1087 <tr>
21123
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
1088 <th>4:402bea3b0976</th>
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21122
diff changeset
1089 <th>5:41d9fc4a6ae1</th>
21121
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1090 </tr>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1091 </thead>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1092
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1093 </table>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1094
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1095 </div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1096 </div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1097 </div>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1098
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1099 <script type="text/javascript">process_dates()</script>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1100
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1101
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1102 </body>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1103 </html>
8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19796
diff changeset
1104
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1105 $ cd ..
9731
0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9402
diff changeset
1106
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1107 test import rev as raw-rev
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1108
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1109 $ hg clone -r0 test test1
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1110 adding changesets
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1111 adding manifests
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1112 adding file changes
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1113 added 1 changesets with 2 changes to 2 files
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1114 updating to branch default
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1115 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
1116 $ cd test1
17109
7ba2b9435da9 test-hgweb-diffs: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
1117 $ 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
1118
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1119 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
1120
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
1121 $ killdaemons.py
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1122 $ 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
1123 > [web]
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1124 > templates = rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1125 > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1126 $ mkdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1127 $ 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
1128 > 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
1129 > changeset = '{diff}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1130 > difflineplus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1131 > difflineminus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1132 > difflineat = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1133 > diffline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1134 > filenodelink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1135 > filenolink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1136 > fileline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1137 > 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
1138 > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1139 $ 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
1140 $ cat hg.pid >> $DAEMON_PIDS
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25135
diff changeset
1141 $ 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
1142 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
1143
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1144 Block: 1
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1145 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
1146 --- /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
1147 +++ 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
1148 @@ -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
1149 +a
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1150
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1151 Block: 2
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1152 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
1153 --- /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
1154 +++ 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
1155 @@ -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
1156 +b
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1157
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
1158 $ killdaemons.py
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1159 $ 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
1160 $ rmdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
1161 $ 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
1162 $ 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
1163
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1164 errors
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1165
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
1166 $ cat ../test/errors.log
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16722
diff changeset
1167
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16722
diff changeset
1168 $ cd ..