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