| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
| Tue, 28 Mar 2017 06:01:31 +0200 | |
| changeset 31705 | 5eb4d206202b |
| parent 26598 | 264e88901c44 |
| child 32759 | 265196cd7d7f |
| permissions | -rw-r--r-- |
| 7111 | 1 |
{header}
|
|
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
2 |
<title>{repo|escape}: comparison {file|escape}</title>
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
3 |
<link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
4 |
<link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
|
| 7111 | 5 |
</head> |
6 |
||
7 |
<body> |
|
8 |
<div id="container"> |
|
9 |
<div class="page-header"> |
|
|
18258
bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents:
17302
diff
changeset
|
10 |
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>
|
| 7111 | 11 |
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
12 |
<form action="{url|urlescape}log">
|
| 7111 | 13 |
{sessionvars%hiddenformentry}
|
14 |
<dl class="search"> |
|
15 |
<dt><label>Search: </label></dt> |
|
16 |
<dd><input type="text" name="rev" /></dd> |
|
17 |
</dl> |
|
18 |
</form> |
|
19 |
||
20 |
<ul class="page-nav"> |
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
21 |
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
22 |
<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
23 |
<li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li>
|
|
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
24 |
<li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
25 |
<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
26 |
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
27 |
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
|
|
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
28 |
<li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
29 |
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
|
| 7111 | 30 |
</ul> |
31 |
</div> |
|
32 |
||
33 |
<ul class="submenu"> |
|
|
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
34 |
<li><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
|
|
26598
264e88901c44
monoblue: add a link to the latest file revision
Anton Shestakov <av6@dwimlabs.net>
parents:
25604
diff
changeset
|
35 |
<li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>
|
|
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
36 |
<li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>
|
|
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
37 |
<li><a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
|
|
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
38 |
<li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
|
|
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
39 |
<li class="current">comparison</li> |
|
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
40 |
<li><a href="{url|urlescape}raw-diff/{symrev}/{file|urlescape}">raw</a></li>
|
| 7111 | 41 |
</ul> |
42 |
||
|
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
43 |
<h2 class="no-link no-border">comparison: {file|escape}</h2>
|
| 7111 | 44 |
<h3 class="changeset">{file|escape}</h3>
|
45 |
||
46 |
<dl class="overview"> |
|
47 |
{branch%filerevbranch}
|
|
48 |
<dt>changeset {rev}</dt>
|
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
49 |
<dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
|
|
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
50 |
{parent%filecompparent}
|
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
51 |
{child%filecompchild}
|
| 7111 | 52 |
</dl> |
53 |
||
|
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
54 |
<div class="legend"> |
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
55 |
<span class="legendinfo equal">equal</span> |
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
56 |
<span class="legendinfo delete">deleted</span> |
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
57 |
<span class="legendinfo insert">inserted</span> |
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
58 |
<span class="legendinfo replace">replaced</span> |
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
59 |
</div> |
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
60 |
|
|
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
61 |
<div class="comparison"> |
|
17302
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
62 |
<table class="bigtable"> |
|
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
63 |
<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
|
64 |
<tr> |
|
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
65 |
<th>{leftrev}:{leftnode|short}</th>
|
|
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
66 |
<th>{rightrev}:{rightnode|short}</th>
|
|
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
67 |
</tr> |
|
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
68 |
</thead> |
|
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
69 |
{comparison}
|
|
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
70 |
</table> |
| 7111 | 71 |
</div> |
72 |
||
73 |
{footer}
|