Mercurial > hg
annotate tests/test-hgweb-removed.t @ 44909:d452acc8cce8 stable
flags: account for flag change when tracking rename relevant to merge
There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.
There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8531
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:37:56 +0200 |
parents | 82ae4f471254 |
children |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
19796
diff
changeset
|
1 #require serve |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
15375
diff
changeset
|
2 |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
3 setting up repo |
8452
cb93eee1fbcd
tests: add missing interpreter lines
Martin Geisler <mg@lazybytes.net>
parents:
7183
diff
changeset
|
4 |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
5 $ hg init test |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
6 $ cd test |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
7 $ echo a > a |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
8 $ hg ci -Ama |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
9 adding a |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
10 $ hg rm a |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
11 $ hg ci -mdel |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
12 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
13 set up hgweb |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
14 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
15 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
16 $ cat hg.pid >> $DAEMON_PIDS |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
17 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
18 revision |
7183
099b4f9be5ab
hgweb: working diff for removed files
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
19 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25134
diff
changeset
|
20 $ get-with-headers.py localhost:$HGPORT 'rev/tip' |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
21 200 Script output follows |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
22 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
23 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
24 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
25 <head> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
26 <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
27 <meta name="robots" content="index, nofollow" /> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
28 <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
|
29 <script type="text/javascript" src="/static/mercurial.js"></script> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
30 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
31 <title>test: c78f6c5cbea9</title> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
32 </head> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
33 <body> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
34 <div class="container"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
35 <div class="menu"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
36 <div class="logo"> |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
25617
diff
changeset
|
37 <a href="https://mercurial-scm.org/"> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
38 <img src="/static/hglogo.png" alt="mercurial" /></a> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
39 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
40 <ul> |
25606
3bb6f5f478a7
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents:
25472
diff
changeset
|
41 <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:
25472
diff
changeset
|
42 <li><a href="/graph/tip">graph</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
43 <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
|
44 <li><a href="/bookmarks">bookmarks</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
45 <li><a href="/branches">branches</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
46 </ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
47 <ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
48 <li class="active">changeset</li> |
25606
3bb6f5f478a7
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents:
25472
diff
changeset
|
49 <li><a href="/raw-rev/tip">raw</a></li> |
3bb6f5f478a7
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents:
25472
diff
changeset
|
50 <li><a href="/file/tip">browse</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
51 </ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
52 <ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
53 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
54 </ul> |
12666
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12442
diff
changeset
|
55 <ul> |
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12442
diff
changeset
|
56 <li><a href="/help">help</a></li> |
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12442
diff
changeset
|
57 </ul> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
58 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
59 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
60 <div class="main"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
61 |
18264
d6ebdbdd70a5
tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents:
17991
diff
changeset
|
62 <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
|
63 <h3> |
63be46407a50
hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents:
25606
diff
changeset
|
64 changeset 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a> |
35065
a1de4ffaa7a8
hgweb: show commit phase if it's not public
Anton Shestakov <av6@dwimlabs.net>
parents:
35064
diff
changeset
|
65 <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
|
66 </h3> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
67 |
32758
cba4461aa0a0
hgweb: consolidate search form for paper
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30765
diff
changeset
|
68 |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
69 <form class="search" action="/log"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
70 |
32758
cba4461aa0a0
hgweb: consolidate search form for paper
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30765
diff
changeset
|
71 <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
|
72 <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
|
73 number or hash, or <a href="/help/revsets">revset expression</a>.</div> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
74 </form> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
75 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
76 <div class="description">del</div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
77 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
78 <table id="changesetEntry"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
79 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
80 <th class="author">author</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
81 <td class="author">test</td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
82 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
83 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
84 <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
|
85 <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
|
86 </tr> |
35485
1721ce06100a
hgweb: display fate of obsolete changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
35065
diff
changeset
|
87 |
36955
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
35485
diff
changeset
|
88 |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
89 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
90 <th class="author">parents</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
91 <td class="author"><a href="/rev/cb9a9f314b8b">cb9a9f314b8b</a> </td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
92 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
93 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
94 <th class="author">children</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
95 <td class="author"></td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
96 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
97 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
98 <th class="files">files</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
99 <td class="files">a </td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
100 </tr> |
14571
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
101 <tr> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
102 <th class="diffstat">diffstat</th> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
103 <td class="diffstat"> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
104 1 files changed, 0 insertions(+), 1 deletions(-) |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
105 |
37830
82ae4f471254
paper: add href="#" to links with click handlers
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37829
diff
changeset
|
106 <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
|
107 <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
|
108 <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
|
109 <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
|
110 <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
|
111 <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
|
112 <td class="diffstat-graph"> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
113 <span class="diffstat-add" style="width:0.0%;"> </span> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
114 <span class="diffstat-remove" style="width:100.0%;"> </span> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
115 </td> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
116 </tr> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
117 </table> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
118 </div> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
119 </td> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
120 </tr> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
121 </table> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
122 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
123 <div class="overflow"> |
37830
82ae4f471254
paper: add href="#" to links with click handlers
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37829
diff
changeset
|
124 <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
|
125 <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
|
126 <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
|
127 <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
|
128 <span id="l1.1" class="minusline">--- a/a 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
|
129 <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
|
130 <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
|
131 <span id="l1.4" class="minusline">-a</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
|
132 </div> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
133 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
134 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
135 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
136 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
137 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
138 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
139 </body> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
140 </html> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
141 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
142 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
143 diff removed file |
7183
099b4f9be5ab
hgweb: working diff for removed files
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
144 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25134
diff
changeset
|
145 $ get-with-headers.py localhost:$HGPORT 'diff/tip/a' |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
146 200 Script output follows |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
147 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
148 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
149 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
150 <head> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
151 <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
152 <meta name="robots" content="index, nofollow" /> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
153 <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
|
154 <script type="text/javascript" src="/static/mercurial.js"></script> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
155 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
156 <title>test: a diff</title> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
157 </head> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
158 <body> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
159 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
160 <div class="container"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
161 <div class="menu"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
162 <div class="logo"> |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
25617
diff
changeset
|
163 <a href="https://mercurial-scm.org/"> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
164 <img src="/static/hglogo.png" alt="mercurial" /></a> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
165 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
166 <ul> |
25606
3bb6f5f478a7
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents:
25472
diff
changeset
|
167 <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:
25472
diff
changeset
|
168 <li><a href="/graph/tip">graph</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
169 <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
|
170 <li><a href="/bookmarks">bookmarks</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
171 <li><a href="/branches">branches</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
172 </ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
173 <ul> |
25606
3bb6f5f478a7
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents:
25472
diff
changeset
|
174 <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:
25472
diff
changeset
|
175 <li><a href="/file/tip">browse</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
176 </ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
177 <ul> |
25606
3bb6f5f478a7
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents:
25472
diff
changeset
|
178 <li><a href="/file/tip/a">file</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
179 <li><a href="/file/tip/a">latest</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
180 <li class="active">diff</li> |
25606
3bb6f5f478a7
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents:
25472
diff
changeset
|
181 <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:
25472
diff
changeset
|
182 <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:
25472
diff
changeset
|
183 <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:
25472
diff
changeset
|
184 <li><a href="/raw-file/tip/a">raw</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
185 </ul> |
12680
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
186 <ul> |
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
187 <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
|
188 </ul> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
189 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
190 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
191 <div class="main"> |
18264
d6ebdbdd70a5
tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents:
17991
diff
changeset
|
192 <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
|
193 <h3> |
63be46407a50
hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents:
25606
diff
changeset
|
194 diff a @ 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a> |
35065
a1de4ffaa7a8
hgweb: show commit phase if it's not public
Anton Shestakov <av6@dwimlabs.net>
parents:
35064
diff
changeset
|
195 <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
|
196 </h3> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
197 |
32758
cba4461aa0a0
hgweb: consolidate search form for paper
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30765
diff
changeset
|
198 |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
199 <form class="search" action="/log"> |
32758
cba4461aa0a0
hgweb: consolidate search form for paper
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30765
diff
changeset
|
200 |
cba4461aa0a0
hgweb: consolidate search form for paper
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30765
diff
changeset
|
201 <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
|
202 <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
|
203 number or hash, or <a href="/help/revsets">revset expression</a>.</div> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
204 </form> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
205 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
206 <div class="description">del</div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
207 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
208 <table id="changesetEntry"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
209 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
210 <th>author</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
211 <td>test</td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
212 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
213 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
214 <th>date</th> |
15375
fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents:
14608
diff
changeset
|
215 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
216 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
217 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
218 <th>parents</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
219 <td><a href="/file/cb9a9f314b8b/a">cb9a9f314b8b</a> </td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
220 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
221 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
222 <th>children</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
223 <td></td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
224 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
225 </table> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
226 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
227 <div class="overflow"> |
37830
82ae4f471254
paper: add href="#" to links with click handlers
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37829
diff
changeset
|
228 <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
|
229 <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
|
230 <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
|
231 <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
|
232 <span id="l1.1" class="minusline">--- a/a 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
|
233 <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
|
234 <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
|
235 <span id="l1.4" class="minusline">-a</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
|
236 </div> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
237 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
238 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
239 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
240 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
241 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
242 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
243 </body> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
244 </html> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
245 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
246 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
247 $ cd .. |