Mercurial > hg
annotate mercurial/templates/spartan/map @ 23740:9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
This adds UI portion of the feature that has resided in mercurial since 2012.
Back then the interface was added together with the code, but was shortly
backed out because it was deemed "not ready". Code, however, stayed.
For the original feature and its implementation, see issue2810 and
d605a82cf189.
In short, the backed-out interface had two outstanding issues:
1. it was introducing an entirely new term (baseline) and
2. it was present on every changeset's page, even for changesets with 1 parent
(or no parents), which didn't make sense
This patch implements a hopefully better interface because:
1. it uses the usual terms (diff) and
2. it only shows up when there actually are 2 parents.
author | Anton Shestakov <engored@ya.ru> |
---|---|
date | Sat, 03 Jan 2015 17:50:21 +0800 |
parents | 9409aeaafdc1 |
children | 1cac419ab831 |
rev | line source |
---|---|
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 default = 'shortlog' |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 mimetype = 'text/html; charset={encoding}' |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 header = header.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 footer = footer.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 search = search.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 changelog = changelog.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 shortlog = shortlog.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 shortlogentry = shortlogentry.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 graph = graph.tmpl |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
10 naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> ' |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
11 navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> ' |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
12 navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> ' |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
13 filenaventry = '<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> ' |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
14 filedifflink = '<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> ' |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
15 filenodelink = '<a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> ' |
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 filenolink = '{file|escape} ' |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 fileellipses = '...' |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 changelogentry = changelogentry.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 searchentry = changelogentry.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 changeset = changeset.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 manifest = manifest.tmpl |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
22 |
10254
8d5de52431f2
hgweb: changenav: separate pages before and after the current position
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9999
diff
changeset
|
23 nav = '{before%naventry} {after%naventry}' |
8d5de52431f2
hgweb: changenav: separate pages before and after the current position
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9999
diff
changeset
|
24 navshort = '{before%navshortentry}{after%navshortentry}' |
8d5de52431f2
hgweb: changenav: separate pages before and after the current position
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9999
diff
changeset
|
25 navgraph = '{before%navgraphentry}{after%navgraphentry}' |
8d5de52431f2
hgweb: changenav: separate pages before and after the current position
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9999
diff
changeset
|
26 filenav = '{before%filenaventry}{after%filenaventry}' |
8d5de52431f2
hgweb: changenav: separate pages before and after the current position
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9999
diff
changeset
|
27 |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
28 direntry = ' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
29 <tr class="parity{parity}"> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
30 <td><tt>drwxr-xr-x</tt> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
31 <td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
32 <td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
33 <td> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
34 <a href="{url|urlescape}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}/</a> |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
35 <a href="{url|urlescape}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}"> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
36 {emptydirs|urlescape} |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
37 </a>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
38 |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
39 fileentry = ' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
40 <tr class="parity{parity}"> |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
41 <td><tt>{permissions|permissions}</tt> |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
42 <td align=right><tt class="date">{date|isodate}</tt> |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
43 <td align=right><tt>{size}</tt> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
44 <td><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>' |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
45 |
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
46 filerevision = filerevision.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
47 fileannotate = fileannotate.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
48 filediff = filediff.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
49 filelog = filelog.tmpl |
8507
decf329f00cb
spartan: ensure equal heights for file and annotate views
Martin Geisler <mg@lazybytes.net>
parents:
8431
diff
changeset
|
50 fileline = '<div class="parity{parity}"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' |
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
51 filelogentry = filelogentry.tmpl |
8507
decf329f00cb
spartan: ensure equal heights for file and annotate views
Martin Geisler <mg@lazybytes.net>
parents:
8431
diff
changeset
|
52 |
decf329f00cb
spartan: ensure equal heights for file and annotate views
Martin Geisler <mg@lazybytes.net>
parents:
8431
diff
changeset
|
53 # The ensures that all table cells have content (even if there |
decf329f00cb
spartan: ensure equal heights for file and annotate views
Martin Geisler <mg@lazybytes.net>
parents:
8431
diff
changeset
|
54 # is an empty line in the annotated file), which in turn ensures that |
decf329f00cb
spartan: ensure equal heights for file and annotate views
Martin Geisler <mg@lazybytes.net>
parents:
8431
diff
changeset
|
55 # all table rows have equal height. |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
56 annotateline = ' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
57 <tr class="parity{parity}"> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
58 <td class="annotate"> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
59 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
60 title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
61 </td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
62 <td> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
63 <a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
64 </td> |
8507
decf329f00cb
spartan: ensure equal heights for file and annotate views
Martin Geisler <mg@lazybytes.net>
parents:
8431
diff
changeset
|
65 <td><pre> {line|escape}</pre></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
66 </tr>' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
67 difflineplus = '<span class="plusline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>' |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
68 difflineminus = '<span class="minusline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>' |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
69 difflineat = '<span class="atline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>' |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
70 diffline = '<a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}' |
23740
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
71 changesetlink = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>' |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
72 changelogparent = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
73 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
74 <th class="parent">parent {rev}:</th> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
75 <td class="parent"> |
23740
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
76 {changesetlink} |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
77 </td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
78 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
79 changesetparent = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
80 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
81 <th class="parent">parent {rev}:</th> |
23740
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
82 <td class="parent">{changesetlink}</td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
83 </tr>' |
23740
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
84 changesetparentdiff = ' |
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
85 <tr> |
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
86 <th class="parent">parent {rev}:</th> |
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
87 <td class="parent">{changesetlink} {ifeq(node, basenode, '(current diff)', '({difffrom})')}</td> |
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
88 </tr>' |
9e1f4c65f5f5
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)
Anton Shestakov <engored@ya.ru>
parents:
18526
diff
changeset
|
89 difffrom = '<a href="{url|urlescape}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">diff</a>' |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
90 filerevparent = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
91 <tr> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
92 <td class="metatag">parent:</td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
93 <td> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
94 <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
95 {rename%filerename}{node|short} |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
96 </a> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
97 </td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
98 </tr>' |
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
99 filerename = '{file|escape}@' |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
100 filelogrename = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
101 <tr> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
102 <th>base:</th> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
103 <td> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
104 <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
105 {file|escape}@{node|short} |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
106 </a> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
107 </td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
108 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
109 fileannotateparent = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
110 <tr> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
111 <td class="metatag">parent:</td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
112 <td> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
113 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
114 {rename%filerename}{node|short} |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
115 </a> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
116 </td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
117 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
118 changesetchild = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
119 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
120 <th class="child">child {rev}:</th> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
121 <td class="child"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
122 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
123 changelogchild = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
124 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
125 <th class="child">child {rev}:</th> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
126 <td class="child"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
127 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
128 filerevchild = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
129 <tr> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
130 <td class="metatag">child:</td> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
131 <td><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
132 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
133 fileannotatechild = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
134 <tr> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
135 <td class="metatag">child:</td> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
136 <td><a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
137 </tr>' |
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
138 tags = tags.tmpl |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
139 tagentry = ' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
140 <li class="tagEntry parity{parity}"> |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
141 <tt class="node">{node}</tt> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
142 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
143 </li>' |
8357
d974a32b59dc
spartan: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
7338
diff
changeset
|
144 branches = branches.tmpl |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
145 branchentry = ' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
146 <li class="tagEntry parity{parity}"> |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
147 <tt class="node">{node}</tt> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
148 <a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}" class="{status}">{branch|escape}</a> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
149 </li>' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
150 diffblock = '<pre class="parity{parity}">{lines}</pre>' |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
151 changelogtag = '<tr><th class="tag">tag:</th><td class="tag">{tag|escape}</td></tr>' |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
152 changesettag = '<tr><th class="tag">tag:</th><td class="tag">{tag|escape}</td></tr>' |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
153 filediffparent = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
154 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
155 <th class="parent">parent {rev}:</th> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
156 <td class="parent"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
157 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
158 filelogparent = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
159 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
160 <th>parent {rev}:</th> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
161 <td><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
162 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
163 filediffchild = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
164 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
165 <th class="child">child {rev}:</th> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
166 <td class="child"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
167 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
168 filelogchild = ' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
169 <tr> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
170 <th>child {rev}:</th> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
171 <td><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
172 </tr>' |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
173 indexentry = ' |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
174 <tr class="parity{parity}"> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
175 <td><a href="{url|urlescape}{sessionvars%urlparameter}">{name|escape}</a></td> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
176 <td>{description}</td> |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
177 <td>{contact|obfuscate}</td> |
15375
fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents:
14046
diff
changeset
|
178 <td class="age">{lastchange|rfc822date}</td> |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
179 <td class="indexlinks"> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
180 <a href="{url|urlescape}rss-log">RSS</a> |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
181 <a href="{url|urlescape}atom-log">Atom</a> |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
182 {archives%archiveentry} |
8376
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
183 </td> |
04f9253906bb
spartan: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8357
diff
changeset
|
184 </tr>' |
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
185 index = index.tmpl |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
186 archiveentry = '<a href="{url|urlescape}archive/{node|short}{extension|urlescape}">{type|escape}</a> ' |
7338
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
187 notfound = notfound.tmpl |
fecfe4392e94
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
188 error = error.tmpl |
8431
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
189 urlparameter = '{separator}{name}={value|urlescape}' |
5c1aabc58004
spartan: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8376
diff
changeset
|
190 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />' |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
191 breadcrumb = '> <a href="{url|urlescape}">{name|escape}</a> ' |