Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/templates/gitweb/changeset.tmpl @ 36355:f3fd4fe0506f
hgweb: show each obsfateentry on its own line
Commits with more than one reason for being obsolete used to just show obsfate
entries all on one line, and that doesn't look good. Let's show each entry on
its own line.
In paper and coal the lines are simply split using a <br> element, and in other
hgweb themes each entry has its own table header. This is done by analogy with
changeset parents and children -- in paper and coal they are all put into one
table row, and everywhere else each one gets a separate row.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 19 Feb 2018 12:48:50 +0800 |
parents | 1721ce06100a |
children | 7c18798fc24d |
rev | line source |
---|---|
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
1 {header} |
3475
2ed139c3b328
hgweb: add revision numbers to changeset parent/child links
Brendan Cully <brendan@kublai.com>
parents:
3363
diff
changeset
|
2 <title>{repo|escape}: changeset {rev}:{node|short}</title> |
5269
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
4538
diff
changeset
|
3 <link rel="alternate" type="application/atom+xml" |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
4 href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
5 <link rel="alternate" type="application/rss+xml" |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
6 href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
7 </head> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
8 <body> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
9 |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
10 <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:
15375
diff
changeset
|
11 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> |
bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents:
15375
diff
changeset
|
12 <a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
13 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
14 |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
15 <div class="page_nav"> |
32782
2d93d2159e30
hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32781
diff
changeset
|
16 <div> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
17 <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> | |
25605
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
23740
diff
changeset
|
18 <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> | |
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
23740
diff
changeset
|
19 <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> | |
26666
e901df65b108
gitweb: don't drop current revision context on graph page
Anton Shestakov <av6@dwimlabs.net>
parents:
26288
diff
changeset
|
20 <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> | |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
21 <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
22 <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
23 <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | |
25605
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
23740
diff
changeset
|
24 <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> | |
8356
439663cd043a
gitweb: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
8235
diff
changeset
|
25 changeset | |
25605
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
23740
diff
changeset
|
26 <a href="{url|urlescape}raw-rev/{symrev}">raw</a> {archives%archiveentry} | |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
27 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> |
32782
2d93d2159e30
hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32781
diff
changeset
|
28 </div> |
2d93d2159e30
hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32781
diff
changeset
|
29 {searchform} |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
30 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
31 |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
32 <div> |
35083
f9b23fa35cb3
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
Anton Shestakov <av6@dwimlabs.net>
parents:
33557
diff
changeset
|
33 <a class="title" href="{url|urlescape}raw-rev/{node|short}"> |
f9b23fa35cb3
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
Anton Shestakov <av6@dwimlabs.net>
parents:
33557
diff
changeset
|
34 {desc|strip|escape|firstline|nonempty} |
35084
e9a8a941950a
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)
Anton Shestakov <av6@dwimlabs.net>
parents:
35083
diff
changeset
|
35 {alltags} |
35083
f9b23fa35cb3
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
Anton Shestakov <av6@dwimlabs.net>
parents:
33557
diff
changeset
|
36 </a> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
37 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
38 <div class="title_text"> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
39 <table cellspacing="0"> |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
40 <tr><td>author</td><td>{author|obfuscate}</td></tr> |
15375
fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents:
14046
diff
changeset
|
41 <tr><td></td><td class="date age">{date|rfc822date}</td></tr> |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
42 {branch%changesetbranch} |
25616
e0073dcec588
hgweb: link to revision by node hash in gitweb & monoblue
Anton Shestakov <av6@dwimlabs.net>
parents:
25605
diff
changeset
|
43 <tr> |
e0073dcec588
hgweb: link to revision by node hash in gitweb & monoblue
Anton Shestakov <av6@dwimlabs.net>
parents:
25605
diff
changeset
|
44 <td>changeset {rev}</td> |
e0073dcec588
hgweb: link to revision by node hash in gitweb & monoblue
Anton Shestakov <av6@dwimlabs.net>
parents:
25605
diff
changeset
|
45 <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
e0073dcec588
hgweb: link to revision by node hash in gitweb & monoblue
Anton Shestakov <av6@dwimlabs.net>
parents:
25605
diff
changeset
|
46 </tr> |
36355
f3fd4fe0506f
hgweb: show each obsfateentry on its own line
Anton Shestakov <av6@dwimlabs.net>
parents:
35489
diff
changeset
|
47 {if(obsolete, succsandmarkers%obsfateentry)} |
23740
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
48 {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)} |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
49 {child%changesetchild} |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
50 </table></div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
51 |
33557
875b054e5b95
gitweb: preserve whitespace in description
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32782
diff
changeset
|
52 <div class="page_body description">{desc|strip|escape|websub|nonempty}</div> |
3179
76ab39df0917
gitweb: cosmetic fixes.
Brendan Cully <brendan@kublai.com>
parents:
2684
diff
changeset
|
53 <div class="list_head"></div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
54 <div class="title_text"> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
55 <table cellspacing="0"> |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
56 {files} |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
57 </table></div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
58 |
26288
2239626369f5
gitweb: port code selection without line numbers from paper
Anton Shestakov <av6@dwimlabs.net>
parents:
25616
diff
changeset
|
59 <div class="page_body diffblocks">{diff}</div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
60 |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
61 {footer} |