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