Mercurial > hg
annotate mercurial/templates/gitweb/fileannotate.tmpl @ 36322: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 | 6797f1fbc642 |
children |
rev | line source |
---|---|
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
1 {header} |
3477
9fab252a7545
gitweb: add revision numbers to annotate changeset links
Brendan Cully <brendan@kublai.com>
parents:
3393
diff
changeset
|
2 <title>{repo|escape}: {file|escape}@{node|short} (annotated)</title> |
5269
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
4466
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:
17202
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:
17202
diff
changeset
|
12 <a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate |
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"> |
32762
2d93d2159e30
hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32761
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> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
18 <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
19 <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
20 <a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> | |
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:
24999
diff
changeset
|
24 <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a> | |
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
24999
diff
changeset
|
25 <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> | |
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
24999
diff
changeset
|
26 <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a> | |
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}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> | |
25605
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
24999
diff
changeset
|
28 <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> | |
3353
2edf53386d86
gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
3271
diff
changeset
|
29 annotate | |
25605
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
24999
diff
changeset
|
30 <a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | |
dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents:
24999
diff
changeset
|
31 <a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | |
30708
011122b3b1c4
hgweb: link to raw-file on annotation page (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25605
diff
changeset
|
32 <a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> | |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
33 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> |
32762
2d93d2159e30
hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32761
diff
changeset
|
34 </div> |
2d93d2159e30
hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32761
diff
changeset
|
35 {searchform} |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
36 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
37 |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
38 <div class="title">{file|escape}</div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
39 |
3391
defadc26e674
hgweb: add changeset description to annotate page
Brendan Cully <brendan@kublai.com>
parents:
3363
diff
changeset
|
40 <div class="title_text"> |
4466
0ed59f0076e0
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3477
diff
changeset
|
41 <table cellspacing="0"> |
0ed59f0076e0
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3477
diff
changeset
|
42 <tr> |
0ed59f0076e0
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3477
diff
changeset
|
43 <td>author</td> |
24999
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
44 <td>{author|obfuscate}</td> |
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
45 </tr> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
46 <tr> |
4466
0ed59f0076e0
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3477
diff
changeset
|
47 <td></td> |
24999
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
48 <td class="date age">{date|rfc822date}</td> |
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
49 </tr> |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
50 {branch%filerevbranch} |
4466
0ed59f0076e0
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3477
diff
changeset
|
51 <tr> |
0ed59f0076e0
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3477
diff
changeset
|
52 <td>changeset {rev}</td> |
24999
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
53 <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
54 </tr> |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
55 {parent%fileannotateparent} |
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
56 {child%fileannotatechild} |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
57 <tr> |
4466
0ed59f0076e0
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3477
diff
changeset
|
58 <td>permissions</td> |
24999
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
59 <td style="font-family:monospace">{permissions|permissions}</td> |
30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles
Anton Shestakov <engored@ya.ru>
parents:
18628
diff
changeset
|
60 </tr> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
61 </table> |
3391
defadc26e674
hgweb: add changeset description to annotate page
Brendan Cully <brendan@kublai.com>
parents:
3363
diff
changeset
|
62 </div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
63 |
33557
875b054e5b95
gitweb: preserve whitespace in description
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32996
diff
changeset
|
64 <div class="page_path description">{desc|strip|escape|websub|nonempty}</div> |
34391
6797f1fbc642
hgweb: add HTML elements to control whitespace settings for annotate
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33557
diff
changeset
|
65 |
6797f1fbc642
hgweb: add HTML elements to control whitespace settings for annotate
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33557
diff
changeset
|
66 {diffoptsform} |
6797f1fbc642
hgweb: add HTML elements to control whitespace settings for annotate
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33557
diff
changeset
|
67 |
6797f1fbc642
hgweb: add HTML elements to control whitespace settings for annotate
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33557
diff
changeset
|
68 <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}> |
6797f1fbc642
hgweb: add HTML elements to control whitespace settings for annotate
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33557
diff
changeset
|
69 renderDiffOptsForm(); |
6797f1fbc642
hgweb: add HTML elements to control whitespace settings for annotate
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33557
diff
changeset
|
70 </script> |
6797f1fbc642
hgweb: add HTML elements to control whitespace settings for annotate
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33557
diff
changeset
|
71 |
1575
0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
72 <div class="page_body"> |
0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
73 <table> |
32996
1c97df5e3b46
hgweb: plug followlines action in annotate view
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32994
diff
changeset
|
74 <tbody class="sourcelines" |
1c97df5e3b46
hgweb: plug followlines action in annotate view
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32994
diff
changeset
|
75 data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}" |
1c97df5e3b46
hgweb: plug followlines action in annotate view
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32994
diff
changeset
|
76 data-selectabletag="TR" |
1c97df5e3b46
hgweb: plug followlines action in annotate view
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32994
diff
changeset
|
77 data-ishead="{ishead}"> |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
78 {annotate%annotateline} |
32994
9fda810cd0db
gitweb: wrap table rows of annotate view into a <tbody> element
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32762
diff
changeset
|
79 </tbody> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
80 </table> |
1575
0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
81 </div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
82 |
32996
1c97df5e3b46
hgweb: plug followlines action in annotate view
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32994
diff
changeset
|
83 <script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script> |
1c97df5e3b46
hgweb: plug followlines action in annotate view
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32994
diff
changeset
|
84 |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8356
diff
changeset
|
85 {footer} |