Mercurial > hg
annotate tests/test-hgweb-removed.t @ 19636:6bbce5efc67b
mq: look for modified subrepos when checking for local changes
It was possible to apply, unapply, fold, patches (etc) with modified subrepos,
which resulted in surprising behavior. For example it was easy to apply a patch
with a modified subrepo, and then the refresh it and accidentally end up
including the modified subrepo on the refreshed patch.
A test has been added to verify this new check.
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1375742979 -7200
# Tue Aug 06 00:49:39 2013 +0200
# Node ID a5c90acff5e61aae714ba6c9457d766c54b4f124
# Parent 6ac206fb6f27492a98f46bbff090407ee1b1de72
mq: look for modified subrepos when checking for local changes
It was possible to apply, unapply, fold, patches (etc) with modified subrepos,
which resulted in surprising behavior. For example it was easy to apply a patch
with a modified subrepo, and then the refresh it and accidentally end up
including the modified subrepo on the refreshed patch.
A test has been added to verify this new check.
author | Angel Ezquerra <angel.ezquerra@gmail.com> |
---|---|
date | Tue, 06 Aug 2013 00:49:39 +0200 |
parents | b5e3f2b1d5e9 |
children | ac08ff370977 |
rev | line source |
---|---|
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
15375
diff
changeset
|
1 $ "$TESTDIR/hghave" serve || exit 80 |
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 |
17017
953faba28e91
tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
20 $ "$TESTDIR/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"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
37 <a href="http://mercurial.selenic.com/"> |
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> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
41 <li><a href="/shortlog/c78f6c5cbea9">log</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
42 <li><a href="/graph/c78f6c5cbea9">graph</a></li> |
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> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
49 <li><a href="/raw-rev/c78f6c5cbea9">raw</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
50 <li><a href="/file/c78f6c5cbea9">browse</a></li> |
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> |
13596
270f57d35525
hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents:
12680
diff
changeset
|
63 <h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
64 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
65 <form class="search" action="/log"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
66 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
67 <p><input name="rev" id="search1" type="text" size="30" /></p> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
68 <div id="hint">find changesets by author, revision, |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
69 files, or words in the commit message</div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
70 </form> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
71 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
72 <div class="description">del</div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
73 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
74 <table id="changesetEntry"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
75 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
76 <th class="author">author</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
77 <td class="author">test</td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
78 </tr> |
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="date">date</th> |
15375
fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents:
14608
diff
changeset
|
81 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td></tr> |
12442
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 <th class="author">parents</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
84 <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
|
85 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
86 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
87 <th class="author">children</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
88 <td class="author"></td> |
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 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
91 <th class="files">files</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
92 <td class="files">a </td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
93 </tr> |
14571
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
94 <tr> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
95 <th class="diffstat">diffstat</th> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
96 <td class="diffstat"> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
97 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
|
98 |
19428
c3cdba6e5d7f
hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat
Alexander Plavin <me@aplavin.ru>
parents:
18517
diff
changeset
|
99 <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a> |
14571
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
100 <div id="diffstatdetails" style="display:none;"> |
19428
c3cdba6e5d7f
hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat
Alexander Plavin <me@aplavin.ru>
parents:
18517
diff
changeset
|
101 <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a> |
14571
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
102 <p> |
19455
c229a5e7511e
hgweb: make stripes in diffstat with CSS
Alexander Plavin <me@aplavin.ru>
parents:
19433
diff
changeset
|
103 <table class="stripes2"> <tr> |
14571
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
104 <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
|
105 <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
|
106 <td class="diffstat-graph"> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
107 <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
|
108 <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
|
109 </td> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
110 </tr> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
111 </table> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
112 </div> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
113 </td> |
17c0cb1045e5
paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
114 </tr> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
115 </table> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
116 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
117 <div class="overflow"> |
19433
a79b21ece345
hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents:
19432
diff
changeset
|
118 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div> |
19432
e92d4b8530cb
hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents:
19428
diff
changeset
|
119 <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
|
120 <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
|
121 <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
|
122 <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
|
123 <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
|
124 <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
|
125 <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
|
126 </div> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
127 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
128 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
129 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
130 </div> |
14046
b24e5a708fad
web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents:
13597
diff
changeset
|
131 <script type="text/javascript">process_dates()</script> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
132 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
133 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
134 </body> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
135 </html> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
136 |
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 diff removed file |
7183
099b4f9be5ab
hgweb: working diff for removed files
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
139 |
17017
953faba28e91
tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
140 $ "$TESTDIR/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
|
141 200 Script output follows |
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 <!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
|
144 <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
|
145 <head> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
146 <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
|
147 <meta name="robots" content="index, nofollow" /> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
148 <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
|
149 <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
|
150 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
151 <title>test: a diff</title> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
152 </head> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
153 <body> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
154 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
155 <div class="container"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
156 <div class="menu"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
157 <div class="logo"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
158 <a href="http://mercurial.selenic.com/"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
159 <img src="/static/hglogo.png" alt="mercurial" /></a> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
160 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
161 <ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
162 <li><a href="/shortlog/c78f6c5cbea9">log</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
163 <li><a href="/graph/c78f6c5cbea9">graph</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
164 <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
|
165 <li><a href="/bookmarks">bookmarks</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
166 <li><a href="/branches">branches</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
167 </ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
168 <ul> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
169 <li><a href="/rev/c78f6c5cbea9">changeset</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
170 <li><a href="/file/c78f6c5cbea9">browse</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
171 </ul> |
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 <li><a href="/file/c78f6c5cbea9/a">file</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
174 <li><a href="/file/tip/a">latest</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
175 <li class="active">diff</li> |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
17017
diff
changeset
|
176 <li><a href="/comparison/c78f6c5cbea9/a">comparison</a></li> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
177 <li><a href="/annotate/c78f6c5cbea9/a">annotate</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
178 <li><a href="/log/c78f6c5cbea9/a">file log</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
179 <li><a href="/raw-file/c78f6c5cbea9/a">raw</a></li> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
180 </ul> |
12680
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
181 <ul> |
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
182 <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
|
183 </ul> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
184 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
185 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
186 <div class="main"> |
18264
d6ebdbdd70a5
tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents:
17991
diff
changeset
|
187 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
188 <h3>diff a @ 1:c78f6c5cbea9</h3> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
189 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
190 <form class="search" action="/log"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
191 <p></p> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
192 <p><input name="rev" id="search1" type="text" size="30" /></p> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
193 <div id="hint">find changesets by author, revision, |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
194 files, or words in the commit message</div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
195 </form> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
196 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
197 <div class="description">del</div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
198 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
199 <table id="changesetEntry"> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
200 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
201 <th>author</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
202 <td>test</td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
203 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
204 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
205 <th>date</th> |
15375
fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents:
14608
diff
changeset
|
206 <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
|
207 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
208 <tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
209 <th>parents</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
210 <td><a href="/file/cb9a9f314b8b/a">cb9a9f314b8b</a> </td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
211 </tr> |
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 <th>children</th> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
214 <td></td> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
215 </tr> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
216 </table> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
217 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
218 <div class="overflow"> |
19433
a79b21ece345
hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents:
19432
diff
changeset
|
219 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div> |
19432
e92d4b8530cb
hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents:
19428
diff
changeset
|
220 <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
|
221 <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
|
222 <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
|
223 <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
|
224 <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
|
225 <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
|
226 <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
|
227 </div> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
228 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
229 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
230 </div> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
231 |
14046
b24e5a708fad
web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents:
13597
diff
changeset
|
232 <script type="text/javascript">process_dates()</script> |
12442
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
233 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
234 |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
235 </body> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
236 </html> |
b7fd332e5ca2
tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents:
8452
diff
changeset
|
237 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
238 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
239 $ cd .. |